Skip to content

Commit 5412294

Browse files
PerfectSlayerPerfectSlayer
committed
feat: Remove Java8BytecodeBridge usage where it's not needed
1 parent 8eed5ba commit 5412294

File tree

12 files changed

+30
-30
lines changed

12 files changed

+30
-30
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.Java8BytecodeBridge.spanFromContext;
3+
import static datadog.trace.bootstrap.instrumentation.api.AgentSpan.fromContext;
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(request, parentContext);
16-
final AgentSpan span = spanFromContext(context);
16+
final AgentSpan span = fromContext(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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
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.Java8BytecodeBridge.spanFromContext;
6+
import static datadog.trace.bootstrap.instrumentation.api.AgentSpan.fromContext;
77
import static datadog.trace.bootstrap.instrumentation.decorator.http.HttpResourceDecorator.HTTP_RESOURCE_DECORATOR;
88
import static datadog.trace.instrumentation.azure.functions.AzureFunctionsDecorator.DECORATE;
99
import static net.bytebuddy.matcher.ElementMatchers.isMethod;
@@ -69,7 +69,7 @@ public static ContextScope methodEnter(
6969
@Advice.Argument(1) final ExecutionContext executionContext) {
7070
final Context parentContext = DECORATE.extract(request);
7171
final Context context = DECORATE.startSpan(request, parentContext);
72-
final AgentSpan span = spanFromContext(context);
72+
final AgentSpan span = fromContext(context);
7373
DECORATE.afterStart(span, executionContext.getFunctionName());
7474
DECORATE.onRequest(span, request, request, parentContext);
7575
HTTP_RESOURCE_DECORATOR.withRoute(
@@ -82,7 +82,7 @@ public static void methodExit(
8282
@Advice.Enter final ContextScope scope,
8383
@Advice.Return final HttpResponseMessage response,
8484
@Advice.Thrown final Throwable throwable) {
85-
final AgentSpan span = spanFromContext(scope.context());
85+
final AgentSpan span = fromContext(scope.context());
8686
DECORATE.onError(span, throwable);
8787
DECORATE.onResponse(span, response);
8888
DECORATE.beforeFinish(span);

‎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;
34
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(req, parentContext);
3131
final ContextScope scope = context.attach();
32-
span = spanFromContext(context);
32+
span = fromContext(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.Java8BytecodeBridge.spanFromContext;
3+
import static datadog.trace.bootstrap.instrumentation.api.AgentSpan.fromContext;
44
import static datadog.trace.bootstrap.instrumentation.decorator.HttpServerDecorator.DD_SPAN_ATTRIBUTE;
55
import static datadog.trace.instrumentation.jetty12.JettyDecorator.DECORATE;
66

@@ -31,7 +31,7 @@ public static void onExit(
3131
final Context parentContext = DECORATE.extract(req);
3232
final Context context = DECORATE.startSpan(req, parentContext);
3333
try (final ContextScope ignored = context.attach()) {
34-
final AgentSpan span = spanFromContext(context);
34+
final AgentSpan span = fromContext(context);
3535
span.setMeasured(true);
3636
DECORATE.afterStart(span);
3737
DECORATE.onRequest(span, req, req, parentContext);

‎dd-java-agent/instrumentation/jetty-common/src/main/java/datadog/trace/instrumentation/jetty/JettyBlockingHelper.java

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

3+
import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromContext;
34
import static java.lang.invoke.MethodHandles.collectArguments;
45
import static java.lang.invoke.MethodHandles.lookup;
56
import static java.lang.invoke.MethodType.methodType;
@@ -11,7 +12,6 @@
1112
import datadog.trace.api.internal.TraceSegment;
1213
import datadog.trace.bootstrap.blocking.BlockingActionHelper;
1314
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
14-
import datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge;
1515
import datadog.trace.bootstrap.instrumentation.decorator.HttpServerDecorator;
1616
import java.io.OutputStream;
1717
import java.io.PrintWriter;
@@ -228,7 +228,7 @@ public static boolean block(
228228
}
229229

230230
public static boolean block(Request request, Response response, Context context) {
231-
AgentSpan span = Java8BytecodeBridge.spanFromContext(context);
231+
AgentSpan span = spanFromContext(context);
232232
Flow.Action.RequestBlockingAction rba;
233233
if (span == null || (rba = span.getRequestBlockingAction()) == null) {
234234
return false;
@@ -243,7 +243,7 @@ public static boolean block(Request request, Response response, Context context)
243243
}
244244

245245
public static boolean hasRequestBlockingAction(Context context) {
246-
AgentSpan span = Java8BytecodeBridge.spanFromContext(context);
246+
AgentSpan span = spanFromContext(context);
247247
return span != null && span.getRequestBlockingAction() != null;
248248
}
249249

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
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.Java8BytecodeBridge.spanFromContext;
4+
import static datadog.trace.bootstrap.instrumentation.api.AgentSpan.fromContext;
55
import static datadog.trace.instrumentation.liberty20.HttpInboundServiceContextImplInstrumentation.REQUEST_MSG_TYPE;
66
import static datadog.trace.instrumentation.liberty20.LibertyDecorator.DD_EXTRACTED_CONTEXT_ATTRIBUTE;
77
import static datadog.trace.instrumentation.liberty20.LibertyDecorator.DD_SPAN_ATTRIBUTE;
@@ -108,7 +108,7 @@ public static class HandleRequestAdvice {
108108
request.setAttribute(DD_EXTRACTED_CONTEXT_ATTRIBUTE, parentContext);
109109
final Context context = DECORATE.startSpan(request, parentContext);
110110
scope = context.attach();
111-
final AgentSpan span = spanFromContext(context);
111+
final AgentSpan span = fromContext(context);
112112
if (Config.get().isJeeSplitByDeployment()) {
113113
final IWebAppDispatcherContext dispatcherContext = request.getWebAppDispatcherContext();
114114
if (dispatcherContext != null) {
@@ -164,7 +164,7 @@ public static void closeScope(
164164
// this has the unfortunate consequence that service name (as set via the tag interceptor)
165165
// of the top span won't match that of its child spans, because it's instead the original
166166
// one that will propagate
167-
DECORATE.getPath(spanFromContext(scope.context()), request);
167+
DECORATE.getPath(fromContext(scope.context()), request);
168168
scope.close();
169169
}
170170
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
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.Java8BytecodeBridge.spanFromContext;
4+
import static datadog.trace.bootstrap.instrumentation.api.AgentSpan.fromContext;
55
import static datadog.trace.instrumentation.liberty23.HttpInboundServiceContextImplInstrumentation.REQUEST_MSG_TYPE;
66
import static datadog.trace.instrumentation.liberty23.LibertyDecorator.DD_EXTRACTED_CONTEXT_ATTRIBUTE;
77
import static datadog.trace.instrumentation.liberty23.LibertyDecorator.DD_SPAN_ATTRIBUTE;
@@ -110,7 +110,7 @@ public static class HandleRequestAdvice {
110110
request.setAttribute(DD_EXTRACTED_CONTEXT_ATTRIBUTE, parentContext);
111111
final Context context = DECORATE.startSpan(request, parentContext);
112112
scope = context.attach();
113-
final AgentSpan span = spanFromContext(context);
113+
final AgentSpan span = fromContext(context);
114114
if (Config.get().isJeeSplitByDeployment()) {
115115
final IWebAppDispatcherContext dispatcherContext = request.getWebAppDispatcherContext();
116116
if (dispatcherContext != null) {
@@ -166,7 +166,7 @@ public static void closeScope(
166166
// this has the unfortunate consequence that service name (as set via the tag interceptor)
167167
// of the top span won't match that of its child spans, because it's instead the original
168168
// one that will propagate
169-
DECORATE.getPath(spanFromContext(scope.context()), request);
169+
DECORATE.getPath(fromContext(scope.context()), request);
170170
scope.close();
171171
}
172172
}

‎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.Java8BytecodeBridge.spanFromContext;
3+
import static datadog.trace.bootstrap.instrumentation.api.AgentSpan.fromContext;
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(request, parentContext);
16-
final AgentSpan span = spanFromContext(context);
16+
final AgentSpan span = fromContext(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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package datadog.trace.instrumentation.play24;
22

3+
import static datadog.trace.bootstrap.instrumentation.api.AgentSpan.fromContext;
34
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan;
45
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
5-
import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromContext;
66
import static datadog.trace.instrumentation.play24.PlayHttpServerDecorator.DECORATE;
77
import static datadog.trace.instrumentation.play24.PlayHttpServerDecorator.PLAY_REQUEST;
88
import static datadog.trace.instrumentation.play24.PlayHttpServerDecorator.REPORT_HTTP_STATUS;
@@ -33,7 +33,7 @@ public static ContextScope onEnter(@Advice.Argument(value = 0, readOnly = false)
3333
final Headers headers = req.headers();
3434
final Context parentContext = DECORATE.extract(headers);
3535
final Context context = DECORATE.startSpan(headers, parentContext);
36-
span = spanFromContext(context);
36+
span = fromContext(context);
3737
scope = context.attach();
3838
} else {
3939
// An upstream framework (e.g. akka-http, netty) has already started the span.
@@ -66,7 +66,7 @@ public static void stopTraceOnResponse(
6666
return;
6767
}
6868

69-
final AgentSpan playControllerSpan = spanFromContext(playControllerScope.context());
69+
final AgentSpan playControllerSpan = fromContext(playControllerScope.context());
7070

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

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

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

3+
import static datadog.trace.bootstrap.instrumentation.api.AgentSpan.fromContext;
34
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan;
45
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
5-
import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromContext;
66
import static datadog.trace.instrumentation.play26.PlayHttpServerDecorator.DECORATE;
77
import static datadog.trace.instrumentation.play26.PlayHttpServerDecorator.PLAY_REQUEST;
88

@@ -34,7 +34,7 @@ public static ContextScope onEnter(@Advice.Argument(value = 0, readOnly = false)
3434
final Headers headers = req.headers();
3535
parentContext = DECORATE.extract(headers);
3636
final Context context = DECORATE.startSpan(headers, parentContext);
37-
span = spanFromContext(context);
37+
span = fromContext(context);
3838
scope = context.attach();
3939
} else {
4040
// An upstream framework (e.g. akka-http, netty) has already started the span.
@@ -68,7 +68,7 @@ public static void stopTraceOnResponse(
6868
return;
6969
}
7070

71-
final AgentSpan playControllerSpan = spanFromContext(playControllerScope.context());
71+
final AgentSpan playControllerSpan = fromContext(playControllerScope.context());
7272

7373
if (throwable == null) {
7474
responseFuture.onComplete(

0 commit comments

Comments
 (0)