semconv stable code

instrumentation-annotations-support-testing/src/main/java/io/opentelemetry/javaagent/instrumentation/otelannotations/AbstractWithSpanTest.java

@@ -7,8 +7,7 @@
 
 import static io.opentelemetry.api.common.AttributeKey.booleanKey;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
-import static io.opentelemetry.semconv.incubating.CodeIncubatingAttributes.CODE_FUNCTION;
-import static io.opentelemetry.semconv.incubating.CodeIncubatingAttributes.CODE_NAMESPACE;
+import static io.opentelemetry.semconv.incubating.CodeIncubatingAttributes.CODE_FUNCTION_NAME;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.catchThrowable;
 
@@ -19,7 +18,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
-@SuppressWarnings("deprecation") // CodeIncubatingAttributes.CODE_FUNCTION is deprecated
 public abstract class AbstractWithSpanTest<T extends U, U> {
 
   @RegisterExtension
@@ -59,8 +57,9 @@ void success() {
                         .hasKind(SpanKind.INTERNAL)
                         .hasNoParent()
                         .hasAttributesSatisfyingExactly(
-                            equalTo(CODE_NAMESPACE, traced.getClass().getName()),
-                            equalTo(CODE_FUNCTION, "completable"))));
+                            equalTo(
+                                CODE_FUNCTION_NAME,
+                                traced.getClass().getName() + ".completable"))));
   }
 
   @Test
@@ -82,8 +81,9 @@ void failure() {
                         .hasStatus(StatusData.error())
                         .hasException(AbstractTraced.FAILURE)
                         .hasAttributesSatisfyingExactly(
-                            equalTo(CODE_NAMESPACE, traced.getClass().getName()),
-                            equalTo(CODE_FUNCTION, "completable"))));
+                            equalTo(
+                                CODE_FUNCTION_NAME,
+                                traced.getClass().getName() + ".completable"))));
   }
 
   @Test
@@ -100,8 +100,8 @@ void canceled() {
                         .hasKind(SpanKind.INTERNAL)
                         .hasNoParent()
                         .hasAttributesSatisfyingExactly(
-                            equalTo(CODE_NAMESPACE, traced.getClass().getName()),
-                            equalTo(CODE_FUNCTION, "completable"),
+                            equalTo(
+                                CODE_FUNCTION_NAME, traced.getClass().getName() + ".completable"),
                             equalTo(booleanKey(canceledKey()), true))));
   }
 
@@ -118,8 +118,9 @@ void immediateSuccess() {
                         .hasKind(SpanKind.INTERNAL)
                         .hasNoParent()
                         .hasAttributesSatisfyingExactly(
-                            equalTo(CODE_NAMESPACE, traced.getClass().getName()),
-                            equalTo(CODE_FUNCTION, "alreadySucceeded"))));
+                            equalTo(
+                                CODE_FUNCTION_NAME,
+                                traced.getClass().getName() + ".alreadySucceeded"))));
   }
 
   @Test
@@ -138,7 +139,8 @@ void immediateFailure() {
                         .hasStatus(StatusData.error())
                         .hasException(AbstractTraced.FAILURE)
                         .hasAttributesSatisfyingExactly(
-                            equalTo(CODE_NAMESPACE, traced.getClass().getName()),
-                            equalTo(CODE_FUNCTION, "alreadyFailed"))));
+                            equalTo(
+                                CODE_FUNCTION_NAME,
+                                traced.getClass().getName() + ".alreadyFailed"))));
   }
 }

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/code/CodeAttributesExtractor.java

