jaxrs-common

Author: SylvainJuge

instrumentation/jaxrs/jaxrs-common/testing/src/main/java/io/opentelemetry/instrumentation/jaxrs/AbstractJaxRsFilterTest.java

@@ -10,8 +10,7 @@
 import static io.opentelemetry.semconv.ErrorAttributes.ERROR_TYPE;
 import static io.opentelemetry.semconv.HttpAttributes.HTTP_REQUEST_METHOD;
 import static io.opentelemetry.semconv.HttpAttributes.HTTP_ROUTE;
-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 io.opentelemetry.api.trace.SpanKind;
@@ -25,7 +24,6 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-@SuppressWarnings("deprecation") // using deprecated semconv
 public abstract class AbstractJaxRsFilterTest<SERVER> extends AbstractHttpServerUsingTest<SERVER> {
 
   protected static class TestResponse {
@@ -143,13 +141,14 @@ void request(
                       if (abortPrematch) {
                         span.hasAttributesSatisfyingExactly(
                             satisfies(
-                                CODE_NAMESPACE,
-                                name -> name.endsWith("JaxRsFilterTest$PrematchRequestFilter")),
-                            equalTo(CODE_FUNCTION, "filter"));
+                                CODE_FUNCTION_NAME,
+                                name ->
+                                    name.endsWith("JaxRsFilterTest$PrematchRequestFilter.filter")));
                       } else {
                         span.hasAttributesSatisfyingExactly(
-                            satisfies(CODE_NAMESPACE, name -> name.contains("Resource$Test")),
-                            equalTo(CODE_FUNCTION, "hello"));
+                            satisfies(
+                                CODE_FUNCTION_NAME,
+                                name -> name.contains("Resource$Test").endsWith(".hello")));
                       }
                     }));
   }
@@ -184,7 +183,8 @@ void nestedCall() throws Exception {
                             .hasKind(SpanKind.INTERNAL)
                             .hasParent(trace.getSpan(0))
                             .hasAttributesSatisfyingExactly(
-                                satisfies(CODE_NAMESPACE, name -> name.contains("Resource$Test")),
-                                equalTo(CODE_FUNCTION, "nested"))));
+                                satisfies(
+                                    CODE_FUNCTION_NAME,
+                                    name -> name.contains("Resource$Test").endsWith(".nested")))));
   }
 }

instrumentation/jaxrs/jaxrs-common/testing/src/main/java/io/opentelemetry/instrumentation/jaxrs/AbstractJaxRsHttpServerTest.java

@@ -8,8 +8,7 @@
 import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.SUCCESS;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
-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 java.util.concurrent.TimeUnit.SECONDS;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
@@ -33,7 +32,6 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
 
-@SuppressWarnings("deprecation") // using deprecated semconv
 public abstract class AbstractJaxRsHttpServerTest<SERVER> extends AbstractHttpServerTest<SERVER> {
 
   protected abstract void awaitBarrier(int amount, TimeUnit timeUnit) throws Exception;
@@ -214,8 +212,8 @@ void shouldHandleAsyncResponse(AsyncResponseTestKind testKind) throws Exception
                                 .hasParent(trace.getSpan(0))
                                 .hasAttributesSatisfyingExactly(
                                     satisfies(
-                                        CODE_NAMESPACE, name -> name.endsWith("JaxRsTestResource")),
-                                    equalTo(CODE_FUNCTION, "asyncOp"),
+                                        CODE_FUNCTION_NAME,
+                                        name -> name.endsWith("JaxRsTestResource.asyncOp")),
                                     equalTo(
                                         AttributeKey.booleanKey("jaxrs.canceled"),
                                         testKind == AsyncResponseTestKind.CANCELED ? true : null));
@@ -302,9 +300,8 @@ void shouldHandleCompletionStage(CompletionStageTestKind testKind) throws Except
                           .hasParent(trace.getSpan(0))
                           .hasAttributesSatisfyingExactly(
                               equalTo(
-                                  CODE_NAMESPACE,
-                                  "io.opentelemetry.instrumentation.jaxrs.v2_0.test.JaxRsTestResource"),
-                              equalTo(CODE_FUNCTION, "jaxRs21Async"));
+                                  CODE_FUNCTION_NAME,
+                                  "io.opentelemetry.instrumentation.jaxrs.v2_0.test.JaxRsTestResource.jaxRs21Async"));
                       if (testKind == CompletionStageTestKind.FAILING) {
                         span.hasStatus(StatusData.error())
                             .hasException(new IllegalStateException("failure"));
@@ -319,7 +316,7 @@ protected SpanDataAssert assertHandlerSpan(
     return span.hasName("JaxRsTestResource." + methodName)
         .hasKind(SpanKind.INTERNAL)
         .hasAttributesSatisfyingExactly(
-            satisfies(CODE_NAMESPACE, name -> name.endsWith("JaxRsTestResource")),
-            equalTo(CODE_FUNCTION, methodName));
+            satisfies(
+                CODE_FUNCTION_NAME, name -> name.endsWith("JaxRsTestResource." + methodName)));
   }
 }