updating PR comments

mhlidd · mhlidd · commit 2a6d4422d697 · 2025-05-16T09:03:15.000-04:00
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecorator.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecorator.java
@@ -175,7 +175,7 @@ public AgentSpanContext.Extracted getExtractedSpanContext(Context context) {
     return extractedSpan == null ? null : (AgentSpanContext.Extracted) extractedSpan.context();
   }
 
-  public AgentSpan onRequestWithContext(
+  public AgentSpan onRequest(
       final AgentSpan span,
       final CONNECTION connection,
       final REQUEST request,
diff --git a/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DatadogWrapperHelper.java b/dd-java-agent/instrumentation/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DatadogWrapperHelper.java
@@ -13,7 +13,7 @@ public static ContextScope createSpan(final HttpRequest request) {
     final Context extractedContext = DECORATE.extractContext(request);
     final AgentSpan span = DECORATE.startSpanFromContext(request, extractedContext);
     DECORATE.afterStart(span);
-    DECORATE.onRequestWithContext(span, request, request, extractedContext);
+    DECORATE.onRequest(span, request, request, extractedContext);
 
     return extractedContext.with(span).attach();
   }
diff --git a/dd-java-agent/instrumentation/azure-functions/src/main/java/datadog/trace/instrumentation/azure/functions/AzureFunctionsInstrumentation.java b/dd-java-agent/instrumentation/azure-functions/src/main/java/datadog/trace/instrumentation/azure/functions/AzureFunctionsInstrumentation.java
@@ -70,7 +70,7 @@ public static ContextScope methodEnter(
       final Context extractedContext = DECORATE.extractContext(request);
       final AgentSpan span = DECORATE.startSpanFromContext(request, extractedContext);
       DECORATE.afterStart(span, context.getFunctionName());
-      DECORATE.onRequestWithContext(span, request, request, extractedContext);
+      DECORATE.onRequest(span, request, request, extractedContext);
       HTTP_RESOURCE_DECORATOR.withRoute(
           span, request.getHttpMethod().name(), request.getUri().getPath());
       return extractedContext.with(span).attach();
diff --git a/dd-java-agent/instrumentation/grizzly-2/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyHttpHandlerInstrumentation.java b/dd-java-agent/instrumentation/grizzly-2/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyHttpHandlerInstrumentation.java
@@ -76,7 +76,7 @@ public static class HandleAdvice {
       final Context parentContext = DECORATE.extractContext(request);
       final AgentSpan span = DECORATE.startSpanFromContext(request, parentContext);
       DECORATE.afterStart(span);
-      DECORATE.onRequestWithContext(span, request, request, parentContext);
+      DECORATE.onRequest(span, request, request, parentContext);
 
       scope = parentContext.with(span).attach();
 
diff --git a/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyDecorator.java b/dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyDecorator.java
@@ -118,7 +118,7 @@ public static NextAction onHttpCodecFilterExit(
     DECORATE.afterStart(span);
     ctx.getAttributes().setAttribute(DD_SPAN_ATTRIBUTE, span);
     ctx.getAttributes().setAttribute(DD_RESPONSE_ATTRIBUTE, httpResponse);
-    DECORATE.onRequestWithContext(span, httpRequest, httpRequest, context);
+    DECORATE.onRequest(span, httpRequest, httpRequest, context);
 
     Flow.Action.RequestBlockingAction rba = span.getRequestBlockingAction();
     if (rba != null && thiz instanceof HttpServerFilter) {
diff --git a/dd-java-agent/instrumentation/jetty-11/src/main/java11/datadog/trace/instrumentation/jetty11/JettyServerAdvice.java b/dd-java-agent/instrumentation/jetty-11/src/main/java11/datadog/trace/instrumentation/jetty11/JettyServerAdvice.java
@@ -31,7 +31,7 @@ public static ContextScope onEnter(
       final ContextScope scope = extractedContext.with(span).attach();
       span.setMeasured(true);
       DECORATE.afterStart(span);
-      DECORATE.onRequestWithContext(span, req, req, extractedContext);
+      DECORATE.onRequest(span, req, req, extractedContext);
 
       req.setAttribute(DD_SPAN_ATTRIBUTE, span);
       req.setAttribute(CorrelationIdentifier.getTraceIdKey(), GlobalTracer.get().getTraceId());
diff --git a/dd-java-agent/instrumentation/jetty-12/src/main/java17/datadog/trace/instrumentation/jetty12/JettyServerAdvice.java b/dd-java-agent/instrumentation/jetty-12/src/main/java17/datadog/trace/instrumentation/jetty12/JettyServerAdvice.java
@@ -32,7 +32,7 @@ public static void onExit(
       try (final ContextScope scope = extractedContext.with(span).attach()) {
         span.setMeasured(true);
         JettyDecorator.DECORATE.afterStart(span);
-        JettyDecorator.DECORATE.onRequestWithContext(span, req, req, extractedContext);
+        JettyDecorator.DECORATE.onRequest(span, req, req, extractedContext);
 
         req.setAttribute(DD_SPAN_ATTRIBUTE, span);
         req.setAttribute(CorrelationIdentifier.getTraceIdKey(), GlobalTracer.get().getTraceId());
diff --git a/dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyServerInstrumentation.java b/dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyServerInstrumentation.java
@@ -159,7 +159,7 @@ public static ContextScope onEnter(
       span = DECORATE.startSpanFromContext(req, extractedContext);
       final ContextScope scope = extractedContext.with(span).attach();
       DECORATE.afterStart(span);
-      DECORATE.onRequestWithContext(span, req, req, extractedContext);
+      DECORATE.onRequest(span, req, req, extractedContext);
 
       req.setAttribute(DD_SPAN_ATTRIBUTE, span);
       req.setAttribute(CorrelationIdentifier.getTraceIdKey(), GlobalTracer.get().getTraceId());
diff --git a/dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyServerInstrumentation.java b/dd-java-agent/instrumentation/jetty-7.6/src/main/java/datadog/trace/instrumentation/jetty76/JettyServerInstrumentation.java
@@ -160,7 +160,7 @@ public static ContextScope onEnter(
       span = DECORATE.startSpanFromContext(req, extractedContext);
       final ContextScope scope = extractedContext.with(span).attach();
       DECORATE.afterStart(span);
-      DECORATE.onRequestWithContext(span, req, req, extractedContext);
+      DECORATE.onRequest(span, req, req, extractedContext);
 
       req.setAttribute(DD_SPAN_ATTRIBUTE, span);
       req.setAttribute(CorrelationIdentifier.getTraceIdKey(), GlobalTracer.get().getTraceId());
diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9/JettyServerInstrumentation.java b/dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9/JettyServerInstrumentation.java
@@ -174,7 +174,7 @@ public static ContextScope onEnter(
       span = DECORATE.startSpanFromContext(req, extractedContext);
       final ContextScope scope = extractedContext.with(span).attach();
       DECORATE.afterStart(span);
-      DECORATE.onRequestWithContext(span, req, req, extractedContext);
+      DECORATE.onRequest(span, req, req, extractedContext);
 
       req.setAttribute(DD_SPAN_ATTRIBUTE, span);
       req.setAttribute(CorrelationIdentifier.getTraceIdKey(), GlobalTracer.get().getTraceId());
diff --git a/dd-java-agent/instrumentation/jetty-9/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/HandleAdvice.java b/dd-java-agent/instrumentation/jetty-9/src/main/java_jetty10/datadog/trace/instrumentation/jetty10/HandleAdvice.java
@@ -27,7 +27,7 @@ public static ContextScope onEnter(
     final Context extractedContext = DECORATE.extractContext(req);
     span = DECORATE.startSpanFromContext(req, extractedContext);
     DECORATE.afterStart(span);
-    DECORATE.onRequestWithContext(span, req, req, extractedContext);
+    DECORATE.onRequest(span, req, req, extractedContext);
 
     final ContextScope scope = extractedContext.with(span).attach();
     req.setAttribute(DD_SPAN_ATTRIBUTE, span);
diff --git a/dd-java-agent/instrumentation/liberty-20/src/main/java/datadog/trace/instrumentation/liberty20/LibertyServerInstrumentation.java b/dd-java-agent/instrumentation/liberty-20/src/main/java/datadog/trace/instrumentation/liberty20/LibertyServerInstrumentation.java
@@ -122,7 +122,7 @@ public static class HandleRequestAdvice {
         }
       }
       DECORATE.afterStart(span);
-      DECORATE.onRequestWithContext(span, request, request, extractedContext);
+      DECORATE.onRequest(span, request, request, extractedContext);
       request.setAttribute(DD_SPAN_ATTRIBUTE, span);
       request.setAttribute(CorrelationIdentifier.getTraceIdKey(), GlobalTracer.get().getTraceId());
       request.setAttribute(CorrelationIdentifier.getSpanIdKey(), GlobalTracer.get().getSpanId());
diff --git a/dd-java-agent/instrumentation/liberty-23/src/main/java/datadog/trace/instrumentation/liberty23/LibertyServerInstrumentation.java b/dd-java-agent/instrumentation/liberty-23/src/main/java/datadog/trace/instrumentation/liberty23/LibertyServerInstrumentation.java
@@ -124,7 +124,7 @@ public static class HandleRequestAdvice {
         }
       }
       DECORATE.afterStart(span);
-      DECORATE.onRequestWithContext(span, request, request, extractedContext);
+      DECORATE.onRequest(span, request, request, extractedContext);
       request.setAttribute(DD_SPAN_ATTRIBUTE, span);
       request.setAttribute(CorrelationIdentifier.getTraceIdKey(), GlobalTracer.get().getTraceId());
       request.setAttribute(CorrelationIdentifier.getSpanIdKey(), GlobalTracer.get().getSpanId());
diff --git a/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerRequestTracingHandler.java b/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/HttpServerRequestTracingHandler.java
@@ -51,7 +51,7 @@ public void messageReceived(final ChannelHandlerContext ctx, final MessageEvent
 
     try (final ContextScope scope = context.with(span).attach()) {
       DECORATE.afterStart(span);
-      DECORATE.onRequestWithContext(span, ctx.getChannel(), request, context);
+      DECORATE.onRequest(span, ctx.getChannel(), request, context);
 
       channelTraceContext.setServerSpan(span);
 
diff --git a/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/HttpServerRequestTracingHandler.java b/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/HttpServerRequestTracingHandler.java
@@ -44,7 +44,7 @@ public void channelRead(final ChannelHandlerContext ctx, final Object msg) {
 
     try (final ContextScope scope = extractedContext.with(span).attach()) {
       DECORATE.afterStart(span);
-      DECORATE.onRequestWithContext(span, channel, request, extractedContext);
+      DECORATE.onRequest(span, channel, request, extractedContext);
 
       channel.attr(ANALYZED_RESPONSE_KEY).set(null);
       channel.attr(BLOCKED_RESPONSE_KEY).set(null);
diff --git a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/HttpServerRequestTracingHandler.java b/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/HttpServerRequestTracingHandler.java
@@ -43,7 +43,7 @@ public void channelRead(final ChannelHandlerContext ctx, final Object msg) {
 
     try (final ContextScope scope = extractedContext.with(span).attach()) {
       DECORATE.afterStart(span);
-      DECORATE.onRequestWithContext(span, channel, request, extractedContext);
+      DECORATE.onRequest(span, channel, request, extractedContext);
 
       channel.attr(ANALYZED_RESPONSE_KEY).set(null);
       channel.attr(BLOCKED_RESPONSE_KEY).set(null);
diff --git a/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/DatadogWrapperHelper.java b/dd-java-agent/instrumentation/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/DatadogWrapperHelper.java
@@ -13,7 +13,7 @@ public static ContextScope createSpan(final HttpRequest request) {
     final Context extractedContext = DECORATE.extractContext(request);
     final AgentSpan span = DECORATE.startSpanFromContext(request, extractedContext);
     DECORATE.afterStart(span);
-    DECORATE.onRequestWithContext(span, request, request, extractedContext);
+    DECORATE.onRequest(span, request, request, extractedContext);
 
     return extractedContext.with(span).attach();
   }
diff --git a/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/PlayAdvice.java b/dd-java-agent/instrumentation/play-2.6/src/main/java/datadog/trace/instrumentation/play26/PlayAdvice.java
@@ -66,7 +66,7 @@ public static void stopTraceOnResponse(
     final AgentSpan playControllerSpan = spanFromContext(playControllerScope.context());
 
     // Call onRequest on return after tags are populated.
-    DECORATE.onRequestWithContext(playControllerSpan, req, req, extractedContext);
+    DECORATE.onRequest(playControllerSpan, req, req, extractedContext);
 
     if (throwable == null) {
       responseFuture.onComplete(
diff --git a/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/RestletInstrumentation.java b/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/RestletInstrumentation.java
@@ -58,7 +58,7 @@ public static ContextScope beginRequest(@Advice.Argument(0) final HttpExchange e
       AgentSpan span = DECORATE.startSpanFromContext(exchange, context);
       ContextScope scope = context.with(span).attach();
       DECORATE.afterStart(span);
-      DECORATE.onRequestWithContext(span, exchange, exchange, context);
+      DECORATE.onRequest(span, exchange, exchange, context);
       DECORATE.onPeerConnection(span, exchange.getRemoteAddress());
 
       return scope;
diff --git a/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2Advice.java b/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2Advice.java
@@ -56,7 +56,7 @@ public static boolean onEnter(
     final AgentSpan span = DECORATE.startSpanFromContext(httpServletRequest, extractedContext);
     scope = extractedContext.with(span).attach();
     DECORATE.afterStart(span);
-    DECORATE.onRequestWithContext(span, httpServletRequest, httpServletRequest, extractedContext);
+    DECORATE.onRequest(span, httpServletRequest, httpServletRequest, extractedContext);
 
     httpServletRequest.setAttribute(DD_SPAN_ATTRIBUTE, span);
     httpServletRequest.setAttribute(
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/Servlet3Advice.java b/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/Servlet3Advice.java
@@ -74,7 +74,7 @@ public static boolean onEnter(
     scope = extractedContext.with(span).attach();
 
     DECORATE.afterStart(span);
-    DECORATE.onRequestWithContext(span, httpServletRequest, httpServletRequest, extractedContext);
+    DECORATE.onRequest(span, httpServletRequest, httpServletRequest, extractedContext);
 
     httpServletRequest.setAttribute(DD_SPAN_ATTRIBUTE, span);
     httpServletRequest.setAttribute(
diff --git a/dd-java-agent/instrumentation/synapse-3/src/main/java/datadog/trace/instrumentation/synapse3/SynapseServerInstrumentation.java b/dd-java-agent/instrumentation/synapse-3/src/main/java/datadog/trace/instrumentation/synapse3/SynapseServerInstrumentation.java
@@ -81,7 +81,7 @@ public static ContextScope beginRequest(
         scope = span.attach();
       }
       DECORATE.afterStart(span);
-      DECORATE.onRequestWithContext(span, connection, request, extractedContext);
+      DECORATE.onRequest(span, connection, request, extractedContext);
 
       // capture span to be finished by one of the various server response advices
       connection.getContext().setAttribute(SYNAPSE_SPAN_KEY, span);
diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/HandlerInstrumentation.java b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/HandlerInstrumentation.java
@@ -98,7 +98,7 @@ public static void onEnter(
           DECORATE.startSpanFromContext(exchange, extractedContext).setMeasured(true);
       scope = extractedContext.with(span).attach();
       DECORATE.afterStart(span);
-      DECORATE.onRequestWithContext(span, exchange, exchange, extractedContext);
+      DECORATE.onRequest(span, exchange, exchange, extractedContext);
 
       exchange.putAttachment(DD_UNDERTOW_CONTINUATION, captureSpan(span));
 
diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/HttpRequestParserInstrumentation.java b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/HttpRequestParserInstrumentation.java
@@ -78,7 +78,7 @@ public static void afterRequestParse(
           span = DECORATE.startSpanFromContext(exchange, extractedContext).setMeasured(true);
           scope = extractedContext.with(span).attach();
           DECORATE.afterStart(span);
-          DECORATE.onRequestWithContext(span, exchange, exchange, extractedContext);
+          DECORATE.onRequest(span, exchange, exchange, extractedContext);
         }
         DECORATE.onError(span, throwable);
         // because we know that a http 400 will be thrown

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ public AgentSpanContext.Extracted getExtractedSpanContext(Context context) {`
`175`	`175`	`return extractedSpan == null ? null : (AgentSpanContext.Extracted) extractedSpan.context();`
`176`	`176`	`}`
`177`	`177`
`178`		`- public AgentSpan onRequestWithContext(`
	`178`	`+ public AgentSpan onRequest(`
`179`	`179`	`final AgentSpan span,`
`180`	`180`	`final CONNECTION connection,`
`181`	`181`	`final REQUEST request,`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public static ContextScope createSpan(final HttpRequest request) {`
`13`	`13`	`final Context extractedContext = DECORATE.extractContext(request);`
`14`	`14`	`final AgentSpan span = DECORATE.startSpanFromContext(request, extractedContext);`
`15`	`15`	`DECORATE.afterStart(span);`
`16`		`- DECORATE.onRequestWithContext(span, request, request, extractedContext);`
	`16`	`+ DECORATE.onRequest(span, request, request, extractedContext);`
`17`	`17`
`18`	`18`	`return extractedContext.with(span).attach();`
`19`	`19`	`}`