Incorporating TagMap into the tracer

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecorator.java

@@ -13,6 +13,7 @@
 import datadog.trace.api.Config;
 import datadog.trace.api.DDTags;
 import datadog.trace.api.DDTraceId;
+import datadog.trace.api.TagMap;
 import datadog.trace.api.TraceConfig;
 import datadog.trace.api.function.TriConsumer;
 import datadog.trace.api.function.TriFunction;
@@ -408,7 +409,7 @@ public String getSpanType() {
     }
 
     @Override
-    public Map<String, Object> getTags() {
+    public TagMap getTags() {
       return serverSpan.getTags();
     }
 

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/AbstractTestSession.java

@@ -72,7 +72,7 @@ public AbstractTestSession(
     AgentSpanContext traceContext =
         new TagContext(
             CIConstants.CIAPP_TEST_ORIGIN,
-            Collections.emptyMap(),
+            null,
             null,
             null,
             PrioritySampling.UNSET,

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/TestImpl.java

@@ -44,7 +44,6 @@
 import datadog.trace.civisibility.test.ExecutionResults;
 import java.lang.reflect.Method;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.function.Consumer;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -101,8 +100,7 @@ public TestImpl(
 
     this.context = new TestContextImpl(coverageStore);
 
-    AgentSpanContext traceContext =
-        new TagContext(CIConstants.CIAPP_TEST_ORIGIN, Collections.emptyMap());
+    AgentSpanContext traceContext = new TagContext(CIConstants.CIAPP_TEST_ORIGIN, null);
     AgentTracer.SpanBuilder spanBuilder =
         AgentTracer.get()
             .buildSpan(CI_VISIBILITY_INSTRUMENTATION_NAME, testDecorator.component() + ".test")

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/exception/DefaultExceptionDebuggerTest.java

@@ -27,6 +27,7 @@
 import com.datadog.debugger.util.ExceptionHelper;
 import com.datadog.debugger.util.TestSnapshotListener;
 import datadog.trace.api.Config;
+import datadog.trace.api.TagMap;
 import datadog.trace.bootstrap.debugger.CapturedContext;
 import datadog.trace.bootstrap.debugger.CapturedStackFrame;
 import datadog.trace.bootstrap.debugger.MethodLocation;
@@ -41,7 +42,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Deque;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -57,7 +57,7 @@ public class DefaultExceptionDebuggerTest {
   private ConfigurationUpdater configurationUpdater;
   private DefaultExceptionDebugger exceptionDebugger;
   private TestSnapshotListener listener;
-  private Map<String, Object> spanTags = new HashMap<>();
+  private TagMap spanTags = TagMap.create();
 
   @BeforeEach
   public void setUp() {

dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/HstsMissingHeaderModuleTest.groovy

@@ -7,6 +7,7 @@ import com.datadog.iast.model.Vulnerability
 import com.datadog.iast.model.VulnerabilityType
 import com.datadog.iast.overhead.Operation
 import com.datadog.iast.overhead.OverheadController
+import datadog.trace.api.TagMap
 import datadog.trace.api.gateway.Flow
 import datadog.trace.api.iast.InstrumentationBridge
 import datadog.trace.api.internal.TraceSegment
@@ -45,10 +46,10 @@ class HstsMissingHeaderModuleTest extends IastModuleImplTestBase {
     final handler = new RequestEndedHandler(dependencies)
     ctx.xForwardedProto = 'https'
     ctx.contentType = "text/html"
-    span.getTags() >> [
+    span.getTags() >> TagMap.fromMap([
       'http.url': 'https://localhost/a',
       'http.status_code': 200i
-    ]
+    ])
 
     when:
     def flow = handler.apply(reqCtx, span)

dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/InsecureAuthProtocolModuleTest.groovy

@@ -5,6 +5,7 @@ import com.datadog.iast.Reporter
 import com.datadog.iast.RequestEndedHandler
 import com.datadog.iast.model.Vulnerability
 import com.datadog.iast.model.VulnerabilityType
+import datadog.trace.api.TagMap
 import datadog.trace.api.gateway.Flow
 import datadog.trace.api.iast.InstrumentationBridge
 import datadog.trace.api.iast.sink.InsecureAuthProtocolModule
@@ -42,9 +43,9 @@ class InsecureAuthProtocolModuleTest extends IastModuleImplTestBase{
     given:
     final handler = new RequestEndedHandler(dependencies)
     ctx.authorization = value
-    span.getTags() >> [
+    span.getTags() >> TagMap.fromMap([
       'http.status_code': status_code
-    ]
+    ])
 
     when:
     def flow = handler.apply(reqCtx, span)

dd-java-agent/agent-iast/src/test/groovy/com/datadog/iast/sink/XContentTypeOptionsModuleTest.groovy

@@ -5,6 +5,7 @@ import com.datadog.iast.Reporter
 import com.datadog.iast.RequestEndedHandler
 import com.datadog.iast.model.Vulnerability
 import com.datadog.iast.model.VulnerabilityType
+import datadog.trace.api.TagMap
 import datadog.trace.api.gateway.Flow
 import datadog.trace.api.iast.InstrumentationBridge
 import datadog.trace.api.internal.TraceSegment
@@ -33,9 +34,9 @@ class XContentTypeOptionsModuleTest extends IastModuleImplTestBase {
     given:
     final handler = new RequestEndedHandler(dependencies)
     ctx.contentType = "text/html"
-    span.getTags() >> [
+    span.getTags() >> TagMap.fromMap([
       'http.status_code': 200i
-    ]
+    ])
 
     when:
     def flow = handler.apply(reqCtx, span)
@@ -56,10 +57,10 @@ class XContentTypeOptionsModuleTest extends IastModuleImplTestBase {
     final handler = new RequestEndedHandler(dependencies)
     ctx.xForwardedProto = 'https'
     ctx.contentType = "text/html"
-    span.getTags() >> [
+    span.getTags() >> TagMap.fromMap([
       'http.url': url,
       'http.status_code': status
-    ]
+    ])
 
     when:
     def flow = handler.apply(reqCtx, span)

dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/AppSecSystemSpecification.groovy

@@ -13,6 +13,7 @@ import datadog.remoteconfig.ConfigurationEndListener
 import datadog.remoteconfig.ConfigurationPoller
 import datadog.remoteconfig.Product
 import datadog.trace.api.Config
+import datadog.trace.api.TagMap
 import datadog.trace.api.internal.TraceSegment
 import datadog.trace.api.gateway.Flow
 import datadog.trace.api.gateway.IGSpanInfo
@@ -72,7 +73,7 @@ class AppSecSystemSpecification extends DDSpecification {
     requestEndedCB.apply(requestContext, span)
 
     then:
-    1 * span.getTags() >> ['http.client_ip':'1.1.1.1']
+    1 * span.getTags() >> TagMap.fromMap(['http.client_ip':'1.1.1.1'])
     1 * subService.registerCallback(EVENTS.requestEnded(), _) >> { requestEndedCB = it[1]; null }
     1 * requestContext.getData(RequestContextSlot.APPSEC) >> appSecReqCtx
     1 * requestContext.traceSegment >> traceSegment

dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/gateway/GatewayBridgeSpecification.groovy

@@ -1,3 +1,4 @@
+
 package com.datadog.appsec.gateway
 
 import com.datadog.appsec.AppSecSystem
@@ -9,6 +10,7 @@ import com.datadog.appsec.event.data.DataBundle
 import com.datadog.appsec.event.data.KnownAddresses
 import com.datadog.appsec.report.AppSecEvent
 import com.datadog.appsec.report.AppSecEventWrapper
+import datadog.trace.api.TagMap
 import datadog.trace.api.function.TriConsumer
 import datadog.trace.api.function.TriFunction
 import datadog.trace.api.gateway.BlockResponseFunction
@@ -167,7 +169,7 @@ class GatewayBridgeSpecification extends DDSpecification {
     def flow = requestEndedCB.apply(mockCtx, spanInfo)
 
     then:
-    1 * spanInfo.getTags() >> ['http.client_ip': '1.1.1.1']
+    1 * spanInfo.getTags() >> TagMap.fromMap(['http.client_ip': '1.1.1.1'])
     1 * mockAppSecCtx.transferCollectedEvents() >> [event]
     1 * mockAppSecCtx.peerAddress >> '2001::1'
     1 * mockAppSecCtx.close()
@@ -206,7 +208,7 @@ class GatewayBridgeSpecification extends DDSpecification {
 
     then:
     1 * mockAppSecCtx.transferCollectedEvents() >> [Stub(AppSecEvent)]
-    1 * spanInfo.getTags() >> ['http.client_ip': '8.8.8.8']
+    1 * spanInfo.getTags() >> TagMap.fromMap(['http.client_ip': '8.8.8.8'])
     1 * traceSegment.setTagTop('actor.ip', '8.8.8.8')
   }
 
@@ -987,7 +989,7 @@ class GatewayBridgeSpecification extends DDSpecification {
       getTraceSegment() >> traceSegment
     }
     final spanInfo = Mock(AgentSpan) {
-      getTags() >> ['http.route':'/']
+      getTags() >> TagMap.fromMap(['http.route':'/'])
     }
 
     when:

dd-trace-api/src/main/java/datadog/trace/api/config/GeneralConfig.java

@@ -100,5 +100,7 @@ public final class GeneralConfig {
   public static final String APM_TRACING_ENABLED = "apm.tracing.enabled";
   public static final String JDK_SOCKET_ENABLED = "jdk.socket.enabled";
 
+  public static final String OPTIMIZED_MAP_ENABLED = "optimized.map.enabled";
+
   private GeneralConfig() {}
 }