Skip to content

Commit 2a6d442

Browse files
mhliddmhlidd
committed
updating PR comments
1 parent 4e94f29 commit 2a6d442

File tree

24 files changed

+24
-24
lines changed

24 files changed

+24
-24
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ public AgentSpanContext.Extracted getExtractedSpanContext(Context context) {
175175
return extractedSpan == null ? null : (AgentSpanContext.Extracted) extractedSpan.context();
176176
}
177177

178-
public AgentSpan onRequestWithContext(
178+
public AgentSpan onRequest(
179179
final AgentSpan span,
180180
final CONNECTION connection,
181181
final REQUEST request,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public static ContextScope createSpan(final HttpRequest request) {
1313
final Context extractedContext = DECORATE.extractContext(request);
1414
final AgentSpan span = DECORATE.startSpanFromContext(request, extractedContext);
1515
DECORATE.afterStart(span);
16-
DECORATE.onRequestWithContext(span, request, request, extractedContext);
16+
DECORATE.onRequest(span, request, request, extractedContext);
1717

1818
return extractedContext.with(span).attach();
1919
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public static ContextScope methodEnter(
7070
final Context extractedContext = DECORATE.extractContext(request);
7171
final AgentSpan span = DECORATE.startSpanFromContext(request, extractedContext);
7272
DECORATE.afterStart(span, context.getFunctionName());
73-
DECORATE.onRequestWithContext(span, request, request, extractedContext);
73+
DECORATE.onRequest(span, request, request, extractedContext);
7474
HTTP_RESOURCE_DECORATOR.withRoute(
7575
span, request.getHttpMethod().name(), request.getUri().getPath());
7676
return extractedContext.with(span).attach();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public static class HandleAdvice {
7676
final Context parentContext = DECORATE.extractContext(request);
7777
final AgentSpan span = DECORATE.startSpanFromContext(request, parentContext);
7878
DECORATE.afterStart(span);
79-
DECORATE.onRequestWithContext(span, request, request, parentContext);
79+
DECORATE.onRequest(span, request, request, parentContext);
8080

8181
scope = parentContext.with(span).attach();
8282

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public static NextAction onHttpCodecFilterExit(
118118
DECORATE.afterStart(span);
119119
ctx.getAttributes().setAttribute(DD_SPAN_ATTRIBUTE, span);
120120
ctx.getAttributes().setAttribute(DD_RESPONSE_ATTRIBUTE, httpResponse);
121-
DECORATE.onRequestWithContext(span, httpRequest, httpRequest, context);
121+
DECORATE.onRequest(span, httpRequest, httpRequest, context);
122122

123123
Flow.Action.RequestBlockingAction rba = span.getRequestBlockingAction();
124124
if (rba != null && thiz instanceof HttpServerFilter) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public static ContextScope onEnter(
3131
final ContextScope scope = extractedContext.with(span).attach();
3232
span.setMeasured(true);
3333
DECORATE.afterStart(span);
34-
DECORATE.onRequestWithContext(span, req, req, extractedContext);
34+
DECORATE.onRequest(span, req, req, extractedContext);
3535

3636
req.setAttribute(DD_SPAN_ATTRIBUTE, span);
3737
req.setAttribute(CorrelationIdentifier.getTraceIdKey(), GlobalTracer.get().getTraceId());

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public static void onExit(
3232
try (final ContextScope scope = extractedContext.with(span).attach()) {
3333
span.setMeasured(true);
3434
JettyDecorator.DECORATE.afterStart(span);
35-
JettyDecorator.DECORATE.onRequestWithContext(span, req, req, extractedContext);
35+
JettyDecorator.DECORATE.onRequest(span, req, req, extractedContext);
3636

3737
req.setAttribute(DD_SPAN_ATTRIBUTE, span);
3838
req.setAttribute(CorrelationIdentifier.getTraceIdKey(), GlobalTracer.get().getTraceId());

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ public static ContextScope onEnter(
159159
span = DECORATE.startSpanFromContext(req, extractedContext);
160160
final ContextScope scope = extractedContext.with(span).attach();
161161
DECORATE.afterStart(span);
162-
DECORATE.onRequestWithContext(span, req, req, extractedContext);
162+
DECORATE.onRequest(span, req, req, extractedContext);
163163

164164
req.setAttribute(DD_SPAN_ATTRIBUTE, span);
165165
req.setAttribute(CorrelationIdentifier.getTraceIdKey(), GlobalTracer.get().getTraceId());

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ public static ContextScope onEnter(
160160
span = DECORATE.startSpanFromContext(req, extractedContext);
161161
final ContextScope scope = extractedContext.with(span).attach();
162162
DECORATE.afterStart(span);
163-
DECORATE.onRequestWithContext(span, req, req, extractedContext);
163+
DECORATE.onRequest(span, req, req, extractedContext);
164164

165165
req.setAttribute(DD_SPAN_ATTRIBUTE, span);
166166
req.setAttribute(CorrelationIdentifier.getTraceIdKey(), GlobalTracer.get().getTraceId());

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ public static ContextScope onEnter(
174174
span = DECORATE.startSpanFromContext(req, extractedContext);
175175
final ContextScope scope = extractedContext.with(span).attach();
176176
DECORATE.afterStart(span);
177-
DECORATE.onRequestWithContext(span, req, req, extractedContext);
177+
DECORATE.onRequest(span, req, req, extractedContext);
178178

179179
req.setAttribute(DD_SPAN_ATTRIBUTE, span);
180180
req.setAttribute(CorrelationIdentifier.getTraceIdKey(), GlobalTracer.get().getTraceId());

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public static ContextScope onEnter(
2727
final Context extractedContext = DECORATE.extractContext(req);
2828
span = DECORATE.startSpanFromContext(req, extractedContext);
2929
DECORATE.afterStart(span);
30-
DECORATE.onRequestWithContext(span, req, req, extractedContext);
30+
DECORATE.onRequest(span, req, req, extractedContext);
3131

3232
final ContextScope scope = extractedContext.with(span).attach();
3333
req.setAttribute(DD_SPAN_ATTRIBUTE, span);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ public static class HandleRequestAdvice {
122122
}
123123
}
124124
DECORATE.afterStart(span);
125-
DECORATE.onRequestWithContext(span, request, request, extractedContext);
125+
DECORATE.onRequest(span, request, request, extractedContext);
126126
request.setAttribute(DD_SPAN_ATTRIBUTE, span);
127127
request.setAttribute(CorrelationIdentifier.getTraceIdKey(), GlobalTracer.get().getTraceId());
128128
request.setAttribute(CorrelationIdentifier.getSpanIdKey(), GlobalTracer.get().getSpanId());

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public static class HandleRequestAdvice {
124124
}
125125
}
126126
DECORATE.afterStart(span);
127-
DECORATE.onRequestWithContext(span, request, request, extractedContext);
127+
DECORATE.onRequest(span, request, request, extractedContext);
128128
request.setAttribute(DD_SPAN_ATTRIBUTE, span);
129129
request.setAttribute(CorrelationIdentifier.getTraceIdKey(), GlobalTracer.get().getTraceId());
130130
request.setAttribute(CorrelationIdentifier.getSpanIdKey(), GlobalTracer.get().getSpanId());

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public void messageReceived(final ChannelHandlerContext ctx, final MessageEvent
5151

5252
try (final ContextScope scope = context.with(span).attach()) {
5353
DECORATE.afterStart(span);
54-
DECORATE.onRequestWithContext(span, ctx.getChannel(), request, context);
54+
DECORATE.onRequest(span, ctx.getChannel(), request, context);
5555

5656
channelTraceContext.setServerSpan(span);
5757

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void channelRead(final ChannelHandlerContext ctx, final Object msg) {
4444

4545
try (final ContextScope scope = extractedContext.with(span).attach()) {
4646
DECORATE.afterStart(span);
47-
DECORATE.onRequestWithContext(span, channel, request, extractedContext);
47+
DECORATE.onRequest(span, channel, request, extractedContext);
4848

4949
channel.attr(ANALYZED_RESPONSE_KEY).set(null);
5050
channel.attr(BLOCKED_RESPONSE_KEY).set(null);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void channelRead(final ChannelHandlerContext ctx, final Object msg) {
4343

4444
try (final ContextScope scope = extractedContext.with(span).attach()) {
4545
DECORATE.afterStart(span);
46-
DECORATE.onRequestWithContext(span, channel, request, extractedContext);
46+
DECORATE.onRequest(span, channel, request, extractedContext);
4747

4848
channel.attr(ANALYZED_RESPONSE_KEY).set(null);
4949
channel.attr(BLOCKED_RESPONSE_KEY).set(null);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public static ContextScope createSpan(final HttpRequest request) {
1313
final Context extractedContext = DECORATE.extractContext(request);
1414
final AgentSpan span = DECORATE.startSpanFromContext(request, extractedContext);
1515
DECORATE.afterStart(span);
16-
DECORATE.onRequestWithContext(span, request, request, extractedContext);
16+
DECORATE.onRequest(span, request, request, extractedContext);
1717

1818
return extractedContext.with(span).attach();
1919
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public static void stopTraceOnResponse(
6666
final AgentSpan playControllerSpan = spanFromContext(playControllerScope.context());
6767

6868
// Call onRequest on return after tags are populated.
69-
DECORATE.onRequestWithContext(playControllerSpan, req, req, extractedContext);
69+
DECORATE.onRequest(playControllerSpan, req, req, extractedContext);
7070

7171
if (throwable == null) {
7272
responseFuture.onComplete(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public static ContextScope beginRequest(@Advice.Argument(0) final HttpExchange e
5858
AgentSpan span = DECORATE.startSpanFromContext(exchange, context);
5959
ContextScope scope = context.with(span).attach();
6060
DECORATE.afterStart(span);
61-
DECORATE.onRequestWithContext(span, exchange, exchange, context);
61+
DECORATE.onRequest(span, exchange, exchange, context);
6262
DECORATE.onPeerConnection(span, exchange.getRemoteAddress());
6363

6464
return scope;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public static boolean onEnter(
5656
final AgentSpan span = DECORATE.startSpanFromContext(httpServletRequest, extractedContext);
5757
scope = extractedContext.with(span).attach();
5858
DECORATE.afterStart(span);
59-
DECORATE.onRequestWithContext(span, httpServletRequest, httpServletRequest, extractedContext);
59+
DECORATE.onRequest(span, httpServletRequest, httpServletRequest, extractedContext);
6060

6161
httpServletRequest.setAttribute(DD_SPAN_ATTRIBUTE, span);
6262
httpServletRequest.setAttribute(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public static boolean onEnter(
7474
scope = extractedContext.with(span).attach();
7575

7676
DECORATE.afterStart(span);
77-
DECORATE.onRequestWithContext(span, httpServletRequest, httpServletRequest, extractedContext);
77+
DECORATE.onRequest(span, httpServletRequest, httpServletRequest, extractedContext);
7878

7979
httpServletRequest.setAttribute(DD_SPAN_ATTRIBUTE, span);
8080
httpServletRequest.setAttribute(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public static ContextScope beginRequest(
8181
scope = span.attach();
8282
}
8383
DECORATE.afterStart(span);
84-
DECORATE.onRequestWithContext(span, connection, request, extractedContext);
84+
DECORATE.onRequest(span, connection, request, extractedContext);
8585

8686
// capture span to be finished by one of the various server response advices
8787
connection.getContext().setAttribute(SYNAPSE_SPAN_KEY, span);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public static void onEnter(
9898
DECORATE.startSpanFromContext(exchange, extractedContext).setMeasured(true);
9999
scope = extractedContext.with(span).attach();
100100
DECORATE.afterStart(span);
101-
DECORATE.onRequestWithContext(span, exchange, exchange, extractedContext);
101+
DECORATE.onRequest(span, exchange, exchange, extractedContext);
102102

103103
exchange.putAttachment(DD_UNDERTOW_CONTINUATION, captureSpan(span));
104104

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public static void afterRequestParse(
7878
span = DECORATE.startSpanFromContext(exchange, extractedContext).setMeasured(true);
7979
scope = extractedContext.with(span).attach();
8080
DECORATE.afterStart(span);
81-
DECORATE.onRequestWithContext(span, exchange, exchange, extractedContext);
81+
DECORATE.onRequest(span, exchange, exchange, extractedContext);
8282
}
8383
DECORATE.onError(span, throwable);
8484
// because we know that a http 400 will be thrown

0 commit comments

Comments
 (0)