@@ -22,9 +22,8 @@ public final class CodeAttributesExtractor<REQUEST, RESPONSE>
     implements AttributesExtractor<REQUEST, RESPONSE> {
 
   // copied from CodeIncubatingAttributes
-  private static final AttributeKey<String> CODE_FUNCTION = AttributeKey.stringKey("code.function");
-  private static final AttributeKey<String> CODE_NAMESPACE =
-      AttributeKey.stringKey("code.namespace");
+  private static final AttributeKey<String> CODE_FUNCTION_NAME =
+      AttributeKey.stringKey("code.function.name");
 
   /** Creates the code attributes extractor. */
   public static <REQUEST, RESPONSE> AttributesExtractor<REQUEST, RESPONSE> create(
@@ -40,11 +39,21 @@ private CodeAttributesExtractor(CodeAttributesGetter<REQUEST> getter) {
 
   @Override
   public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST request) {
+    StringBuilder sb = new StringBuilder();
     Class<?> cls = getter.getCodeClass(request);
     if (cls != null) {
-      internalSet(attributes, CODE_NAMESPACE, cls.getName());
+      sb.append(cls.getName());
+    }
+    String methodName = getter.getMethodName(request);
+    if (methodName != null) {
+      if (sb.length() > 0) {
+        sb.append(".");
+      }
+      sb.append(methodName);
+    }
+    if (sb.length() > 0) {
+      internalSet(attributes, CODE_FUNCTION_NAME, sb.toString());
     }
-    internalSet(attributes, CODE_FUNCTION, getter.getMethodName(request));
   }
 
   @Override

instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/code/CodeAttributesExtractorTest.java

@@ -60,8 +60,9 @@ void shouldExtractAllAttributes() {
     // then
     assertThat(startAttributes.build())
         .containsOnly(
-            entry(CodeIncubatingAttributes.CODE_NAMESPACE, TestClass.class.getName()),
-            entry(CodeIncubatingAttributes.CODE_FUNCTION, "doSomething"));
+            entry(
+                CodeIncubatingAttributes.CODE_FUNCTION_NAME,
+                TestClass.class.getName() + ".doSomething"));
 
     assertThat(endAttributes.build().isEmpty()).isTrue();
   }

instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_3/springdata/Elasticsearch53SpringRepositoryTest.java

@@ -17,6 +17,7 @@
 import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension;
 import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
+import io.opentelemetry.sdk.testing.assertj.AttributeAssertion;
 import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes;
 import io.opentelemetry.semconv.incubating.DbIncubatingAttributes;
 import java.io.File;
@@ -79,11 +80,7 @@ void emptyRepository() {
                     span.hasName("DocRepository.findAll")
                         .hasKind(SpanKind.INTERNAL)
                         .hasNoParent()
-                        .hasAttributesSatisfyingExactly(
-                            equalTo(
-                                CodeIncubatingAttributes.CODE_NAMESPACE,
-                                DocRepository.class.getName()),
-                            equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "findAll")),
+                        .hasAttributesSatisfyingExactly(assertFunctionName("findAll")),
                 span ->
                     span.hasName("SearchAction")
                         .hasKind(SpanKind.CLIENT)
@@ -113,11 +110,7 @@ void crud() {
                     span.hasName("DocRepository.index")
                         .hasKind(SpanKind.INTERNAL)
                         .hasNoParent()
-                        .hasAttributesSatisfyingExactly(
-                            equalTo(
-                                CodeIncubatingAttributes.CODE_NAMESPACE,
-                                DocRepository.class.getName()),
-                            equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "index")),
+                        .hasAttributesSatisfyingExactly(assertFunctionName("index")),
                 span ->
                     span.hasName("IndexAction")
                         .hasKind(SpanKind.CLIENT)
@@ -162,11 +155,7 @@ void crud() {
                     span.hasName("DocRepository.findById")
                         .hasKind(SpanKind.INTERNAL)
                         .hasNoParent()
-                        .hasAttributesSatisfyingExactly(
-                            equalTo(
-                                CodeIncubatingAttributes.CODE_NAMESPACE,
-                                DocRepository.class.getName()),
-                            equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "findById")),
+                        .hasAttributesSatisfyingExactly(assertFunctionName("findById")),
                 span ->
                     span.hasName("GetAction")
                         .hasKind(SpanKind.CLIENT)
@@ -196,11 +185,7 @@ void crud() {
                     span.hasName("DocRepository.index")
                         .hasKind(SpanKind.INTERNAL)
                         .hasNoParent()
-                        .hasAttributesSatisfyingExactly(
-                            equalTo(
-                                CodeIncubatingAttributes.CODE_NAMESPACE,
-                                DocRepository.class.getName()),
-                            equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "index")),
+                        .hasAttributesSatisfyingExactly(assertFunctionName("index")),
                 span ->
                     span.hasName("IndexAction")
                         .hasKind(SpanKind.CLIENT)
@@ -240,11 +225,7 @@ void crud() {
                     span.hasName("DocRepository.findById")
                         .hasKind(SpanKind.INTERNAL)
                         .hasNoParent()
-                        .hasAttributesSatisfyingExactly(
-                            equalTo(
-                                CodeIncubatingAttributes.CODE_NAMESPACE,
-                                DocRepository.class.getName()),
-                            equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "findById")),
+                        .hasAttributesSatisfyingExactly(assertFunctionName("findById")),
                 span ->
                     span.hasName("GetAction")
                         .hasKind(SpanKind.CLIENT)
@@ -272,11 +253,7 @@ void crud() {
                     span.hasName("DocRepository.deleteById")
                         .hasKind(SpanKind.INTERNAL)
                         .hasNoParent()
-                        .hasAttributesSatisfyingExactly(
-                            equalTo(
-                                CodeIncubatingAttributes.CODE_NAMESPACE,
-                                DocRepository.class.getName()),
-                            equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "deleteById")),
+                        .hasAttributesSatisfyingExactly(assertFunctionName("deleteById")),
                 span ->
                     span.hasName("DeleteAction")
                         .hasKind(SpanKind.CLIENT)
@@ -315,11 +292,7 @@ void crud() {
                     span.hasName("DocRepository.findAll")
                         .hasKind(SpanKind.INTERNAL)
                         .hasNoParent()
-                        .hasAttributesSatisfyingExactly(
-                            equalTo(
-                                CodeIncubatingAttributes.CODE_NAMESPACE,
-                                DocRepository.class.getName()),
-                            equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "findAll")),
+                        .hasAttributesSatisfyingExactly(assertFunctionName("findAll")),
                 span ->
                     span.hasName("SearchAction")
                         .hasKind(SpanKind.CLIENT)
@@ -334,4 +307,10 @@ void crud() {
                             equalTo(stringKey("elasticsearch.request.indices"), "test-index"),
                             equalTo(stringKey("elasticsearch.request.search.types"), "doc"))));
   }
