otel annotations

Author: SylvainJuge

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().getCanonicalName() + ".completable"))));
   }
 
   @Test
@@ -82,8 +81,7 @@ 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 +98,7 @@ 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 +115,7 @@ 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 +134,6 @@ 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/opentelemetry-instrumentation-annotations-1.16/javaagent/src/test/java/io/opentelemetry/test/annotation/AddingSpanAttributesInstrumentationTest.java

@@ -8,8 +8,7 @@
 import static io.opentelemetry.api.common.AttributeKey.stringKey;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
 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 io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.SpanKind;
@@ -43,9 +42,9 @@ void captureAttributesInNewSpan() {
                         .hasParentSpanId(trace.getSpan(0).getSpanId())
                         .hasAttributesSatisfyingExactly(
                             equalTo(
-                                CODE_NAMESPACE,
-                                ExtractAttributesUsingAddingSpanAttributes.class.getName()),
-                            equalTo(CODE_FUNCTION, "withSpanTakesPrecedence"),
+                                CODE_FUNCTION_NAME,
+                                ExtractAttributesUsingAddingSpanAttributes.class.getName()
+                                    + ".withSpanTakesPrecedence"),
                             equalTo(stringKey("implicitName"), "foo"),
                             equalTo(stringKey("explicitName"), "bar"))));
   }