Remove old context propagation API

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

@@ -3,6 +3,7 @@
 import static datadog.trace.api.cache.RadixTreeCache.UNSET_STATUS;
 import static datadog.trace.api.datastreams.DataStreamsContext.fromTags;
 import static datadog.trace.api.gateway.Events.EVENTS;
+import static datadog.trace.bootstrap.instrumentation.api.AgentPropagation.extractContextAndGetSpanContext;
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.traceConfig;
 import static datadog.trace.bootstrap.instrumentation.decorator.http.HttpResourceDecorator.HTTP_RESOURCE_DECORATOR;
 
@@ -128,7 +129,7 @@ public AgentSpanContext.Extracted extract(REQUEST_CARRIER carrier) {
     if (null == carrier || null == getter) {
       return null;
     }
-    return tracer().propagate().extract(carrier, getter);
+    return extractContextAndGetSpanContext(carrier, getter);
   }
 
   /** Deprecated. Use {@link #startSpan(String, Object, AgentSpanContext.Extracted)} instead. */

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/httpurlconnection/HeadersInjectAdapter.java

@@ -1,11 +1,11 @@
 package datadog.trace.bootstrap.instrumentation.httpurlconnection;
 
-import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
+import datadog.context.propagation.CarrierSetter;
 import java.net.HttpURLConnection;
 import javax.annotation.ParametersAreNonnullByDefault;
 
 @ParametersAreNonnullByDefault
