JAX-RS: add code.namespace and code.function attributes

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JaxRsAnnotationsTracer.java

@@ -13,6 +13,7 @@
 import io.opentelemetry.instrumentation.api.tracer.BaseTracer;
 import io.opentelemetry.instrumentation.api.tracer.ServerSpan;
 import io.opentelemetry.javaagent.instrumentation.api.ClassHierarchyIterable;
+import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.util.Map;
@@ -51,12 +52,16 @@ public Context startSpan(Context parentContext, Class<?> target, Method method)
     Span span = spanBuilder(parentContext, "jax-rs.request", INTERNAL).startSpan();
     updateSpanNames(
         parentContext, span, ServerSpan.fromContextOrNull(parentContext), target, method);
+    setCodeAttributes(span, target, method);
     return parentContext.with(span);
   }
 
   public void updateSpanNames(
       Context context, Span span, Span serverSpan, Class<?> target, Method method) {
-    String pathBasedSpanName = ServletContextPath.prepend(context, getPathSpanName(target, method));
+    String pathBasedSpanName = getPathSpanName(target, method);
+    if (pathBasedSpanName != null) {
+      pathBasedSpanName = ServletContextPath.prepend(context, pathBasedSpanName);
+    }
     if (serverSpan == null) {
       updateSpanName(span, pathBasedSpanName);
     } else {
@@ -66,11 +71,18 @@ public void updateSpanNames(
   }
 
   private void updateSpanName(Span span, String spanName) {
-    if (!spanName.isEmpty()) {
+    if (spanName != null && !spanName.isEmpty()) {
       span.updateName(spanName);
     }
   }
 
+  private void setCodeAttributes(Span span, Class<?> target, Method method) {
+    span.setAttribute(SemanticAttributes.CODE_NAMESPACE, target.getName());
+    if (method != null) {
+      span.setAttribute(SemanticAttributes.CODE_FUNCTION, method.getName());
+    }
+  }
+
   /**
    * Returns the span name given a JaxRS annotated method. Results are cached so this method can be
    * called multiple times without significantly impacting performance.

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-testing/src/main/groovy/JaxRsAnnotationsInstrumentationTest.groovy

@@ -8,6 +8,7 @@ import static io.opentelemetry.instrumentation.test.utils.ClassUtils.getClassNam
 import static io.opentelemetry.instrumentation.test.utils.TraceUtils.runUnderServerTrace
 
 import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification
+import io.opentelemetry.semconv.trace.attributes.SemanticAttributes
 import javax.ws.rs.DELETE
 import javax.ws.rs.GET
 import javax.ws.rs.HEAD
@@ -21,19 +22,22 @@ abstract class JaxRsAnnotationsInstrumentationTest extends AgentInstrumentationS
 
   def "instrumentation can be used as root span and resource is set to METHOD PATH"() {
     setup:
-    new Jax() {
+    def jax = new Jax() {
       @POST
       @Path("/a")
       void call() {
       }
-    }.call()
+    }
+    jax.call()
 
     expect:
     assertTraces(1) {
       trace(0, 1) {
         span(0) {
           name "/a"
           attributes {
+            "${SemanticAttributes.CODE_NAMESPACE.key}" jax.getClass().getName()
+            "${SemanticAttributes.CODE_FUNCTION.key}" "call"
           }
         }
       }
@@ -61,6 +65,8 @@ abstract class JaxRsAnnotationsInstrumentationTest extends AgentInstrumentationS
           name "${className}.call"
           childOf span(0)
           attributes {
+            "${SemanticAttributes.CODE_NAMESPACE.key}" obj.getClass().getName()
+            "${SemanticAttributes.CODE_FUNCTION.key}" "call"
           }
         }
       }

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-testing/src/main/groovy/JaxRsFilterTest.groovy

@@ -8,6 +8,7 @@ import static io.opentelemetry.api.trace.SpanKind.SERVER
 import static io.opentelemetry.instrumentation.test.utils.TraceUtils.runUnderServerTrace
 
 import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification
+import io.opentelemetry.semconv.trace.attributes.SemanticAttributes
 import javax.ws.rs.container.ContainerRequestContext
 import javax.ws.rs.container.ContainerRequestFilter
 import javax.ws.rs.container.PreMatching
@@ -83,8 +84,15 @@ abstract class JaxRsFilterTest extends AgentInstrumentationSpecification {
         span(1) {
           childOf span(0)
           name controllerName
-          if (!runsOnServer()) {
+          if (abortPrematch) {
+            attributes {
+              "${SemanticAttributes.CODE_NAMESPACE.key}" "JaxRsFilterTest\$PrematchRequestFilter"
+              "${SemanticAttributes.CODE_FUNCTION.key}" "filter"
+            }
+          } else {
             attributes {
+              "${SemanticAttributes.CODE_NAMESPACE.key}" ~/Resource[$]Test*/
+              "${SemanticAttributes.CODE_FUNCTION.key}" "hello"
             }
           }
         }
@@ -135,9 +143,9 @@ abstract class JaxRsFilterTest extends AgentInstrumentationSpecification {
           childOf span(0)
           name controller1Name
           kind INTERNAL
-          if (!runsOnServer()) {
-            attributes {
-            }
+          attributes {
+            "${SemanticAttributes.CODE_NAMESPACE.key}" ~/Resource[$]Test*/
+            "${SemanticAttributes.CODE_FUNCTION.key}" "nested"
           }
         }
       }

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-testing/src/main/groovy/JaxRsHttpServerTest.groovy

@@ -222,6 +222,8 @@ abstract class JaxRsHttpServerTest<S> extends HttpServerTest<S> implements Agent
       }
       childOf((SpanData) parent)
       attributes {
+        "${SemanticAttributes.CODE_NAMESPACE.key}" "JaxRsTestResource"
+        "${SemanticAttributes.CODE_FUNCTION.key}" methodName
         if (isCancelled) {
           "jaxrs.canceled" true
         }