Skip to content

Commit 478bffa

Browse files
PerfectSlayerPerfectSlayer
committed
feat(context): Refactor HttpServerDecorator to return Context instead of span on startSpan
1 parent 14f5174 commit 478bffa

File tree

12 files changed

+15
-21
lines changed

12 files changed

+15
-21
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package datadog.trace.instrumentation.akkahttp;
22

3-
import static datadog.trace.bootstrap.instrumentation.api.AgentSpan.fromContext;
3+
import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromContext;
44
import static datadog.trace.instrumentation.akkahttp.AkkaHttpServerDecorator.DECORATE;
55

66
import akka.http.scaladsl.model.HttpRequest;
@@ -13,7 +13,7 @@ public class DatadogWrapperHelper {
1313
public static ContextScope createSpan(final HttpRequest request) {
1414
final Context parentContext = DECORATE.extract(request);
1515
final Context context = DECORATE.startSpan("akka-http", request, parentContext);
16-
final AgentSpan span = fromContext(context);
16+
final AgentSpan span = spanFromContext(context);
1717
DECORATE.afterStart(span);
1818
DECORATE.onRequest(span, request, request, parentContext);
1919

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.declaresMethod;
44
import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.isAnnotatedWith;
55
import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
6-
import static datadog.trace.bootstrap.instrumentation.api.AgentSpan.fromContext;
76
import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromContext;
87
import static datadog.trace.bootstrap.instrumentation.decorator.http.HttpResourceDecorator.HTTP_RESOURCE_DECORATOR;
98
import static datadog.trace.instrumentation.azure.functions.AzureFunctionsDecorator.DECORATE;
@@ -70,7 +69,7 @@ public static ContextScope methodEnter(
7069
@Advice.Argument(1) final ExecutionContext executionContext) {
7170
final Context parentContext = DECORATE.extract(request);
7271
final Context context = DECORATE.startSpan("azure-functions", request, parentContext);
73-
final AgentSpan span = fromContext(context);
72+
final AgentSpan span = spanFromContext(context);
7473
DECORATE.afterStart(span, executionContext.getFunctionName());
7574
DECORATE.onRequest(span, request, request, parentContext);
7675
HTTP_RESOURCE_DECORATOR.withRoute(

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package datadog.trace.instrumentation.jetty11;
22

3-
import static datadog.trace.bootstrap.instrumentation.api.AgentSpan.fromContext;
43
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
4+
import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromContext;
55
import static datadog.trace.bootstrap.instrumentation.decorator.HttpServerDecorator.DD_SPAN_ATTRIBUTE;
66
import static datadog.trace.instrumentation.jetty11.JettyDecorator.DECORATE;
77

@@ -29,7 +29,7 @@ public static ContextScope onEnter(
2929
final Context parentContext = DECORATE.extract(req);
3030
final Context context = DECORATE.startSpan("jetty", req, parentContext);
3131
final ContextScope scope = context.attach();
32-
span = fromContext(context);
32+
span = spanFromContext(context);
3333
span.setMeasured(true);
3434
DECORATE.afterStart(span);
3535
DECORATE.onRequest(span, req, req, parentContext);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package datadog.trace.instrumentation.jetty12;
22

3-
import static datadog.trace.bootstrap.instrumentation.api.AgentSpan.fromContext;
3+
import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromContext;
44
import static datadog.trace.bootstrap.instrumentation.decorator.HttpServerDecorator.DD_SPAN_ATTRIBUTE;
55
import static datadog.trace.instrumentation.jetty12.JettyDecorator.DECORATE;
66

@@ -30,8 +30,8 @@ public static void onExit(
3030

3131
final Context parentContext = DECORATE.extract(req);
3232
final Context context = DECORATE.startSpan("jetty", req, parentContext);
33-
final AgentSpan span = fromContext(context);
3433
try (final ContextScope scope = context.attach()) {
34+
final AgentSpan span = spanFromContext(context);
3535
span.setMeasured(true);
3636
DECORATE.afterStart(span);
3737
DECORATE.onRequest(span, req, req, parentContext);

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package datadog.trace.instrumentation.liberty20;
22

33
import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
4-
import static datadog.trace.bootstrap.instrumentation.api.AgentSpan.fromContext;
54
import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromContext;
65
import static datadog.trace.instrumentation.liberty20.HttpInboundServiceContextImplInstrumentation.REQUEST_MSG_TYPE;
76
import static datadog.trace.instrumentation.liberty20.LibertyDecorator.DD_EXTRACTED_CONTEXT_ATTRIBUTE;
@@ -109,7 +108,7 @@ public static class HandleRequestAdvice {
109108
request.setAttribute(DD_EXTRACTED_CONTEXT_ATTRIBUTE, parentContext);
110109
final Context context = DECORATE.startSpan("liberty", request, parentContext);
111110
scope = context.attach();
112-
final AgentSpan span = fromContext(context);
111+
final AgentSpan span = spanFromContext(context);
113112
if (Config.get().isJeeSplitByDeployment()) {
114113
final IWebAppDispatcherContext dispatcherContext = request.getWebAppDispatcherContext();
115114
if (dispatcherContext != null) {

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package datadog.trace.instrumentation.liberty23;
22

33
import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
4-
import static datadog.trace.bootstrap.instrumentation.api.AgentSpan.fromContext;
54
import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromContext;
65
import static datadog.trace.instrumentation.liberty23.HttpInboundServiceContextImplInstrumentation.REQUEST_MSG_TYPE;
76
import static datadog.trace.instrumentation.liberty23.LibertyDecorator.DD_EXTRACTED_CONTEXT_ATTRIBUTE;
@@ -111,7 +110,7 @@ public static class HandleRequestAdvice {
111110
request.setAttribute(DD_EXTRACTED_CONTEXT_ATTRIBUTE, parentContext);
112111
final Context context = DECORATE.startSpan("liberty", request, parentContext);
113112
scope = context.attach();
114-
final AgentSpan span = fromContext(context);
113+
final AgentSpan span = spanFromContext(context);
115114
if (Config.get().isJeeSplitByDeployment()) {
116115
final IWebAppDispatcherContext dispatcherContext = request.getWebAppDispatcherContext();
117116
if (dispatcherContext != null) {

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package datadog.trace.instrumentation.netty40.server;
22

3-
import static datadog.trace.bootstrap.instrumentation.api.AgentSpan.fromContext;
43
import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromContext;
54
import static datadog.trace.instrumentation.netty40.AttributeKeys.ANALYZED_RESPONSE_KEY;
65
import static datadog.trace.instrumentation.netty40.AttributeKeys.BLOCKED_RESPONSE_KEY;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package datadog.trace.instrumentation.netty41.server;
22

3-
import static datadog.trace.bootstrap.instrumentation.api.AgentSpan.fromContext;
43
import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromContext;
54
import static datadog.trace.instrumentation.netty41.AttributeKeys.ANALYZED_RESPONSE_KEY;
65
import static datadog.trace.instrumentation.netty41.AttributeKeys.BLOCKED_RESPONSE_KEY;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package datadog.trace.instrumentation.pekkohttp;
22

3-
import static datadog.trace.bootstrap.instrumentation.api.AgentSpan.fromContext;
3+
import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromContext;
44
import static datadog.trace.instrumentation.pekkohttp.PekkoHttpServerDecorator.DECORATE;
55

66
import datadog.context.Context;
@@ -13,7 +13,7 @@ public class DatadogWrapperHelper {
1313
public static ContextScope createSpan(final HttpRequest request) {
1414
final Context parentContext = DECORATE.extract(request);
1515
final Context context = DECORATE.startSpan("pekko", request, parentContext);
16-
final AgentSpan span = fromContext(context);
16+
final AgentSpan span = spanFromContext(context);
1717
DECORATE.afterStart(span);
1818
DECORATE.onRequest(span, request, request, parentContext);
1919

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package datadog.trace.instrumentation.play24;
22

3-
import static datadog.trace.bootstrap.instrumentation.api.AgentSpan.fromContext;
43
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan;
54
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
65
import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromContext;

0 commit comments

Comments
 (0)