Manage multiple SpanAttribute annotations (#9412)

Author: cecile75

dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/WithSpanDecorator.java

@@ -128,7 +128,6 @@ public void addTagsFromMethodArgs(AgentSpan span, Method method, Object[] args)
         if (name != null) {
           span.setTag(name, args[parameterIndex]);
         }
-        break;
       }
     }
   }

dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/test/groovy/SpanAttributeAnnotationTest.groovy

@@ -40,5 +40,29 @@ class SpanAttributeAnnotationTest extends AgentTestRunner {
     'list'   | ['value1', 'value2', 'value3']
     typeName = type.substring(0, 1).toUpperCase() + type.substring(1)
   }
+
+  def "test multiple SpanAttribute"() {
+    setup:
+    def methodName = "sayHelloWithMultipleAttributes"
+    TracedMethods."$methodName"("param1", "param2")
+
+    expect:
+    assertTraces(1) {
+      trace(1) {
+        span {
+          resourceName "TracedMethods.$methodName"
+          operationName "TracedMethods.$methodName"
+          parent()
+          errored false
+          tags {
+            defaultTags()
+            "$Tags.COMPONENT" "opentelemetry"
+            "custom-tag1" "param1"
+            "custom-tag2" "param2"
+          }
+        }
+      }
+    }
+  }
 }
 

dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/test/java/annotatedsample/TracedMethods.java

@@ -75,6 +75,12 @@ public static String sayHelloWithListAttribute(@SpanAttribute("custom-tag") List
     return "hello!";
   }
 
+  @WithSpan
+  public static String sayHelloWithMultipleAttributes(
+      @SpanAttribute("custom-tag1") String param1, @SpanAttribute("custom-tag2") String param2) {
+    return "hello!";
+  }
+
   @WithSpan
   public static void throwException() {
     throw new RuntimeException("Some exception");

dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.26/src/test/groovy/AddingSpanAttributesAnnotationTest.groovy

@@ -43,6 +43,33 @@ class AddingSpanAttributesAnnotationTest extends AgentTestRunner {
     typeName = type.substring(0, 1).toUpperCase() + type.substring(1)
   }
 
+  def "test AddingSpanAttributes annotated method with multiple annotated parameters"() {
+    setup:
+    def methodName = "sayHelloWithMultipleAttributes"
+    def testSpan = TEST_TRACER.startSpan("test", "operation")
+    def scope = TEST_TRACER.activateManualSpan(testSpan)
+    AnnotatedMethods."$methodName"("param1", "param2")
+    scope.close()
+    testSpan.finish()
+
+    expect:
+    assertTraces(1) {
+      trace(1) {
+        span {
+          resourceName "operation"
+          operationName "operation"
+          parent()
+          errored false
+          tags {
+            defaultTags()
+            "custom-tag1" "param1"
+            "custom-tag2" "param2"
+          }
+        }
+      }
+    }
+  }
+
   def "test AddingSpanAttributes annotated method is skipped if no active span"() {
     setup:
     def testSpan = TEST_TRACER.startSpan("test", "operation")

dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.26/src/test/java/annotatedsample/AnnotatedMethods.java

@@ -24,4 +24,10 @@ public static String sayHelloWithLongAttribute(@SpanAttribute("custom-tag") long
   public static String sayHelloWithListAttribute(@SpanAttribute("custom-tag") List<?> param) {
     return "hello!";
   }
+
+  @AddingSpanAttributes
+  public static String sayHelloWithMultipleAttributes(
+      @SpanAttribute("custom-tag1") String param1, @SpanAttribute("custom-tag2") String param2) {
+    return "hello!";
+  }
 }