Merge branch 'master' into sarahchen6/upgrade-bytebuddy

Author: sarahchen6

dd-java-agent/instrumentation/jdbc/scalikejdbc/build.gradle

@@ -34,7 +34,7 @@ dependencies {
   testImplementation libs.scala
 
   latestDepTestImplementation group: 'org.scalikejdbc', name: 'scalikejdbc_2.13', version: '3.+'
-  latestDepTestImplementation group: 'org.scala-lang', name: 'scala-library', version: '+'
+  latestDepTestImplementation group: 'org.scala-lang', name: 'scala-library', version: '2.+' // scala-lang 3.x requires scala 3.x compiler
 
   // jdbc unit testing
   testImplementation group: 'com.h2database', name: 'h2', version: '1.3.169'

dd-java-agent/instrumentation/scala-concurrent/build.gradle

@@ -41,7 +41,7 @@ dependencies {
 
   latest11TestImplementation group: 'org.scala-lang', name: 'scala-library', version: '2.11.+'
   latest12TestImplementation group: 'org.scala-lang', name: 'scala-library', version: '2.12.+'
-  latestDepTestImplementation group: 'org.scala-lang', name: 'scala-library', version: '+'
+  latestDepTestImplementation group: 'org.scala-lang', name: 'scala-library', version: '2.+' // scala-lang 3.x requires scala 3.x compiler
   latestDepTestImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.13')
 }
 

dd-java-agent/instrumentation/scala-promise/scala-promise-2.13/build.gradle

@@ -70,6 +70,6 @@ dependencies {
   testImplementation group: 'org.scala-lang', name: 'scala-library', version: '2.13.0'
   testImplementation project(':dd-java-agent:instrumentation:scala-promise')
 
-  latestDepTestImplementation group: 'org.scala-lang', name: 'scala-library', version: '+'
+  latestDepTestImplementation group: 'org.scala-lang', name: 'scala-library', version: '2.+' // scala-lang 3.x requires scala 3.x compiler
   latestDepTestImplementation project(':dd-java-agent:instrumentation:scala-promise')
 }

dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ExceptionDebuggerIntegrationTest.java

@@ -10,6 +10,7 @@
 import datadog.trace.bootstrap.debugger.CapturedContext;
 import datadog.trace.test.agent.decoder.DecodedSpan;
 import datadog.trace.test.agent.decoder.DecodedTrace;
+import datadog.trace.test.util.Flaky;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -19,6 +20,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledIf;
 
+@Flaky
 public class ExceptionDebuggerIntegrationTest extends ServerAppDebuggerIntegrationTest {
 
   private List<String> snapshotIdTags = new ArrayList<>();

dd-trace-core/src/main/java/datadog/trace/civisibility/writer/ddintake/CiTestCycleMapperV1.java

@@ -9,6 +9,7 @@
 import datadog.communication.serialization.msgpack.MsgPackWriter;
 import datadog.trace.api.DDTags;
 import datadog.trace.api.DDTraceId;
+import datadog.trace.api.TagMap;
 import datadog.trace.api.civisibility.CiVisibilityWellKnownTags;
 import datadog.trace.api.civisibility.InstrumentationBridge;
 import datadog.trace.api.civisibility.telemetry.CiVisibilityDistributionMetric;
@@ -84,16 +85,9 @@ public void map(List<? extends CoreSpan<?>> trace, Writable writable) {
 
     for (final CoreSpan<?> span : trace) {
       DDTraceId testSessionId = span.getTag(Tags.TEST_SESSION_ID);
-      span.removeTag(Tags.TEST_SESSION_ID);
-
       Number testModuleId = span.getTag(Tags.TEST_MODULE_ID);
-      span.removeTag(Tags.TEST_MODULE_ID);
-
       Number testSuiteId = span.getTag(Tags.TEST_SUITE_ID);
-      span.removeTag(Tags.TEST_SUITE_ID);
-
       String itrCorrelationId = span.getTag(Tags.ITR_CORRELATION_ID);
-      span.removeTag(Tags.ITR_CORRELATION_ID);
 
       int topLevelTagsCount = 0;
       if (testSessionId != null) {
@@ -323,20 +317,26 @@ MetaWriter withWritable(Writable writable) {
 
     @Override
     public void accept(Metadata metadata) {
+      TagMap tags = metadata.getTags().copy();
+
+      for (String ignoredTag : DEFAULT_TOP_LEVEL_TAGS) {
+        tags.remove(ignoredTag);
+      }
+
       int metaSize =
           metadata.getBaggage().size()
-              + metadata.getTags().size()
+              + tags.size()
               + (null == metadata.getHttpStatusCode() ? 0 : 1);
       int metricsSize = 0;
-      for (Map.Entry<String, Object> tag : metadata.getTags().entrySet()) {
+      for (Map.Entry<String, Object> tag : tags.entrySet()) {
         if (tag.getValue() instanceof Number) {
           ++metricsSize;
           --metaSize;
         }
       }
       writable.writeUTF8(METRICS);
       writable.startMap(metricsSize);
-      for (Map.Entry<String, Object> entry : metadata.getTags().entrySet()) {
+      for (Map.Entry<String, Object> entry : tags.entrySet()) {
         if (entry.getValue() instanceof Number) {
           writable.writeString(entry.getKey(), null);
           writable.writeObject(entry.getValue(), null);
@@ -356,7 +356,7 @@ public void accept(Metadata metadata) {
         writable.writeUTF8(HTTP_STATUS);
         writable.writeUTF8(metadata.getHttpStatusCode());
       }
-      for (Map.Entry<String, Object> entry : metadata.getTags().entrySet()) {
+      for (Map.Entry<String, Object> entry : tags.entrySet()) {
         Object value = entry.getValue();
         if (!(value instanceof Number)) {
           writable.writeString(entry.getKey(), null);

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

@@ -1109,7 +1109,7 @@ public AgentSpan startSpan(
       final CharSequence spanName,
       final AgentSpanContext parent,
       final long startTimeMicros) {
-    return buildSpan(instrumentationName, spanName)
+    return singleSpanBuilder(instrumentationName, spanName)
         .ignoreActiveSpan()
         .asChildOf(parent)
         .withStartTimestamp(startTimeMicros)

dd-trace-core/src/test/groovy/datadog/trace/civisibility/writer/ddintake/CiTestCycleMapperV1PayloadTest.groovy

@@ -149,6 +149,27 @@ class CiTestCycleMapperV1PayloadTest extends DDSpecification {
     assert !spanContent.containsKey("parent_id")
   }
 
+  def "verify result is not affected by successive mapping calls"(){
+    setup:
+    def span = generateRandomSpan(InternalSpanTypes.TEST, [
+      (Tags.TEST_SESSION_ID): DDTraceId.from(123),
+      (Tags.TEST_MODULE_ID) : 456,
+      (Tags.TEST_SUITE_ID)  : 789,
+    ])
+
+    when:
+    whenASpanIsWritten(span)
+    Map<String, Object> deserializedSpan = whenASpanIsWritten(span)
+
+    then:
+    verifyTopLevelTags(deserializedSpan, DDTraceId.from(123), 456, 789)
+
+    def spanContent = (Map<String, Object>) deserializedSpan.get("content")
+    assert spanContent.containsKey("trace_id")
+    assert spanContent.containsKey("span_id")
+    assert spanContent.containsKey("parent_id")
+  }
+
   private static void verifyTopLevelTags(Map<String, Object> deserializedSpan, DDTraceId testSessionId, Long testModuleId, Long testSuiteId) {
     Map<String, Object> deserializedSpanContent = (Map<String, Object>) deserializedSpan.get("content")
     Map<String, Object> deserializedMetrics = (Map<String, Object>) deserializedSpanContent.get("metrics")