fix jaxrs

Author: SylvainJuge

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

@@ -5,8 +5,7 @@
 
 package io.opentelemetry.instrumentation.jaxrs;
 
-import static io.opentelemetry.instrumentation.testing.junit.code.SemconvCodeStabilityUtil.codeFunctionAssertions;
-import static io.opentelemetry.instrumentation.testing.junit.code.SemconvCodeStabilityUtil.codeFunctionPrefixAssertions;
+import static io.opentelemetry.instrumentation.testing.junit.code.SemconvCodeStabilityUtil.codeFunctionInfixAssertions;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
 import static io.opentelemetry.semconv.ErrorAttributes.ERROR_TYPE;
 import static io.opentelemetry.semconv.HttpAttributes.HTTP_REQUEST_METHOD;
@@ -143,13 +142,10 @@ void request(
                       List<AttributeAssertion> assertions;
                       if (abortPrematch) {
                         assertions =
-                            codeFunctionAssertions(
-                                "JaxRsFilterTest$PrematchRequestFilter", "filter");
+                            codeFunctionInfixAssertions(
+                                ".JaxRsFilterTest$PrematchRequestFilter", "filter");
                       } else {
-                        assertions =
-                            codeFunctionPrefixAssertions(
-                                "io.opentelemetry.instrumentation.jaxrs.v2_0.test.Resource$Test",
-                                "hello");
+                        assertions = codeFunctionInfixAssertions(".Resource$Test", "hello");
                       }
                       span.hasAttributesSatisfyingExactly(assertions);
                     }));
@@ -185,8 +181,6 @@ void nestedCall() throws Exception {
                             .hasKind(SpanKind.INTERNAL)
                             .hasParent(trace.getSpan(0))
                             .hasAttributesSatisfyingExactly(
-                                codeFunctionPrefixAssertions(
-                                    "io.opentelemetry.instrumentation.jaxrs.v2_0.test.Resource$Test",
-                                    "nested"))));
+                                codeFunctionInfixAssertions(".Resource$Test", "nested"))));
   }
 }

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

@@ -5,7 +5,7 @@
 
 package io.opentelemetry.instrumentation.jaxrs;
 
-import static io.opentelemetry.instrumentation.testing.junit.code.SemconvCodeStabilityUtil.codeFunctionAssertions;
+import static io.opentelemetry.instrumentation.testing.junit.code.SemconvCodeStabilityUtil.codeFunctionInfixAssertions;
 import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.SUCCESS;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
 import static java.util.concurrent.TimeUnit.SECONDS;
@@ -190,8 +190,7 @@ void shouldHandleAsyncResponse(AsyncResponseTestKind testKind) throws Exception
     testKind.assertBody(response.contentUtf8());
 
     List<AttributeAssertion> attributeAssertions =
-        codeFunctionAssertions(
-            "io.opentelemetry.instrumentation.jaxrs.v2_0.test.JaxRsTestResource", "asyncOp");
+        codeFunctionInfixAssertions("test.JaxRsTestResource", "asyncOp");
 
     if (testKind == AsyncResponseTestKind.CANCELED) {
       attributeAssertions.add(equalTo(AttributeKey.booleanKey("jaxrs.canceled"), true));
@@ -301,9 +300,7 @@ void shouldHandleCompletionStage(CompletionStageTestKind testKind) throws Except
                           .hasKind(SpanKind.INTERNAL)
                           .hasParent(trace.getSpan(0))
                           .hasAttributesSatisfyingExactly(
-                              codeFunctionAssertions(
-                                  "io.opentelemetry.instrumentation.jaxrs.v2_0.test.JaxRsTestResource",
-                                  "jaxRs21Async"));
+                              codeFunctionInfixAssertions(".JaxRsTestResource", "jaxRs21Async"));
                       if (testKind == CompletionStageTestKind.FAILING) {
                         span.hasStatus(StatusData.error())
                             .hasException(new IllegalStateException("failure"));
@@ -318,7 +315,6 @@ protected SpanDataAssert assertHandlerSpan(
     return span.hasName("JaxRsTestResource." + methodName)
         .hasKind(SpanKind.INTERNAL)
         .hasAttributesSatisfyingExactly(
-            codeFunctionAssertions(
-                "io.opentelemetry.instrumentation.jaxrs.v2_0.test.JaxRsTestResource", methodName));
+            codeFunctionInfixAssertions(".JaxRsTestResource", methodName));
   }
 }

testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/code/SemconvCodeStabilityUtil.java

@@ -59,6 +59,14 @@ public static List<AttributeAssertion> codeFunctionSuffixAssertions(
         v -> v.endsWith(namespaceSuffix));
   }
 
+  public static List<AttributeAssertion> codeFunctionInfixAssertions(
+      String namespaceInfix, String methodName) {
+    return internalFunctionAssert(
+        methodName,
+        v -> v.contains(namespaceInfix).endsWith("." + methodName),
+        v -> v.contains(namespaceInfix));
+  }
+
   public static List<AttributeAssertion> codeFunctionPrefixAssertions(
       String namespacePrefix, String methodName) {
     return internalFunctionAssert(