chore: Cleaning up HttpServerDecorator

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

@@ -4,7 +4,6 @@
 import static datadog.trace.api.cache.RadixTreeCache.UNSET_STATUS;
 import static datadog.trace.api.datastreams.DataStreamsContext.forHttpServer;
 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;
 
@@ -119,32 +118,14 @@ protected AgentTracer.TracerAPI tracer() {
     return AgentTracer.get();
   }
 
-  /** Deprecated. Use {@link #extractContext(REQUEST_CARRIER)} instead. */
-  public AgentSpanContext.Extracted extract(REQUEST_CARRIER carrier) {
-    AgentPropagation.ContextVisitor<REQUEST_CARRIER> getter = getter();
-    if (null == carrier || null == getter) {
-      return null;
-    }
-    return extractContextAndGetSpanContext(carrier, getter);
-  }
-
-  /**
-   * Will be renamed to #extract(REQUEST_CARRIER) when refactoring of instrumentations is complete
-   */
-  public Context extractContext(REQUEST_CARRIER carrier) {
+  public Context extract(REQUEST_CARRIER carrier) {
     AgentPropagation.ContextVisitor<REQUEST_CARRIER> getter = getter();
     if (null == carrier || null == getter) {
       return root();
     }
     return Propagators.defaultPropagator().extract(root(), carrier, getter);
   }
 
-  /** Deprecated. Use {@link #startSpan(Object, Context)} instead. */
-  @Deprecated
-  public AgentSpan startSpan(REQUEST_CARRIER carrier, AgentSpanContext.Extracted context) {
-    return startSpan("http-server", carrier, context);
-  }
-
   public AgentSpan startSpan(
       String instrumentationName, REQUEST_CARRIER carrier, AgentSpanContext.Extracted context) {
     AgentSpan span =

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

@@ -10,7 +10,7 @@
 
 public class DatadogWrapperHelper {
   public static ContextScope createSpan(final HttpRequest request) {
-    final Context context = DECORATE.extractContext(request);
+    final Context context = DECORATE.extract(request);
     final AgentSpan span = DECORATE.startSpan(request, context);
     DECORATE.afterStart(span);
     DECORATE.onRequest(span, request, request, context);

dd-java-agent/instrumentation/azure-functions/src/main/java/datadog/trace/instrumentation/azure/functions/AzureFunctionsInstrumentation.java

@@ -67,7 +67,7 @@ public static class AzureFunctionsAdvice {
     public static ContextScope methodEnter(
         @Advice.Argument(0) final HttpRequestMessage request,
         @Advice.Argument(1) final ExecutionContext context) {
-      final Context extractedContext = DECORATE.extractContext(request);
+      final Context extractedContext = DECORATE.extract(request);
       final AgentSpan span = DECORATE.startSpan(request, extractedContext);
       DECORATE.afterStart(span, context.getFunctionName());
       DECORATE.onRequest(span, request, request, extractedContext);

dd-java-agent/instrumentation/grizzly-2/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyHttpHandlerInstrumentation.java

@@ -73,7 +73,7 @@ public static class HandleAdvice {
         return false;
       }
 
-      final Context parentContext = DECORATE.extractContext(request);
+      final Context parentContext = DECORATE.extract(request);
       final AgentSpan span = DECORATE.startSpan(request, parentContext);
       DECORATE.afterStart(span);
       DECORATE.onRequest(span, request, request, parentContext);

dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyDecorator.java

@@ -112,7 +112,7 @@ public static NextAction onHttpCodecFilterExit(
     }
     HttpRequestPacket httpRequest = (HttpRequestPacket) httpHeader;
     HttpResponsePacket httpResponse = httpRequest.getResponse();
-    Context context = DECORATE.extractContext(httpRequest);
+    Context context = DECORATE.extract(httpRequest);
     AgentSpan span = DECORATE.startSpan(httpRequest, context);
     ContextScope scope = context.with(span).attach();
     DECORATE.afterStart(span);

dd-java-agent/instrumentation/jetty-11/src/main/java11/datadog/trace/instrumentation/jetty11/JettyServerAdvice.java

@@ -26,7 +26,7 @@ public static ContextScope onEnter(
         return activateSpan((AgentSpan) existingSpan);
       }
 
-      final Context context = DECORATE.extractContext(req);
+      final Context context = DECORATE.extract(req);
       span = DECORATE.startSpan(req, context);
       final ContextScope scope = context.with(span).attach();
       span.setMeasured(true);

dd-java-agent/instrumentation/jetty-12/src/main/java17/datadog/trace/instrumentation/jetty12/JettyServerAdvice.java

@@ -27,7 +27,7 @@ public static void onExit(
         }
       }
 
-      final Context context = JettyDecorator.DECORATE.extractContext(req);
+      final Context context = JettyDecorator.DECORATE.extract(req);
       final AgentSpan span = JettyDecorator.DECORATE.startSpan(req, context);
       try (final ContextScope scope = context.with(span).attach()) {
         span.setMeasured(true);

dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyServerInstrumentation.java

@@ -155,7 +155,7 @@ public static ContextScope onEnter(
         return ((AgentSpan) existingSpan).attach();
       }
 
-      final Context extractedContext = DECORATE.extractContext(req);
+      final Context extractedContext = DECORATE.extract(req);
       span = DECORATE.startSpan(req, extractedContext);
       final ContextScope scope = extractedContext.with(span).attach();
       DECORATE.afterStart(span);

dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyServerInstrumentation.java

@@ -156,7 +156,7 @@ public static ContextScope onEnter(
         return ((AgentSpan) existingSpan).attach();
       }
 
-      final Context extractedContext = DECORATE.extractContext(req);
+      final Context extractedContext = DECORATE.extract(req);
       span = DECORATE.startSpan(req, extractedContext);
       final ContextScope scope = extractedContext.with(span).attach();
       DECORATE.afterStart(span);

dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9/JettyServerInstrumentation.java

@@ -170,7 +170,7 @@ public static ContextScope onEnter(
         return ((AgentSpan) existingSpan).attach();
       }
 
-      final Context context = DECORATE.extractContext(req);
+      final Context context = DECORATE.extract(req);
       span = DECORATE.startSpan(req, context);
       final ContextScope scope = context.with(span).attach();
       DECORATE.afterStart(span);

dd-java-agent/instrumentation/jetty-9/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/HandleAdvice.java

@@ -24,7 +24,7 @@ public static ContextScope onEnter(
       return ((AgentSpan) existingSpan).attach();
     }
 
-    final Context context = DECORATE.extractContext(req);
+    final Context context = DECORATE.extract(req);
     span = DECORATE.startSpan(req, context);
     DECORATE.afterStart(span);
     DECORATE.onRequest(span, req, req, context);

dd-java-agent/instrumentation/liberty-20/src/main/java/datadog/trace/instrumentation/liberty20/LibertyServerInstrumentation.java

@@ -105,7 +105,7 @@ public static class HandleRequestAdvice {
       } catch (NullPointerException e) {
       }
 
-      final Context context = DECORATE.extractContext(request);
+      final Context context = DECORATE.extract(request);
       request.setAttribute(DD_EXTRACTED_CONTEXT_ATTRIBUTE, context);
       final AgentSpan span = DECORATE.startSpan(request, context);
       scope = context.with(span).attach();

dd-java-agent/instrumentation/liberty-23/src/main/java/datadog/trace/instrumentation/liberty23/LibertyServerInstrumentation.java

@@ -107,7 +107,7 @@ public static class HandleRequestAdvice {
       } catch (NullPointerException e) {
       }
 
-      final Context context = DECORATE.extractContext(request);
+      final Context context = DECORATE.extract(request);
       request.setAttribute(DD_EXTRACTED_CONTEXT_ATTRIBUTE, context);
       final AgentSpan span = DECORATE.startSpan(request, context);
       scope = context.with(span).attach();

dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerRequestTracingHandler.java

@@ -43,7 +43,7 @@ public void messageReceived(final ChannelHandlerContext ctx, final MessageEvent
 
     final HttpRequest request = (HttpRequest) msg.getMessage();
     final HttpHeaders headers = request.headers();
-    final Context context = DECORATE.extractContext(headers);
+    final Context context = DECORATE.extract(headers);
     final AgentSpan span = DECORATE.startSpan(headers, context);
 
     channelTraceContext.reset();

dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/HttpServerRequestTracingHandler.java

@@ -39,7 +39,7 @@ public void channelRead(final ChannelHandlerContext ctx, final Object msg) {
 
     final HttpRequest request = (HttpRequest) msg;
     final HttpHeaders headers = request.headers();
-    final Context context = DECORATE.extractContext(headers);
+    final Context context = DECORATE.extract(headers);
     final AgentSpan span = DECORATE.startSpan(headers, context);
 
     try (final ContextScope scope = context.with(span).attach()) {

dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/HttpServerRequestTracingHandler.java

@@ -38,7 +38,7 @@ public void channelRead(final ChannelHandlerContext ctx, final Object msg) {
 
     final HttpRequest request = (HttpRequest) msg;
     final HttpHeaders headers = request.headers();
-    final Context context = DECORATE.extractContext(headers);
+    final Context context = DECORATE.extract(headers);
     final AgentSpan span = DECORATE.startSpan(headers, context);
 
     try (final ContextScope scope = context.with(span).attach()) {

dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/DatadogWrapperHelper.java

@@ -10,7 +10,7 @@
 
 public class DatadogWrapperHelper {
   public static ContextScope createSpan(final HttpRequest request) {
-    final Context context = DECORATE.extractContext(request);
+    final Context context = DECORATE.extract(request);
     final AgentSpan span = DECORATE.startSpan(request, context);
     DECORATE.afterStart(span);
     DECORATE.onRequest(span, request, request, context);

dd-java-agent/instrumentation/play-2.3/src/main/java/datadog/trace/instrumentation/play23/PlayAdvice.java

@@ -25,7 +25,7 @@ public static ContextScope onEnter(@Advice.Argument(0) final Request req) {
     final ContextScope scope;
     if (activeSpan() == null) {
       Headers headers = req.headers();
-      final Context context = DECORATE.extractContext(headers);
+      final Context context = DECORATE.extract(headers);
       span = DECORATE.startSpan(headers, context);
       scope = context.with(span).attach();
     } else {

dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play24/PlayAdvice.java

@@ -31,7 +31,7 @@ public static ContextScope onEnter(@Advice.Argument(value = 0, readOnly = false)
 
     if (activeSpan() == null) {
       final Headers headers = req.headers();
-      final Context context = DECORATE.extractContext(headers);
+      final Context context = DECORATE.extract(headers);
       span = DECORATE.startSpan(headers, context);
       scope = context.with(span).attach();
     } else {

dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/PlayAdvice.java

@@ -32,7 +32,7 @@ public static ContextScope onEnter(
 
     if (activeSpan() == null) {
       final Headers headers = req.headers();
-      extractedContext = DECORATE.extractContext(headers);
+      extractedContext = DECORATE.extract(headers);
       span = DECORATE.startSpan(headers, extractedContext);
       scope = extractedContext.with(span).attach();
     } else {

dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/RestletInstrumentation.java

@@ -54,7 +54,7 @@ public String[] helperClassNames() {
   public static class RestletHandleAdvice {
     @Advice.OnMethodEnter(suppress = Throwable.class)
     public static ContextScope beginRequest(@Advice.Argument(0) final HttpExchange exchange) {
-      Context context = DECORATE.extractContext(exchange);
+      Context context = DECORATE.extract(exchange);
       AgentSpan span = DECORATE.startSpan(exchange, context);
       ContextScope scope = context.with(span).attach();
       DECORATE.afterStart(span);

dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2Advice.java

@@ -52,7 +52,7 @@ public static boolean onEnter(
       InstrumentationContext.get(ServletResponse.class, Integer.class).put(response, 200);
     }
 
-    final Context context = DECORATE.extractContext(httpServletRequest);
+    final Context context = DECORATE.extract(httpServletRequest);
     final AgentSpan span = DECORATE.startSpan(httpServletRequest, context);
     scope = context.with(span).attach();
     DECORATE.afterStart(span);

dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/Servlet3Advice.java

@@ -77,7 +77,7 @@ public static boolean onEnter(
       return false;
     }
 
-    final Context context = DECORATE.extractContext(httpServletRequest);
+    final Context context = DECORATE.extract(httpServletRequest);
     final AgentSpan span = DECORATE.startSpan(httpServletRequest, context);
     scope = context.with(span).attach();
 

dd-java-agent/instrumentation/spray-1.3/src/main/scala/datadog/trace/instrumentation/spray/SprayHttpServerRunSealedRouteAdvice.java

@@ -23,7 +23,7 @@ public static ContextScope enter(
       // Propagate context in case income request was going through several routes
       // TODO: Add test for it
       final HttpRequest request = ctx.request();
-      Context extractedContext = DECORATE.extractContext(request);
+      Context extractedContext = DECORATE.extract(request);
       extractedSpanContext = DECORATE.getExtractedSpanContext(extractedContext);
       span = DECORATE.startSpan(request, extractedContext);
       context = extractedContext.with(span);

dd-java-agent/instrumentation/synapse-3/src/main/java/datadog/trace/instrumentation/synapse3/SynapseServerInstrumentation.java

@@ -68,7 +68,7 @@ public static ContextScope beginRequest(
 
       // check incoming request for distributed trace ids
       HttpRequest request = connection.getHttpRequest();
-      Context context = DECORATE.extractContext(request);
+      Context context = DECORATE.extract(request);
 
       AgentSpan span;
       if (null != context) {

dd-java-agent/instrumentation/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/TomcatServerInstrumentation.java

@@ -123,7 +123,7 @@ public static ContextScope onService(@Advice.Argument(0) org.apache.coyote.Reque
         return activateSpan((AgentSpan) existingSpan);
       }
 
-      final Context extractedContext = DECORATE.extractContext(req);
+      final Context extractedContext = DECORATE.extract(req);
       // TODO: Migrate setting DD_EXTRACTED_CONTEXT_ATTRIBUTE from AgentSpanContext.Extracted to
       // Context
       req.setAttribute(

dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/HandlerInstrumentation.java

@@ -93,7 +93,7 @@ public static void onEnter(
         return;
       }
 
-      final Context extractedContext = DECORATE.extractContext(exchange);
+      final Context extractedContext = DECORATE.extract(exchange);
       final AgentSpan span = DECORATE.startSpan(exchange, extractedContext).setMeasured(true);
       scope = extractedContext.with(span).attach();
       DECORATE.afterStart(span);

dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/HttpRequestParserInstrumentation.java

@@ -74,7 +74,7 @@ public static void afterRequestParse(
       ContextScope scope = null;
       try {
         if (span == null) {
-          final Context context = DECORATE.extractContext(exchange);
+          final Context context = DECORATE.extract(exchange);
           span = DECORATE.startSpan(exchange, context).setMeasured(true);
           scope = context.with(span).attach();
           DECORATE.afterStart(span);