Skip to content

Commit ad6d6b9

Browse files
authored
Cleaning up HttpServerDecorator (#9139)
1 parent 923ac63 commit ad6d6b9

File tree

28 files changed

+28
-47
lines changed

28 files changed

+28
-47
lines changed

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

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import static datadog.trace.api.cache.RadixTreeCache.UNSET_STATUS;
55
import static datadog.trace.api.datastreams.DataStreamsContext.forHttpServer;
66
import static datadog.trace.api.gateway.Events.EVENTS;
7-
import static datadog.trace.bootstrap.instrumentation.api.AgentPropagation.extractContextAndGetSpanContext;
87
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.traceConfig;
98
import static datadog.trace.bootstrap.instrumentation.decorator.http.HttpResourceDecorator.HTTP_RESOURCE_DECORATOR;
109

@@ -119,32 +118,14 @@ protected AgentTracer.TracerAPI tracer() {
119118
return AgentTracer.get();
120119
}
121120

122-
/** Deprecated. Use {@link #extractContext(REQUEST_CARRIER)} instead. */
123-
public AgentSpanContext.Extracted extract(REQUEST_CARRIER carrier) {
124-
AgentPropagation.ContextVisitor<REQUEST_CARRIER> getter = getter();
125-
if (null == carrier || null == getter) {
126-
return null;
127-
}
128-
return extractContextAndGetSpanContext(carrier, getter);
129-
}
130-
131-
/**
132-
* Will be renamed to #extract(REQUEST_CARRIER) when refactoring of instrumentations is complete
133-
*/
134-
public Context extractContext(REQUEST_CARRIER carrier) {
121+
public Context extract(REQUEST_CARRIER carrier) {
135122
AgentPropagation.ContextVisitor<REQUEST_CARRIER> getter = getter();
136123
if (null == carrier || null == getter) {
137124
return root();
138125
}
139126
return Propagators.defaultPropagator().extract(root(), carrier, getter);
140127
}
141128

142-
/** Deprecated. Use {@link #startSpan(Object, Context)} instead. */
143-
@Deprecated
144-
public AgentSpan startSpan(REQUEST_CARRIER carrier, AgentSpanContext.Extracted context) {
145-
return startSpan("http-server", carrier, context);
146-
}
147-
148129
public AgentSpan startSpan(
149130
String instrumentationName, REQUEST_CARRIER carrier, AgentSpanContext.Extracted context) {
150131
AgentSpan span =

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
@@ -10,7 +10,7 @@
1010

1111
public class DatadogWrapperHelper {
1212
public static ContextScope createSpan(final HttpRequest request) {
13-
final Context context = DECORATE.extractContext(request);
13+
final Context context = DECORATE.extract(request);
1414
final AgentSpan span = DECORATE.startSpan(request, context);
1515
DECORATE.afterStart(span);
1616
DECORATE.onRequest(span, request, request, context);

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
@@ -67,7 +67,7 @@ public static class AzureFunctionsAdvice {
6767
public static ContextScope methodEnter(
6868
@Advice.Argument(0) final HttpRequestMessage request,
6969
@Advice.Argument(1) final ExecutionContext context) {
70-
final Context extractedContext = DECORATE.extractContext(request);
70+
final Context extractedContext = DECORATE.extract(request);
7171
final AgentSpan span = DECORATE.startSpan(request, extractedContext);
7272
DECORATE.afterStart(span, context.getFunctionName());
7373
DECORATE.onRequest(span, request, request, extractedContext);

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
@@ -73,7 +73,7 @@ public static class HandleAdvice {
7373
return false;
7474
}
7575

76-
final Context parentContext = DECORATE.extractContext(request);
76+
final Context parentContext = DECORATE.extract(request);
7777
final AgentSpan span = DECORATE.startSpan(request, parentContext);
7878
DECORATE.afterStart(span);
7979
DECORATE.onRequest(span, request, request, parentContext);

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
@@ -112,7 +112,7 @@ public static NextAction onHttpCodecFilterExit(
112112
}
113113
HttpRequestPacket httpRequest = (HttpRequestPacket) httpHeader;
114114
HttpResponsePacket httpResponse = httpRequest.getResponse();
115-
Context context = DECORATE.extractContext(httpRequest);
115+
Context context = DECORATE.extract(httpRequest);
116116
AgentSpan span = DECORATE.startSpan(httpRequest, context);
117117
ContextScope scope = context.with(span).attach();
118118
DECORATE.afterStart(span);

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
@@ -26,7 +26,7 @@ public static ContextScope onEnter(
2626
return activateSpan((AgentSpan) existingSpan);
2727
}
2828

29-
final Context context = DECORATE.extractContext(req);
29+
final Context context = DECORATE.extract(req);
3030
span = DECORATE.startSpan(req, context);
3131
final ContextScope scope = context.with(span).attach();
3232
span.setMeasured(true);

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
@@ -27,7 +27,7 @@ public static void onExit(
2727
}
2828
}
2929

30-
final Context context = JettyDecorator.DECORATE.extractContext(req);
30+
final Context context = JettyDecorator.DECORATE.extract(req);
3131
final AgentSpan span = JettyDecorator.DECORATE.startSpan(req, context);
3232
try (final ContextScope scope = context.with(span).attach()) {
3333
span.setMeasured(true);

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
@@ -155,7 +155,7 @@ public static ContextScope onEnter(
155155
return ((AgentSpan) existingSpan).attach();
156156
}
157157

158-
final Context extractedContext = DECORATE.extractContext(req);
158+
final Context extractedContext = DECORATE.extract(req);
159159
span = DECORATE.startSpan(req, extractedContext);
160160
final ContextScope scope = extractedContext.with(span).attach();
161161
DECORATE.afterStart(span);

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
@@ -156,7 +156,7 @@ public static ContextScope onEnter(
156156
return ((AgentSpan) existingSpan).attach();
157157
}
158158

159-
final Context extractedContext = DECORATE.extractContext(req);
159+
final Context extractedContext = DECORATE.extract(req);
160160
span = DECORATE.startSpan(req, extractedContext);
161161
final ContextScope scope = extractedContext.with(span).attach();
162162
DECORATE.afterStart(span);

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
@@ -170,7 +170,7 @@ public static ContextScope onEnter(
170170
return ((AgentSpan) existingSpan).attach();
171171
}
172172

173-
final Context context = DECORATE.extractContext(req);
173+
final Context context = DECORATE.extract(req);
174174
span = DECORATE.startSpan(req, context);
175175
final ContextScope scope = context.with(span).attach();
176176
DECORATE.afterStart(span);

0 commit comments

Comments
 (0)