Disable data streams http & grpc instrumentations by default

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

@@ -22,6 +22,8 @@
 
 public abstract class HttpClientDecorator<REQUEST, RESPONSE> extends UriBasedClientDecorator {
   public static final LinkedHashMap<String, String> CLIENT_PATHWAY_EDGE_TAGS;
+  public static final boolean SHOULD_INSTRUMENT_DATA_STREAMS =
+      Config.get().isHttpDataStreamsEnabled();
 
   static {
     CLIENT_PATHWAY_EDGE_TAGS = new LinkedHashMap<>(2);

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

@@ -73,6 +73,8 @@ public abstract class HttpServerDecorator<REQUEST, CONNECTION, RESPONSE, REQUEST
           && Config.get().isRuleEnabled("Status404Decorator");
   private static final boolean SHOULD_SET_URL_RESOURCE_NAME =
       Config.get().isRuleEnabled("URLAsResourceNameRule");
+  private static final boolean SHOULD_INSTRUMENT_DATA_STREAMS =
+      Config.get().isHttpDataStreamsEnabled();
 
   private static final BitSet SERVER_ERROR_STATUSES = Config.get().getHttpServerErrorStatuses();
 
@@ -146,7 +148,7 @@ public AgentSpan startSpan(
       span.setRequestBlockingAction((Flow.Action.RequestBlockingAction) flow.getAction());
     }
     AgentPropagation.ContextVisitor<REQUEST_CARRIER> getter = getter();
-    if (null != carrier && null != getter) {
+    if (null != carrier && null != getter && SHOULD_INSTRUMENT_DATA_STREAMS) {
       tracer().getDataStreamsMonitoring().setCheckpoint(span, SERVER_PATHWAY_EDGE_TAGS, 0, 0);
     }
     return span;

dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpSingleRequestInstrumentation.java

@@ -79,9 +79,11 @@ public static AgentScope methodEnter(
 
       if (request != null) {
         propagate().inject(span, request, headers);
-        propagate()
-            .injectPathwayContext(
-                span, request, headers, HttpClientDecorator.CLIENT_PATHWAY_EDGE_TAGS);
+        if (HttpClientDecorator.SHOULD_INSTRUMENT_DATA_STREAMS) {
+          propagate()
+              .injectPathwayContext(
+                  span, request, headers, HttpClientDecorator.CLIENT_PATHWAY_EDGE_TAGS);
+        }
         // Request is immutable, so we have to assign new value once we update headers
         request = headers.getRequest();
       }

dd-java-agent/instrumentation/akka-http/akka-http-10.6/src/main/java11/datadog/trace/instrumentation/akkahttp106/SingleRequestAdvice.java

@@ -29,9 +29,11 @@ public static AgentScope methodEnter(
 
     if (request != null) {
       propagate().inject(span, request, headers);
-      propagate()
-          .injectPathwayContext(
-              span, request, headers, HttpClientDecorator.CLIENT_PATHWAY_EDGE_TAGS);
+      if (HttpClientDecorator.SHOULD_INSTRUMENT_DATA_STREAMS) {
+        propagate()
+            .injectPathwayContext(
+                span, request, headers, HttpClientDecorator.CLIENT_PATHWAY_EDGE_TAGS);
+      }
       // Request is immutable, so we have to assign new value once we update headers
       request = headers.getRequest();
     }

dd-java-agent/instrumentation/apache-httpasyncclient-4/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/DelegatingRequestProducer.java

@@ -35,8 +35,10 @@ public HttpRequest generateRequest() throws IOException, HttpException {
     DECORATE.onRequest(span, new HostAndRequestAsHttpUriRequest(delegate.getTarget(), request));
 
     propagate().inject(span, request, SETTER);
-    propagate()
-        .injectPathwayContext(span, request, SETTER, HttpClientDecorator.CLIENT_PATHWAY_EDGE_TAGS);
+    if (HttpClientDecorator.SHOULD_INSTRUMENT_DATA_STREAMS) {
+      propagate()
+          .injectPathwayContext(span, request, SETTER, HttpClientDecorator.CLIENT_PATHWAY_EDGE_TAGS);
+    }
 
     return request;
   }

dd-java-agent/instrumentation/apache-httpclient-4/src/main/java/datadog/trace/instrumentation/apachehttpclient/HelperMethods.java

@@ -46,9 +46,11 @@ private static AgentScope activateHttpSpan(final HttpUriRequest request) {
     // AWS calls are often signed, so we can't add headers without breaking the signature.
     if (!awsClientCall) {
       propagate().inject(span, request, SETTER);
-      propagate()
-          .injectPathwayContext(
-              span, request, SETTER, HttpClientDecorator.CLIENT_PATHWAY_EDGE_TAGS);
+      if (HttpClientDecorator.SHOULD_INSTRUMENT_DATA_STREAMS) {
+        propagate()
+            .injectPathwayContext(
+                span, request, SETTER, HttpClientDecorator.CLIENT_PATHWAY_EDGE_TAGS);
+      }
     }
 
     return scope;

dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/DelegatingRequestChannel.java

@@ -28,8 +28,10 @@ public void sendRequest(HttpRequest request, EntityDetails entityDetails, HttpCo
     DECORATE.onRequest(span, request);
 
     propagate().inject(span, request, SETTER);
-    propagate()
-        .injectPathwayContext(span, request, SETTER, HttpClientDecorator.CLIENT_PATHWAY_EDGE_TAGS);
+    if (HttpClientDecorator.SHOULD_INSTRUMENT_DATA_STREAMS) {
+      propagate()
+          .injectPathwayContext(span, request, SETTER, HttpClientDecorator.CLIENT_PATHWAY_EDGE_TAGS);
+    }
     delegate.sendRequest(request, entityDetails, context);
   }
 }

dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HelperMethods.java

@@ -46,9 +46,11 @@ private static AgentScope activateHttpSpan(final HttpRequest request) {
     // AWS calls are often signed, so we can't add headers without breaking the signature.
     if (!awsClientCall) {
       propagate().inject(span, request, SETTER);
-      propagate()
-          .injectPathwayContext(
-              span, request, SETTER, HttpClientDecorator.CLIENT_PATHWAY_EDGE_TAGS);
+      if (HttpClientDecorator.SHOULD_INSTRUMENT_DATA_STREAMS) {
+        propagate()
+            .injectPathwayContext(
+                span, request, SETTER, HttpClientDecorator.CLIENT_PATHWAY_EDGE_TAGS);
+      }
     }
 
     return scope;

dd-java-agent/instrumentation/armeria-grpc/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ClientCallImplInstrumentation.java

@@ -6,6 +6,7 @@
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.propagate;
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
 import static datadog.trace.instrumentation.armeria.grpc.client.GrpcClientDecorator.CLIENT_PATHWAY_EDGE_TAGS;
+import static datadog.trace.instrumentation.armeria.grpc.client.GrpcClientDecorator.SHOULD_INSTRUMENT_DATA_STREAMS;
 import static datadog.trace.instrumentation.armeria.grpc.client.GrpcClientDecorator.DECORATE;
 import static datadog.trace.instrumentation.armeria.grpc.client.GrpcClientDecorator.GRPC_MESSAGE;
 import static datadog.trace.instrumentation.armeria.grpc.client.GrpcClientDecorator.OPERATION_NAME;
@@ -19,10 +20,12 @@
 import datadog.trace.agent.tooling.Instrumenter;
 import datadog.trace.agent.tooling.InstrumenterModule;
 import datadog.trace.agent.tooling.muzzle.Reference;
+import datadog.trace.api.Config;
 import datadog.trace.api.InstrumenterConfig;
 import datadog.trace.bootstrap.InstrumentationContext;
 import datadog.trace.bootstrap.instrumentation.api.AgentScope;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
+import datadog.trace.bootstrap.instrumentation.decorator.HttpClientDecorator;
 import io.grpc.ClientCall;
 import io.grpc.Metadata;
 import io.grpc.MethodDescriptor;
@@ -121,7 +124,9 @@ public static <T> AgentScope before(
         span = InstrumentationContext.get(ClientCall.class, AgentSpan.class).get(call);
         if (null != span) {
           propagate().inject(span, headers, SETTER);
-          propagate().injectPathwayContext(span, headers, SETTER, CLIENT_PATHWAY_EDGE_TAGS);
+          if (SHOULD_INSTRUMENT_DATA_STREAMS) {
+            propagate().injectPathwayContext(span, headers, SETTER, CLIENT_PATHWAY_EDGE_TAGS);
+          }
           return activateSpan(span);
         }
       }

dd-java-agent/instrumentation/armeria-grpc/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/GrpcClientDecorator.java

@@ -38,6 +38,8 @@ private static LinkedHashMap<String, String> createClientPathwaySortedTags() {
 
   public static final LinkedHashMap<String, String> CLIENT_PATHWAY_EDGE_TAGS =
       createClientPathwaySortedTags();
+  public static final boolean SHOULD_INSTRUMENT_DATA_STREAMS =
+      Config.get().isGrpcDataStreamsEnabled();
 
   public static final GrpcClientDecorator DECORATE = new GrpcClientDecorator();
 

dd-java-agent/instrumentation/armeria-grpc/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/TracingServerInterceptor.java

@@ -45,6 +45,8 @@ public class TracingServerInterceptor implements ServerInterceptor {
 
   public static final TracingServerInterceptor INSTANCE = new TracingServerInterceptor();
   private static final Set<String> IGNORED_METHODS = Config.get().getGrpcIgnoredInboundMethods();
+  private static final boolean SHOULD_INSTRUMENT_DATA_STREAMS =
+      Config.get().isGrpcDataStreamsEnabled();
 
   private TracingServerInterceptor() {}
 
@@ -69,9 +71,11 @@ public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(
     final AgentSpan span =
         startSpan(DECORATE.instrumentationNames()[0], GRPC_SERVER, spanContext).setMeasured(true);
 
-    AgentTracer.get()
-        .getDataStreamsMonitoring()
-        .setCheckpoint(span, SERVER_PATHWAY_EDGE_TAGS, 0, 0);
+    if (SHOULD_INSTRUMENT_DATA_STREAMS) {
+      AgentTracer.get()
+          .getDataStreamsMonitoring()
+          .setCheckpoint(span, SERVER_PATHWAY_EDGE_TAGS, 0, 0);
+    }
 
     RequestContext reqContext = span.getRequestContext();
     if (reqContext != null) {

dd-java-agent/instrumentation/commons-httpclient-2/src/main/java/datadog/trace/instrumentation/commonshttpclient/CommonsHttpClientInstrumentation.java

@@ -66,9 +66,11 @@ public static AgentScope methodEnter(@Advice.Argument(1) final HttpMethod httpMe
       DECORATE.afterStart(span);
       DECORATE.onRequest(span, httpMethod);
       propagate().inject(span, httpMethod, SETTER);
-      propagate()
-          .injectPathwayContext(
-              span, httpMethod, SETTER, HttpClientDecorator.CLIENT_PATHWAY_EDGE_TAGS);
+      if (HttpClientDecorator.SHOULD_INSTRUMENT_DATA_STREAMS) {
+        propagate()
+            .injectPathwayContext(
+                span, httpMethod, SETTER, HttpClientDecorator.CLIENT_PATHWAY_EDGE_TAGS);
+      }
 
       return scope;
     }

dd-java-agent/instrumentation/google-http-client/src/main/java/datadog/trace/instrumentation/googlehttpclient/GoogleHttpClientDecorator.java

@@ -38,8 +38,10 @@ public AgentSpan prepareSpan(AgentSpan span, HttpRequest request) {
     DECORATE.afterStart(span);
     DECORATE.onRequest(span, request);
     propagate().inject(span, request, SETTER);
-    propagate()
-        .injectPathwayContext(span, request, SETTER, HttpClientDecorator.CLIENT_PATHWAY_EDGE_TAGS);
+    if (HttpClientDecorator.SHOULD_INSTRUMENT_DATA_STREAMS) {
+      propagate()
+          .injectPathwayContext(span, request, SETTER, HttpClientDecorator.CLIENT_PATHWAY_EDGE_TAGS);
+    }
     return span;
   }
 

dd-java-agent/instrumentation/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/AsyncHttpClientInstrumentation.java

@@ -67,9 +67,11 @@ public static void onEnter(
       DECORATE.afterStart(span);
       DECORATE.onRequest(span, request);
       propagate().inject(span, request, SETTER);
-      propagate()
-          .injectPathwayContext(
-              span, request, SETTER, HttpClientDecorator.CLIENT_PATHWAY_EDGE_TAGS);
+      if (HttpClientDecorator.SHOULD_INSTRUMENT_DATA_STREAMS) {
+        propagate()
+            .injectPathwayContext(
+                span, request, SETTER, HttpClientDecorator.CLIENT_PATHWAY_EDGE_TAGS);
+      }
       handler = new AsyncHandlerAdapter<>(span, parentSpan, handler);
     }
   }

dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/ClientCallImplInstrumentation.java

@@ -4,6 +4,7 @@
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.propagate;
 import static datadog.trace.instrumentation.grpc.client.GrpcClientDecorator.CLIENT_PATHWAY_EDGE_TAGS;
+import static datadog.trace.instrumentation.grpc.client.GrpcClientDecorator.SHOULD_INSTRUMENT_DATA_STREAMS;
 import static datadog.trace.instrumentation.grpc.client.GrpcClientDecorator.DECORATE;
 import static datadog.trace.instrumentation.grpc.client.GrpcInjectAdapter.SETTER;
 import static net.bytebuddy.matcher.ElementMatchers.isConstructor;
@@ -16,6 +17,7 @@
 import datadog.trace.bootstrap.InstrumentationContext;
 import datadog.trace.bootstrap.instrumentation.api.AgentScope;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
+import datadog.trace.bootstrap.instrumentation.decorator.HttpClientDecorator;
 import io.grpc.ClientCall;
 import io.grpc.Grpc;
 import io.grpc.Metadata;
@@ -93,7 +95,9 @@ public static AgentScope before(
       span = InstrumentationContext.get(ClientCall.class, AgentSpan.class).get(call);
       if (null != span) {
         propagate().inject(span, headers, SETTER);
-        propagate().injectPathwayContext(span, headers, SETTER, CLIENT_PATHWAY_EDGE_TAGS);
+        if (SHOULD_INSTRUMENT_DATA_STREAMS) {
+          propagate().injectPathwayContext(span, headers, SETTER, CLIENT_PATHWAY_EDGE_TAGS);
+        }
         return activateSpan(span);
       }
       return null;

dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/GrpcClientDecorator.java

@@ -38,6 +38,8 @@ private static LinkedHashMap<String, String> createClientPathwaySortedTags() {
 
   public static final LinkedHashMap<String, String> CLIENT_PATHWAY_EDGE_TAGS =
       createClientPathwaySortedTags();
+  public static final boolean SHOULD_INSTRUMENT_DATA_STREAMS =
+      Config.get().isGrpcDataStreamsEnabled();
 
   public static final GrpcClientDecorator DECORATE = new GrpcClientDecorator();
 

dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/TracingServerInterceptor.java

@@ -45,6 +45,8 @@ public class TracingServerInterceptor implements ServerInterceptor {
 
   public static final TracingServerInterceptor INSTANCE = new TracingServerInterceptor();
   private static final Set<String> IGNORED_METHODS = Config.get().getGrpcIgnoredInboundMethods();
+  private static final boolean SHOULD_INSTRUMENT_DATA_STREAMS =
+      Config.get().isGrpcDataStreamsEnabled();
 
   private TracingServerInterceptor() {}
 
@@ -68,9 +70,11 @@ public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(
     CallbackProvider cbp = tracer.getCallbackProvider(RequestContextSlot.APPSEC);
     final AgentSpan span = startSpan(GRPC_SERVER, spanContext).setMeasured(true);
 
-    AgentTracer.get()
-        .getDataStreamsMonitoring()
-        .setCheckpoint(span, SERVER_PATHWAY_EDGE_TAGS, 0, 0);
+    if (SHOULD_INSTRUMENT_DATA_STREAMS) {
+      AgentTracer.get()
+          .getDataStreamsMonitoring()
+          .setCheckpoint(span, SERVER_PATHWAY_EDGE_TAGS, 0, 0);
+    }
 
     RequestContext reqContext = span.getRequestContext();
     if (reqContext != null) {

dd-java-agent/instrumentation/http-url-connection/src/main/java/datadog/trace/instrumentation/http_url_connection/HttpUrlConnectionInstrumentation.java

@@ -85,9 +85,11 @@ public static HttpUrlState methodEnter(
           final AgentSpan span = state.start(thiz);
           if (!connected) {
             propagate().inject(span, thiz, SETTER);
-            propagate()
-                .injectPathwayContext(
-                    span, thiz, SETTER, HttpClientDecorator.CLIENT_PATHWAY_EDGE_TAGS);
+            if (HttpClientDecorator.SHOULD_INSTRUMENT_DATA_STREAMS) {
+              propagate()
+                  .injectPathwayContext(
+                      span, thiz, SETTER, HttpClientDecorator.CLIENT_PATHWAY_EDGE_TAGS);
+            }
           }
         }
         return state;

dd-java-agent/instrumentation/java-http-client/src/main/java11/datadog/trace/instrumentation/httpclient/HeadersAdvice.java

@@ -19,9 +19,11 @@ public static void methodExit(@Advice.Return(readOnly = false) HttpHeaders heade
     final Map<String, List<String>> headerMap = new HashMap<>(headers.map());
     final AgentSpan span = activeSpan();
     propagate().inject(span, headerMap, SETTER);
-    propagate()
-        .injectPathwayContext(
-            span, headerMap, SETTER, HttpClientDecorator.CLIENT_PATHWAY_EDGE_TAGS);
+    if (HttpClientDecorator.SHOULD_INSTRUMENT_DATA_STREAMS) {
+      propagate()
+          .injectPathwayContext(
+              span, headerMap, SETTER, HttpClientDecorator.CLIENT_PATHWAY_EDGE_TAGS);
+    }
     headers = HttpHeaders.of(headerMap, KEEP);
   }
 }

dd-java-agent/instrumentation/jax-rs-client-1.1/src/main/java/datadog/trace/instrumentation/jaxrs/v1/JaxRsClientV1Instrumentation.java

@@ -76,9 +76,11 @@ public static AgentScope onEnter(
         request.getProperties().put(DD_SPAN_ATTRIBUTE, span);
 
         propagate().inject(span, request.getHeaders(), SETTER);
-        propagate()
-            .injectPathwayContext(
-                span, request.getHeaders(), SETTER, HttpClientDecorator.CLIENT_PATHWAY_EDGE_TAGS);
+        if (HttpClientDecorator.SHOULD_INSTRUMENT_DATA_STREAMS) {
+          propagate()
+              .injectPathwayContext(
+                  span, request.getHeaders(), SETTER, HttpClientDecorator.CLIENT_PATHWAY_EDGE_TAGS);
+        }
         return activateSpan(span);
       }
       return null;

dd-java-agent/instrumentation/jax-rs-client-2.0/src/main/java/datadog/trace/instrumentation/jaxrs/ClientTracingFilter.java

@@ -29,12 +29,14 @@ public void filter(final ClientRequestContext requestContext) {
       DECORATE.onRequest(span, requestContext);
 
       propagate().inject(span, requestContext.getHeaders(), SETTER);
-      propagate()
-          .injectPathwayContext(
-              span,
-              requestContext.getHeaders(),
-              SETTER,
-              HttpClientDecorator.CLIENT_PATHWAY_EDGE_TAGS);
+      if (HttpClientDecorator.SHOULD_INSTRUMENT_DATA_STREAMS) {
+        propagate()
+            .injectPathwayContext(
+                span,
+                requestContext.getHeaders(),
+                SETTER,
+                HttpClientDecorator.CLIENT_PATHWAY_EDGE_TAGS);
+      }
 
       requestContext.setProperty(SPAN_PROPERTY_NAME, span);
     }

dd-java-agent/instrumentation/jetty-client/jetty-client-10.0/src/main/java11/datadog/trace/instrumentation/jetty_client10/SendAdvice.java

@@ -26,8 +26,10 @@ public static AgentSpan methodEnter(
     DECORATE.afterStart(span);
     DECORATE.onRequest(span, request);
     propagate().inject(span, request, SETTER);
-    propagate()
-        .injectPathwayContext(span, request, SETTER, HttpClientDecorator.CLIENT_PATHWAY_EDGE_TAGS);
+    if (HttpClientDecorator.SHOULD_INSTRUMENT_DATA_STREAMS) {
+      propagate()
+          .injectPathwayContext(span, request, SETTER, HttpClientDecorator.CLIENT_PATHWAY_EDGE_TAGS);
+    }
     return span;
   }
 

dd-java-agent/instrumentation/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/SendAdvice.java

@@ -21,8 +21,10 @@ public static AgentScope methodEnter(@Advice.This final HttpRequest request) {
     JettyClientDecorator.DECORATE.afterStart(span);
     JettyClientDecorator.DECORATE.onRequest(span, request);
     propagate().inject(span, request, SETTER);
-    propagate()
-        .injectPathwayContext(span, request, SETTER, HttpClientDecorator.CLIENT_PATHWAY_EDGE_TAGS);
+    if (HttpClientDecorator.SHOULD_INSTRUMENT_DATA_STREAMS) {
+      propagate()
+          .injectPathwayContext(span, request, SETTER, HttpClientDecorator.CLIENT_PATHWAY_EDGE_TAGS);
+    }
     return activateSpan(span);
   }
 

dd-java-agent/instrumentation/jetty-client/jetty-client-9.1/src/main/java/datadog/trace/instrumentation/jetty_client91/JettyClientInstrumentation.java

@@ -92,9 +92,11 @@ public static AgentSpan methodEnter(
       DECORATE.afterStart(span);
       DECORATE.onRequest(span, request);
       propagate().inject(span, request, SETTER);
-      propagate()
-          .injectPathwayContext(
-              span, request, SETTER, HttpClientDecorator.CLIENT_PATHWAY_EDGE_TAGS);
+      if (HttpClientDecorator.SHOULD_INSTRUMENT_DATA_STREAMS) {
+        propagate()
+            .injectPathwayContext(
+                span, request, SETTER, HttpClientDecorator.CLIENT_PATHWAY_EDGE_TAGS);
+      }
       return span;
     }