Cleanup

Author: anuraaga

sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/OpenTelemetryConfigurationFactoryTest.java

@@ -344,7 +344,7 @@ void create_Configured() throws NoSuchFieldException, IllegalAccessException {
         .extracting("sharedState")
         .extracting("activeSpanProcessor")
         .extracting("worker")
-        .extracting("spanProcessorMetrics")
+        .extracting("spanProcessorInstrumentation")
         .extracting("processedSpans")
         .isNull();
   }

sdk/common/src/main/java/io/opentelemetry/sdk/internal/SemConvAttributes.java

@@ -33,4 +33,9 @@ private SemConvAttributes() {}
       AttributeKey.longKey("rpc.grpc.status_code");
   public static final AttributeKey<Long> HTTP_RESPONSE_STATUS_CODE =
       AttributeKey.longKey("http.response.status_code");
+
+  public static final AttributeKey<String> OTEL_SPAN_PARENT_ORIGIN =
+      AttributeKey.stringKey("otel.span.parent.origin");
+  public static final AttributeKey<String> OTEL_SPAN_SAMPLING_RESULT =
+      AttributeKey.stringKey("otel.span.sampling_result");
 }

sdk/common/src/test/java/io/opentelemetry/sdk/internal/SemConvAttributesTest.java

@@ -31,5 +31,10 @@ void testAttributeKeys() {
         .isEqualTo(RpcIncubatingAttributes.RPC_GRPC_STATUS_CODE);
     assertThat(SemConvAttributes.HTTP_RESPONSE_STATUS_CODE)
         .isEqualTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE);
+
+    assertThat(SemConvAttributes.OTEL_SPAN_PARENT_ORIGIN)
+        .isEqualTo(OtelIncubatingAttributes.OTEL_SPAN_PARENT_ORIGIN);
+    assertThat(SemConvAttributes.OTEL_SPAN_SAMPLING_RESULT)
+        .isEqualTo(OtelIncubatingAttributes.OTEL_SPAN_SAMPLING_RESULT);
   }
 }

sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkTracerMetrics.java

@@ -5,9 +5,9 @@
 
 package io.opentelemetry.sdk.trace;
 
-import static io.opentelemetry.api.common.AttributeKey.stringKey;
+import static io.opentelemetry.sdk.internal.SemConvAttributes.OTEL_SPAN_PARENT_ORIGIN;
+import static io.opentelemetry.sdk.internal.SemConvAttributes.OTEL_SPAN_SAMPLING_RESULT;
 
-import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.metrics.LongCounter;
 import io.opentelemetry.api.metrics.LongUpDownCounter;
@@ -25,12 +25,6 @@
  */
 final class SdkTracerMetrics {
 
-  // Visible for testing
-  static final AttributeKey<String> OTEL_SPAN_PARENT_ORIGIN = stringKey("otel.span.parent.origin");
-  // Visible for testing
-  static final AttributeKey<String> OTEL_SPAN_SAMPLING_RESULT =
-      stringKey("otel.span.sampling_result");
-
   private static final Attributes noParentDrop =
       Attributes.of(
           OTEL_SPAN_PARENT_ORIGIN, "none", OTEL_SPAN_SAMPLING_RESULT, SamplingDecision.DROP.name());

sdk/trace/src/test/java/io/opentelemetry/sdk/trace/SdkTracerProviderMetricsTest.java

@@ -8,9 +8,9 @@
 import static io.opentelemetry.sdk.internal.SemConvAttributes.ERROR_TYPE;
 import static io.opentelemetry.sdk.internal.SemConvAttributes.OTEL_COMPONENT_NAME;
 import static io.opentelemetry.sdk.internal.SemConvAttributes.OTEL_COMPONENT_TYPE;
+import static io.opentelemetry.sdk.internal.SemConvAttributes.OTEL_SPAN_PARENT_ORIGIN;
+import static io.opentelemetry.sdk.internal.SemConvAttributes.OTEL_SPAN_SAMPLING_RESULT;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
-import static io.opentelemetry.sdk.trace.SdkTracerMetrics.OTEL_SPAN_PARENT_ORIGIN;
-import static io.opentelemetry.sdk.trace.SdkTracerMetrics.OTEL_SPAN_SAMPLING_RESULT;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.when;