-public class HeadersInjectAdapter implements AgentPropagation.Setter<HttpURLConnection> {
+public class HeadersInjectAdapter implements CarrierSetter<HttpURLConnection> {
 
   public static final HeadersInjectAdapter SETTER = new HeadersInjectAdapter();
 

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/rmi/ContextDispatcher.java

@@ -1,6 +1,6 @@
 package datadog.trace.bootstrap.instrumentation.rmi;
 
-import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.propagate;
+import static datadog.trace.bootstrap.instrumentation.api.AgentPropagation.extractContextAndGetSpanContext;
 import static datadog.trace.bootstrap.instrumentation.rmi.ContextPropagator.DD_CONTEXT_CALL_ID;
 import static datadog.trace.bootstrap.instrumentation.rmi.ContextPropagator.PROPAGATOR;
 import static datadog.trace.bootstrap.instrumentation.rmi.ThreadLocalContext.THREAD_LOCAL_CONTEXT;
@@ -43,7 +43,8 @@ public void dispatch(final Remote obj, final RemoteCall call) throws IOException
       final ContextPayload payload = ContextPayload.read(in);
       if (payload != null) {
         final AgentSpanContext context =
-            propagate().extract(payload.getContext(), ContextVisitors.stringValuesMap());
+            extractContextAndGetSpanContext(
+                payload.getContext(), ContextVisitors.stringValuesMap());
         THREAD_LOCAL_CONTEXT.set(context);
       }
     }

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/rmi/ContextPayload.java

@@ -2,7 +2,7 @@
 
 import static datadog.context.propagation.Propagators.defaultPropagator;
 
-import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
+import datadog.context.propagation.CarrierSetter;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import java.io.IOException;
 import java.io.ObjectInput;
@@ -56,7 +56,7 @@ public void write(final ObjectOutput out) throws IOException {
   }
 
   @ParametersAreNonnullByDefault
-  public static class InjectAdapter implements AgentPropagation.Setter<ContextPayload> {
+  public static class InjectAdapter implements CarrierSetter<ContextPayload> {
     @Override
     public void set(final ContextPayload carrier, final String key, final String value) {
       carrier.getContext().put(key, value);

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/rmi/ContextPropagator.java

@@ -62,7 +62,7 @@ private boolean checkIfContextCanBePassed(
     return result;
   }
 
-  /** @returns true when no error happened during call */
+  /** @return {@code true} when no error happened during call */
   private boolean syntheticCall(
       final Connection c, final ContextPayload payload, final int operationId) {
     final StreamRemoteCall shareContextCall = new StreamRemoteCall(c);

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

@@ -1,6 +1,6 @@
 package datadog.trace.civisibility;
 
-import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.propagate;
+import static datadog.trace.bootstrap.instrumentation.api.AgentPropagation.extractContextAndGetSpanContext;
 
 import datadog.trace.api.config.CiVisibilityConfig;
 import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
@@ -33,7 +33,8 @@ public void forEachKey(Properties carrier, AgentPropagation.KeyClassifier classi
 
   ProcessHierarchy() {
     parentProcessModuleContext =
-        propagate().extract(System.getProperties(), SystemPropertiesPropagationGetter.INSTANCE);
+        extractContextAndGetSpanContext(
+            System.getProperties(), SystemPropertiesPropagationGetter.INSTANCE);
   }
 
   /**

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

@@ -3,6 +3,7 @@
 import static datadog.context.propagation.Propagators.defaultPropagator;
 
 import datadog.communication.ddagent.TracerVersion;
+import datadog.context.propagation.CarrierSetter;
 import datadog.trace.api.Config;
 import datadog.trace.api.DDTags;
 import datadog.trace.api.civisibility.CIConstants;
@@ -12,7 +13,6 @@
 import datadog.trace.api.civisibility.domain.JavaAgent;
 import datadog.trace.api.civisibility.telemetry.CiVisibilityMetricCollector;
 import datadog.trace.api.config.CiVisibilityConfig;
-import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext;
 import datadog.trace.bootstrap.instrumentation.api.Tags;
@@ -112,8 +112,8 @@ public <T extends CoverageCalculator> BuildSystemModuleImpl(
 
   @ParametersAreNonnullByDefault
   private static final class ChildProcessPropertiesPropagationSetter
-      implements AgentPropagation.Setter<Map<String, String>> {
-    static final AgentPropagation.Setter<Map<String, String>> INSTANCE =
+      implements CarrierSetter<Map<String, String>> {
+    static final CarrierSetter<Map<String, String>> INSTANCE =
         new ChildProcessPropertiesPropagationSetter();
 
     private ChildProcessPropertiesPropagationSetter() {}

dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/context/propagation/AgentTextMapPropagator.java

@@ -3,6 +3,7 @@
 import static datadog.context.propagation.Propagators.defaultPropagator;
 import static datadog.opentelemetry.shim.trace.OtelSpanContext.fromRemote;
 import static datadog.trace.api.TracePropagationStyle.TRACECONTEXT;
+import static datadog.trace.bootstrap.instrumentation.api.AgentPropagation.extractContextAndGetSpanContext;
 
 import datadog.opentelemetry.shim.context.OtelContext;
 import datadog.opentelemetry.shim.trace.OtelExtractedContext;
@@ -11,7 +12,6 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext.Extracted;
-import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
 import datadog.trace.bootstrap.instrumentation.api.TagContext;
 import datadog.trace.util.PropagationUtils;
 import io.opentelemetry.api.trace.Span;
@@ -47,14 +47,13 @@ public <C> Context extract(Context context, @Nullable C carrier, TextMapGetter<C
       return context;
     }
     Extracted extracted =
-        AgentTracer.propagate()
-            .extract(
-                carrier,
-                (carrier1, classifier) -> {
-                  for (String key : getter.keys(carrier1)) {
-                    classifier.accept(key, getter.get(carrier1, key));
-                  }
-                });
+        extractContextAndGetSpanContext(
+            carrier,
+            (carrier1, classifier) -> {
+              for (String key : getter.keys(carrier1)) {
+                classifier.accept(key, getter.get(carrier1, key));
+              }
+            });
     if (extracted == null) {
       return context;
     } else {

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

@@ -6,7 +6,7 @@
 import akka.http.scaladsl.model.HttpRequest;
 import akka.http.scaladsl.model.HttpResponse;
 import akka.http.scaladsl.model.headers.CustomHeader;
-import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
+import datadog.context.propagation.CarrierSetter;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import javax.annotation.ParametersAreNonnullByDefault;
 import scala.runtime.AbstractFunction1;
@@ -33,7 +33,7 @@ public Void apply(final Try<HttpResponse> result) {
     }
   }
 
-  public static class AkkaHttpHeaders implements AgentPropagation.Setter<HttpRequest> {
+  public static class AkkaHttpHeaders implements CarrierSetter<HttpRequest> {
     private HttpRequest request;
     // Did this request have a span when the AkkaHttpHeaders object was created?
     private final boolean hadSpan;

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

@@ -4,7 +4,7 @@
 import akka.http.scaladsl.model.HttpRequest;
 import akka.http.scaladsl.model.HttpResponse;
 import akka.http.scaladsl.model.headers.CustomHeader;
-import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
+import datadog.context.propagation.CarrierSetter;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import scala.runtime.AbstractFunction1;
 import scala.util.Try;
@@ -30,7 +30,7 @@ public Void apply(final Try<HttpResponse> result) {
     }
   }
 
-  public static class AkkaHttpHeaders implements AgentPropagation.Setter<HttpRequest> {
+  public static class AkkaHttpHeaders implements CarrierSetter<HttpRequest> {
     private HttpRequest request;
     // Did this request have a span when the AkkaHttpHeaders object was created?
     private boolean hadSpan;

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

@@ -1,11 +1,11 @@
 package datadog.trace.instrumentation.apachehttpasyncclient;
 
-import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
+import datadog.context.propagation.CarrierSetter;
 import javax.annotation.ParametersAreNonnullByDefault;
 import org.apache.http.HttpRequest;
 
 @ParametersAreNonnullByDefault
-public class HttpHeadersInjectAdapter implements AgentPropagation.Setter<HttpRequest> {
+public class HttpHeadersInjectAdapter implements CarrierSetter<HttpRequest> {
 
   public static final HttpHeadersInjectAdapter SETTER = new HttpHeadersInjectAdapter();
 

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

@@ -1,11 +1,11 @@
 package datadog.trace.instrumentation.apachehttpclient;
 
-import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
+import datadog.context.propagation.CarrierSetter;
 import javax.annotation.ParametersAreNonnullByDefault;
 import org.apache.http.client.methods.HttpUriRequest;
 
 @ParametersAreNonnullByDefault
-public class HttpHeadersInjectAdapter implements AgentPropagation.Setter<HttpUriRequest> {
+public class HttpHeadersInjectAdapter implements CarrierSetter<HttpUriRequest> {
 
   public static final HttpHeadersInjectAdapter SETTER = new HttpHeadersInjectAdapter();
 

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

@@ -1,11 +1,11 @@
 package datadog.trace.instrumentation.apachehttpclient5;
 
-import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
+import datadog.context.propagation.CarrierSetter;
 import javax.annotation.ParametersAreNonnullByDefault;
 import org.apache.hc.core5.http.HttpRequest;
 
 @ParametersAreNonnullByDefault
-public class HttpHeadersInjectAdapter implements AgentPropagation.Setter<HttpRequest> {
+public class HttpHeadersInjectAdapter implements CarrierSetter<HttpRequest> {
 
   public static final HttpHeadersInjectAdapter SETTER = new HttpHeadersInjectAdapter();
 

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

@@ -1,11 +1,11 @@
 package datadog.trace.instrumentation.armeria.grpc.client;
 
-import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
+import datadog.context.propagation.CarrierSetter;
 import io.grpc.Metadata;
 import javax.annotation.ParametersAreNonnullByDefault;
 
 @ParametersAreNonnullByDefault
-public final class GrpcInjectAdapter implements AgentPropagation.Setter<Metadata> {
+public final class GrpcInjectAdapter implements CarrierSetter<Metadata> {
 
   public static final GrpcInjectAdapter SETTER = new GrpcInjectAdapter();
 

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

@@ -2,8 +2,8 @@
 
 import static datadog.trace.api.datastreams.DataStreamsContext.fromTags;
 import static datadog.trace.api.gateway.Events.EVENTS;
+import static datadog.trace.bootstrap.instrumentation.api.AgentPropagation.extractContextAndGetSpanContext;
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
-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.server.GrpcExtractAdapter.GETTER;
 import static datadog.trace.instrumentation.armeria.grpc.server.GrpcServerDecorator.DECORATE;
@@ -62,7 +62,7 @@ public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(
       return next.startCall(call, headers);
     }
 
-    AgentSpanContext spanContext = propagate().extract(headers, GETTER);
+    AgentSpanContext spanContext = extractContextAndGetSpanContext(headers, GETTER);
     AgentTracer.TracerAPI tracer = tracer();
     spanContext = callIGCallbackRequestStarted(tracer, spanContext);
 

dd-java-agent/instrumentation/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/TextMapInjectAdapter.java

@@ -1,10 +1,10 @@
 package datadog.trace.instrumentation.aws.v2.eventbridge;
 
-import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
+import datadog.context.propagation.CarrierSetter;
 import javax.annotation.ParametersAreNonnullByDefault;
 
 @ParametersAreNonnullByDefault
-public class TextMapInjectAdapter implements AgentPropagation.Setter<StringBuilder> {
+public class TextMapInjectAdapter implements CarrierSetter<StringBuilder> {
 
   public static final TextMapInjectAdapter SETTER = new TextMapInjectAdapter();
 

dd-java-agent/instrumentation/aws-java-s3-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/s3/TextMapInjectAdapter.java

@@ -1,8 +1,8 @@
 package datadog.trace.instrumentation.aws.v2.s3;
 
-import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
+import datadog.context.propagation.CarrierSetter;
 
-public class TextMapInjectAdapter implements AgentPropagation.Setter<StringBuilder> {
+public class TextMapInjectAdapter implements CarrierSetter<StringBuilder> {
 
   public static final TextMapInjectAdapter SETTER = new TextMapInjectAdapter();
 

dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/main/java/datadog/trace/instrumentation/aws/v0/AwsSdkClientDecorator.java

@@ -9,12 +9,12 @@
 import com.amazonaws.Request;
 import com.amazonaws.Response;
 import com.amazonaws.http.HttpMethodName;
+import datadog.context.propagation.CarrierSetter;
 import datadog.trace.api.Config;
 import datadog.trace.api.DDTags;
 import datadog.trace.api.cache.DDCache;
 import datadog.trace.api.cache.DDCaches;
 import datadog.trace.api.naming.SpanNaming;
-import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
 import datadog.trace.bootstrap.instrumentation.api.AgentScope;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
@@ -32,7 +32,7 @@
 import javax.annotation.ParametersAreNonnullByDefault;
 
 public class AwsSdkClientDecorator extends HttpClientDecorator<Request, Response>
-    implements AgentPropagation.Setter<Request<?>> {
+    implements CarrierSetter<Request<?>> {
 
   private static final String AWS = "aws";
 

dd-java-agent/instrumentation/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsSdkClientDecorator.java

@@ -7,6 +7,7 @@
 import static datadog.trace.core.datastreams.TagsProcessor.TOPIC_TAG;
 import static datadog.trace.core.datastreams.TagsProcessor.TYPE_TAG;
 
+import datadog.context.propagation.CarrierSetter;
 import datadog.trace.api.Config;
 import datadog.trace.api.ConfigDefaults;
 import datadog.trace.api.DDTags;
@@ -16,7 +17,6 @@
 import datadog.trace.api.datastreams.PathwayContext;
 import datadog.trace.api.naming.SpanNaming;
 import datadog.trace.bootstrap.InstanceStore;
-import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
 import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
 import datadog.trace.bootstrap.instrumentation.api.InstrumentationTags;
@@ -52,7 +52,7 @@
 import software.amazon.awssdk.http.SdkHttpResponse;
 
 public class AwsSdkClientDecorator extends HttpClientDecorator<SdkHttpRequest, SdkHttpResponse>
-    implements AgentPropagation.Setter<SdkHttpRequest.Builder> {
+    implements CarrierSetter<SdkHttpRequest.Builder> {
   public static final AwsSdkClientDecorator DECORATE = new AwsSdkClientDecorator();
   private static final DDCache<String, CharSequence> CACHE =
       DDCaches.newFixedSizeCache(128); // cloud services can have high cardinality

dd-java-agent/instrumentation/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/TextMapInjectAdapter.java

@@ -1,8 +1,8 @@
 package datadog.trace.instrumentation.aws.v1.sns;
 
-import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
+import datadog.context.propagation.CarrierSetter;
 
-public class TextMapInjectAdapter implements AgentPropagation.Setter<StringBuilder> {
+public class TextMapInjectAdapter implements CarrierSetter<StringBuilder> {
 
   public static final TextMapInjectAdapter SETTER = new TextMapInjectAdapter();
 

dd-java-agent/instrumentation/aws-java-sns-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sns/TextMapInjectAdapter.java

@@ -1,8 +1,8 @@
 package datadog.trace.instrumentation.aws.v2.sns;
 
-import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
+import datadog.context.propagation.CarrierSetter;
 
-public class TextMapInjectAdapter implements AgentPropagation.Setter<StringBuilder> {
+public class TextMapInjectAdapter implements CarrierSetter<StringBuilder> {
 
   public static final TextMapInjectAdapter SETTER = new TextMapInjectAdapter();
 

dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/MessageAttributeInjector.java

@@ -3,11 +3,10 @@
 import static datadog.trace.api.datastreams.PathwayContext.DATADOG_KEY;
 
 import com.amazonaws.services.sqs.model.MessageAttributeValue;
-import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
+import datadog.context.propagation.CarrierSetter;
 import java.util.Map;
 
-public class MessageAttributeInjector
-    implements AgentPropagation.Setter<Map<String, MessageAttributeValue>> {
+public class MessageAttributeInjector implements CarrierSetter<Map<String, MessageAttributeValue>> {
 
   public static final MessageAttributeInjector SETTER = new MessageAttributeInjector();
 

dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingIterator.java

@@ -1,9 +1,9 @@
 package datadog.trace.instrumentation.aws.v1.sqs;
 
 import static datadog.trace.api.datastreams.DataStreamsContext.create;
+import static datadog.trace.bootstrap.instrumentation.api.AgentPropagation.extractContextAndGetSpanContext;
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateNext;
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.closePrevious;
-import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.propagate;
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
 import static datadog.trace.bootstrap.instrumentation.api.URIUtils.urlFileName;
 import static datadog.trace.core.datastreams.TagsProcessor.DIRECTION_IN;
@@ -65,7 +65,9 @@ protected void startNewMessageSpan(Message message) {
         if (batchContext == null) {
           // first grab any incoming distributed context
           AgentSpanContext spanContext =
-              Config.get().isSqsPropagationEnabled() ? propagate().extract(message, GETTER) : null;
+              Config.get().isSqsPropagationEnabled()
+                  ? extractContextAndGetSpanContext(message, GETTER)
+                  : null;
           // next add a time-in-queue span for non-legacy SQS traces
           if (TIME_IN_QUEUE_ENABLED) {
             long timeInQueueStart = GETTER.extractTimeInQueueStart(message);