Cleaning up HttpServerDecorator (#9139)

Author: mhlidd

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);