Avoid shared internal code in sdk-common and api-incubator (#6970)

Author: rooks-ns

all/src/test/java/io/opentelemetry/all/NoSharedInternalCodeTest.java

@@ -33,14 +33,12 @@ class NoSharedInternalCodeTest {
 
   private static final Set<String> exemptions =
       Set.of(
-          "opentelemetry-api-incubator",
           "opentelemetry-exporter-common",
           "opentelemetry-exporter-logging",
           "opentelemetry-exporter-logging-otlp",
           "opentelemetry-exporter-prometheus",
           "opentelemetry-extension-trace-propagators",
           "opentelemetry-opencensus-shim",
-          "opentelemetry-sdk-common",
           "opentelemetry-sdk-logs",
           "opentelemetry-sdk-metrics",
           "opentelemetry-sdk-profiles",

sdk/common/src/main/java/io/opentelemetry/sdk/common/export/RetryPolicy.java

@@ -5,8 +5,6 @@
 
 package io.opentelemetry.sdk.common.export;
 
-import static io.opentelemetry.api.internal.Utils.checkArgument;
-
 import com.google.auto.value.AutoValue;
 import java.io.IOException;
 import java.time.Duration;
@@ -133,5 +131,11 @@ public RetryPolicy build() {
 
       return retryPolicy;
     }
+
+    private static void checkArgument(boolean isValid, String errorMessage) {
+      if (!isValid) {
+        throw new IllegalArgumentException(errorMessage);
+      }
+    }
   }
 }

sdk/common/src/main/java/io/opentelemetry/sdk/resources/Resource.java

@@ -9,8 +9,6 @@
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.common.AttributesBuilder;
-import io.opentelemetry.api.internal.StringUtils;
-import io.opentelemetry.api.internal.Utils;
 import io.opentelemetry.sdk.common.internal.OtelVersion;
 import java.util.Objects;
 import java.util.logging.Logger;
@@ -177,8 +175,9 @@ public Resource merge(@Nullable Resource other) {
   private static void checkAttributes(Attributes attributes) {
     attributes.forEach(
         (key, value) -> {
-          Utils.checkArgument(
-              isValidAndNotEmpty(key), "Attribute key" + ERROR_MESSAGE_INVALID_CHARS);
+          if (!isValidAndNotEmpty(key)) {
+            throw new IllegalArgumentException("Attribute key" + ERROR_MESSAGE_INVALID_CHARS);
+          }
           Objects.requireNonNull(value, "Attribute value" + ERROR_MESSAGE_INVALID_VALUE);
         });
   }
@@ -191,7 +190,17 @@ private static void checkAttributes(Attributes attributes) {
    * @return whether the name is valid.
    */
   private static boolean isValid(String name) {
-    return name.length() <= MAX_LENGTH && StringUtils.isPrintableString(name);
+    return name.length() <= MAX_LENGTH && isPrintableString(name);
+  }
+
+  private static boolean isPrintableString(String str) {
+    for (int i = 0; i < str.length(); i++) {
+      char ch = str.charAt(i);
+      if (ch < ' ' || ch > '~') {
+        return false;
+      }
+    }
+    return true;
   }
 
   /**

sdk/common/src/test/java/io/opentelemetry/sdk/resources/ResourceTest.java

@@ -16,6 +16,7 @@
 import static io.opentelemetry.api.common.AttributeKey.valueKey;
 import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import com.google.common.testing.EqualsTester;
 import io.opentelemetry.api.common.AttributeKey;
@@ -187,6 +188,26 @@ void create_NullEmptyValue() {
     assertThat(resource.getAttributes().size()).isEqualTo(1);
   }
 
+  @Test
+  void create_invalidAttributeKey() {
+    assertThatThrownBy(() -> Resource.create(Attributes.of(stringKey("\u0002ab"), "value")))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining("Attribute key should be a ASCII string");
+
+    assertThatThrownBy(() -> Resource.create(Attributes.of(stringKey("key\u007f"), "value")))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining("Attribute key should be a ASCII string");
+
+    String tooLongKey = new String(new char[256]).replace('\0', 'a');
+    assertThatThrownBy(() -> Resource.create(Attributes.of(stringKey(tooLongKey), "value")))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining("Attribute key should be a ASCII string");
+
+    String maxValidKey = new String(new char[255]).replace('\0', 'a');
+    Resource resource = Resource.create(Attributes.of(stringKey(maxValidKey), "value"));
+    assertThat(resource.getAttribute(stringKey(maxValidKey))).isEqualTo("value");
+  }
+
   @Test
   void testResourceEquals() {
     Attributes attribute1 = Attributes.of(stringKey("a"), "1", stringKey("b"), "2");