Set test framework and test framework version tags atomically

Author: nikita-tkachenko-datadog

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/utils/SpanUtils.java

@@ -7,7 +7,9 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Map;
 import java.util.TreeSet;
 import java.util.function.BinaryOperator;
 import java.util.function.Consumer;
@@ -83,8 +85,10 @@ private static void setFrameworks(AgentSpan span, Collection<TestFramework> fram
     }
     if (frameworks.size() == 1) {
       TestFramework framework = frameworks.iterator().next();
-      span.setTag(Tags.TEST_FRAMEWORK, framework.getName());
-      span.setTag(Tags.TEST_FRAMEWORK_VERSION, framework.getVersion());
+      Map<String, String> tags = new HashMap<>();
+      tags.put(Tags.TEST_FRAMEWORK, framework.getName());
+      tags.put(Tags.TEST_FRAMEWORK_VERSION, framework.getVersion());
+      span.setAllTags(tags);
       return;
     }
     Collection<String> names = new ArrayList<>(frameworks.size());
@@ -93,8 +97,10 @@ private static void setFrameworks(AgentSpan span, Collection<TestFramework> fram
       names.add(framework.getName());
       versions.add(framework.getVersion());
     }
-    span.setTag(Tags.TEST_FRAMEWORK, names);
-    span.setTag(Tags.TEST_FRAMEWORK_VERSION, versions);
+    Map<String, Collection<String>> tags = new HashMap<>();
+    tags.put(Tags.TEST_FRAMEWORK, names);
+    tags.put(Tags.TEST_FRAMEWORK_VERSION, versions);
+    span.setAllTags(tags);
   }
 
   private static void propagateStatus(AgentSpan parentSpan, AgentSpan childSpan) {

dd-trace-core/src/main/java/datadog/trace/core/DDSpan.java

@@ -485,6 +485,12 @@ public DDSpan setTag(final String tag, final Object value) {
     return this;
   }
 
+  @Override
+  public AgentSpan setAllTags(Map<String, ?> map) {
+    context.setAllTags(map);
+    return this;
+  }
+
   // FIXME [API] this is not on AgentSpan or MutableSpan
   @Override
   public DDSpan removeTag(final String tag) {

internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpan.java

@@ -5,6 +5,7 @@
 import datadog.trace.api.gateway.IGSpanInfo;
 import datadog.trace.api.gateway.RequestContext;
 import datadog.trace.api.interceptor.MutableSpan;
+import java.util.Map;
 
 public interface AgentSpan extends MutableSpan, IGSpanInfo, WithAgentSpan {
 
@@ -28,6 +29,8 @@ public interface AgentSpan extends MutableSpan, IGSpanInfo, WithAgentSpan {
 
   AgentSpan setTag(String key, Object value);
 
+  AgentSpan setAllTags(Map<String, ?> map);
+
   @Override
   AgentSpan setTag(String key, Number value);
 

internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java

@@ -610,6 +610,11 @@ public AgentSpan setTag(final String key, final Object value) {
       return this;
     }
 
+    @Override
+    public AgentSpan setAllTags(Map<String, ?> map) {
+      return this;
+    }
+
     @Override
     public AgentSpan setMetric(final CharSequence key, final int value) {
       return this;