+
+  private static AttributeAssertion assertFunctionName(String methodName) {
+    return equalTo(
+        CodeIncubatingAttributes.CODE_FUNCTION_NAME,
+        DocRepository.class.getName() + "." + methodName);
+  }
 }

instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/ConfiguredTraceAnnotationsTest.java

@@ -37,9 +37,8 @@ void testMethodWithAnnotationShouldBeTraced() {
                     span.hasName("AnnotationTracedCallable.call")
                         .hasAttributesSatisfyingExactly(
                             equalTo(
-                                CodeIncubatingAttributes.CODE_NAMESPACE,
-                                AnnotationTracedCallable.class.getName()),
-                            equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "call"))));
+                                CodeIncubatingAttributes.CODE_FUNCTION_NAME,
+                                AnnotationTracedCallable.class.getName() + ".call"))));
   }
 
   static class AnnotationTracedCallable implements Callable<String> {

instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/TraceAnnotationsTest.java

@@ -11,14 +11,14 @@
 
 import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
+import io.opentelemetry.sdk.testing.assertj.AttributeAssertion;
 import io.opentelemetry.sdk.trace.data.StatusData;
 import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes;
 import io.opentracing.contrib.dropwizard.Trace;
 import java.util.concurrent.Callable;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
-@SuppressWarnings("deprecation") // using deprecated semconv
 class TraceAnnotationsTest {
 
   @RegisterExtension
@@ -36,11 +36,13 @@ void testSimpleCaseAnnotations() {
                     span.hasName("SayTracedHello.sayHello")
                         .hasNoParent()
                         .hasAttributesSatisfyingExactly(
-                            equalTo(
-                                CodeIncubatingAttributes.CODE_NAMESPACE,
-                                SayTracedHello.class.getName()),
-                            equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "sayHello"),
-                            equalTo(stringKey("myattr"), "test"))));
+                            assertCodeFunction("sayHello"), equalTo(stringKey("myattr"), "test"))));
+  }
+
+  private static AttributeAssertion assertCodeFunction(String methodName) {
+    return equalTo(
+        CodeIncubatingAttributes.CODE_FUNCTION_NAME,
+        SayTracedHello.class.getName() + "." + methodName);
   }
 
   @Test
@@ -55,29 +57,18 @@ void testComplexCaseAnnotations() {
                     span.hasName("SayTracedHello.sayHelloSayHa")
                         .hasNoParent()
                         .hasAttributesSatisfyingExactly(
-                            equalTo(
-                                CodeIncubatingAttributes.CODE_NAMESPACE,
-                                SayTracedHello.class.getName()),
-                            equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "sayHelloSayHa"),
+                            assertCodeFunction("sayHelloSayHa"),
                             equalTo(stringKey("myattr"), "test2")),
                 span ->
                     span.hasName("SayTracedHello.sayHello")
                         .hasParent(trace.getSpan(0))
                         .hasAttributesSatisfyingExactly(
-                            equalTo(
-                                CodeIncubatingAttributes.CODE_NAMESPACE,
-                                SayTracedHello.class.getName()),
-                            equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "sayHello"),
-                            equalTo(stringKey("myattr"), "test")),
+                            assertCodeFunction("sayHello"), equalTo(stringKey("myattr"), "test")),
                 span ->
                     span.hasName("SayTracedHello.sayHello")
                         .hasParent(trace.getSpan(0))
                         .hasAttributesSatisfyingExactly(
-                            equalTo(
-                                CodeIncubatingAttributes.CODE_NAMESPACE,
-                                SayTracedHello.class.getName()),
-                            equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "sayHello"),
-                            equalTo(stringKey("myattr"), "test"))));
+                            assertCodeFunction("sayHello"), equalTo(stringKey("myattr"), "test"))));
   }
 
   @Test
@@ -91,11 +82,7 @@ void testExceptionExit() {
                     span.hasName("SayTracedHello.sayError")
                         .hasStatus(StatusData.error())
                         .hasException(thrown)
-                        .hasAttributesSatisfyingExactly(
-                            equalTo(
-                                CodeIncubatingAttributes.CODE_NAMESPACE,
-                                SayTracedHello.class.getName()),
-                            equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "sayError"))));
+                        .hasAttributesSatisfyingExactly(assertCodeFunction("sayError"))));
   }
 
   @Test
@@ -110,9 +97,8 @@ void testAnonymousClassAnnotations() {
                     span.hasName("SayTracedHello$1.call")
                         .hasAttributesSatisfyingExactly(
                             equalTo(
-                                CodeIncubatingAttributes.CODE_NAMESPACE,
-                                SayTracedHello.class.getName() + "$1"),
-                            equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "call"))));
+                                CodeIncubatingAttributes.CODE_FUNCTION_NAME,
+                                SayTracedHello.class.getName() + "$1.call"))));
 
     // Test anonymous classes with no package
     new Callable<String>() {
@@ -130,17 +116,15 @@ public String call() {
                     span.hasName("SayTracedHello$1.call")
                         .hasAttributesSatisfyingExactly(
                             equalTo(
-                                CodeIncubatingAttributes.CODE_NAMESPACE,
-                                SayTracedHello.class.getName() + "$1"),
-                            equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "call"))),
+                                CodeIncubatingAttributes.CODE_FUNCTION_NAME,
+                                SayTracedHello.class.getName() + "$1.call"))),
         trace ->
             trace.hasSpansSatisfyingExactly(
                 span ->
                     span.hasName("TraceAnnotationsTest$1.call")
                         .hasAttributesSatisfyingExactly(
                             equalTo(
-                                CodeIncubatingAttributes.CODE_NAMESPACE,
-                                TraceAnnotationsTest.class.getName() + "$1"),
-                            equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "call"))));
+                                CodeIncubatingAttributes.CODE_FUNCTION_NAME,
+                                TraceAnnotationsTest.class.getName() + "$1.call"))));
   }
 }

instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/TraceProvidersTest.java

@@ -22,7 +22,6 @@ class TraceProvidersTest {
   @RegisterExtension
   static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
 
-  @SuppressWarnings("deprecation") // using deprecated semconv
   @ParameterizedTest
   @EnumSource(TraceProvider.class)
   void testShouldSupportProvider(TraceProvider provider) {
@@ -35,10 +34,8 @@ void testShouldSupportProvider(TraceProvider provider) {
                     span.hasName("SayTracedHello." + provider.testMethodName())
                         .hasAttributesSatisfyingExactly(
                             equalTo(
-                                CodeIncubatingAttributes.CODE_NAMESPACE,
-                                SayTracedHello.class.getName()),
-                            equalTo(
-                                CodeIncubatingAttributes.CODE_FUNCTION, provider.testMethodName()),
+                                CodeIncubatingAttributes.CODE_FUNCTION_NAME,
+                                SayTracedHello.class.getName() + "." + provider.testMethodName()),
                             equalTo(stringKey("providerAttr"), provider.name()))));
   }
 

instrumentation/external-annotations/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/extannotations/TracedMethodsExclusionTest.java

@@ -33,8 +33,8 @@ void testCallingTheseMethodsShouldBeTraced() {
                     span.hasName("TestClass.annotated")
                         .hasAttributesSatisfyingExactly(
                             equalTo(
-                                CodeIncubatingAttributes.CODE_NAMESPACE, TestClass.class.getName()),
-                            equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "annotated"))));
+                                CodeIncubatingAttributes.CODE_FUNCTION_NAME,
+                                TestClass.class.getName() + ".annotated"))));
   }
 
   @Test