diff --git a/dd-java-agent/agent-aiguard/src/main/java/com/datadog/aiguard/AIGuardInternal.java b/dd-java-agent/agent-aiguard/src/main/java/com/datadog/aiguard/AIGuardInternal.java index 55514ba0a52..11ede90b51c 100644 --- a/dd-java-agent/agent-aiguard/src/main/java/com/datadog/aiguard/AIGuardInternal.java +++ b/dd-java-agent/agent-aiguard/src/main/java/com/datadog/aiguard/AIGuardInternal.java @@ -11,6 +11,7 @@ import com.squareup.moshi.Moshi; import com.squareup.moshi.Types; import datadog.communication.http.OkHttpUtils; +import datadog.context.ContextScope; import datadog.trace.api.Config; import datadog.trace.api.aiguard.AIGuard; import datadog.trace.api.aiguard.AIGuard.AIGuardAbortError; @@ -26,7 +27,6 @@ import datadog.trace.api.aiguard.noop.NoOpEvaluator; import datadog.trace.api.gateway.RequestContext; import datadog.trace.api.telemetry.WafMetricCollector; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import datadog.trace.bootstrap.instrumentation.api.ClientIpAddressData; @@ -281,7 +281,7 @@ public Evaluation evaluate(final List messages, final Options options) // sure client IP tags were populated. copyAnomalyDetectionTags(span, localRootSpan); } - try (final AgentScope scope = tracer.activateSpan(span)) { + try (final ContextScope scope = tracer.activateSpan(span)) { final Message last = messages.get(messages.size() - 1); if (isToolCall(last)) { span.setTag(TARGET_TAG, "tool"); diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/httpurlconnection/HttpUrlState.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/httpurlconnection/HttpUrlState.java index c0871f847b0..71e4f076a62 100644 --- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/httpurlconnection/HttpUrlState.java +++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/httpurlconnection/HttpUrlState.java @@ -5,8 +5,8 @@ import static datadog.trace.bootstrap.instrumentation.httpurlconnection.HttpUrlConnectionDecorator.DECORATE; import static datadog.trace.bootstrap.instrumentation.httpurlconnection.HttpUrlConnectionDecorator.HTTP_URL_CONNECTION; +import datadog.context.ContextScope; import datadog.trace.bootstrap.ContextStore; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.net.HttpURLConnection; @@ -18,7 +18,7 @@ public class HttpUrlState { public AgentSpan start(final HttpURLConnection connection) { span = startSpan(HTTP_URL_CONNECTION.toString(), DECORATE.operationName()); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { DECORATE.afterStart(span); DECORATE.onRequest(span, connection); return span; @@ -39,7 +39,7 @@ public void finish() { public void finishSpan( final HttpURLConnection connection, final int responseCode, final Throwable throwable) { - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { if (responseCode > 0) { // safe to access response data as 'responseCode' is set DECORATE.onResponse(span, connection); @@ -62,7 +62,7 @@ public void finishSpan(final HttpURLConnection connection, final int responseCod * (e.g. breaks getOutputStream). */ if (responseCode > 0) { - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { // safe to access response data as 'responseCode' is set DECORATE.onResponse(span, connection); DECORATE.beforeFinish(span); diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/Wrapper.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/Wrapper.java index 5945ac4742f..6fc68a77975 100644 --- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/Wrapper.java +++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/Wrapper.java @@ -5,6 +5,7 @@ import static datadog.trace.bootstrap.instrumentation.java.concurrent.ExcludeFilter.ExcludeType.RUNNABLE; import static datadog.trace.bootstrap.instrumentation.java.concurrent.ExcludeFilter.exclude; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import java.util.concurrent.RunnableFuture; @@ -43,7 +44,7 @@ public Wrapper(T delegate, AgentScope.Continuation continuation) { @Override public void run() { - try (AgentScope scope = activate()) { + try (ContextScope scope = activate()) { delegate.run(); } } diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/probe/LogProbeTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/probe/LogProbeTest.java index 07b7ae05185..a3c25c48021 100644 --- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/probe/LogProbeTest.java +++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/probe/LogProbeTest.java @@ -16,6 +16,7 @@ import com.datadog.debugger.sink.DebuggerSink; import com.datadog.debugger.sink.ProbeStatusSink; import com.datadog.debugger.sink.Snapshot; +import datadog.context.ContextScope; import datadog.trace.api.Config; import datadog.trace.api.IdGenerationStrategy; import datadog.trace.bootstrap.debugger.CapturedContext; @@ -23,7 +24,6 @@ import datadog.trace.bootstrap.debugger.MethodLocation; import datadog.trace.bootstrap.debugger.ProbeId; import datadog.trace.bootstrap.debugger.ProbeRateLimiter; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import datadog.trace.bootstrap.instrumentation.api.AgentTracer.TracerAPI; @@ -136,7 +136,7 @@ private int runTrace(TracerAPI tracer, boolean captureSnapshot, Integer line, St if (sessionId != null) { span.setTag(Tags.PROPAGATED_DEBUG, sessionId + ":1"); } - try (AgentScope scope = tracer.activateManualSpan(span)) { + try (ContextScope scope = tracer.activateManualSpan(span)) { Builder builder = createLog("Budget testing").probeId(ProbeId.newId()).captureSnapshot(captureSnapshot); if (sessionId != null) { @@ -177,7 +177,7 @@ private boolean fillSnapshot(DebugSessionStatus status) { CoreTracer.builder().idGenerationStrategy(IdGenerationStrategy.fromName("random")).build(); AgentTracer.registerIfAbsent(tracer); AgentSpan span = tracer.startSpan("log probe debug session testing", "test span"); - try (AgentScope scope = tracer.activateManualSpan(span)) { + try (ContextScope scope = tracer.activateManualSpan(span)) { if (status == DebugSessionStatus.ACTIVE) { span.setTag(Tags.PROPAGATED_DEBUG, DEBUG_SESSION_ID + ":1"); } else if (status == DebugSessionStatus.DISABLED) { diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CapturedSnapshot20.java b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CapturedSnapshot20.java index 85061184202..d133f975073 100644 --- a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CapturedSnapshot20.java +++ b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CapturedSnapshot20.java @@ -1,7 +1,7 @@ package com.datadog.debugger; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.TracerInstaller; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import datadog.trace.core.CoreTracer; @@ -25,7 +25,7 @@ public class CapturedSnapshot20 { public static int main(String arg) { AgentTracer.TracerAPI tracerAPI = AgentTracer.get(); AgentSpan span = tracerAPI.buildSpan("dynamic-instrumentation", "process").start(); - try (AgentScope scope = tracerAPI.activateManualSpan(span)) { + try (ContextScope scope = tracerAPI.activateManualSpan(span)) { if (arg.equals("exception") || arg.equals("illegal")) { return new CapturedSnapshot20().processWithException(arg); } diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CapturedSnapshot21.java b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CapturedSnapshot21.java index eb097c0b7a7..3f79b2e81f5 100644 --- a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CapturedSnapshot21.java +++ b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CapturedSnapshot21.java @@ -1,7 +1,7 @@ package com.datadog.debugger; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.TracerInstaller; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import datadog.trace.core.CoreTracer; @@ -25,7 +25,7 @@ public class CapturedSnapshot21 { public static int main(String arg) { AgentTracer.TracerAPI tracerAPI = AgentTracer.get(); AgentSpan span = tracerAPI.buildSpan("dynamic-instrumentation", "rootProcess").start(); - try (AgentScope scope = tracerAPI.activateManualSpan(span)) { + try (ContextScope scope = tracerAPI.activateManualSpan(span)) { return new CapturedSnapshot21().rootProcess(arg); } finally { span.finish(); @@ -35,7 +35,7 @@ public static int main(String arg) { private int rootProcess(String arg) { AgentTracer.TracerAPI tracerAPI = AgentTracer.get(); AgentSpan span = tracerAPI.buildSpan("dynamic-instrumentation", "process1").start(); - try (AgentScope scope = tracerAPI.activateManualSpan(span)) { + try (ContextScope scope = tracerAPI.activateManualSpan(span)) { return process1(arg) + 1; } finally { span.finish(); @@ -45,7 +45,7 @@ private int rootProcess(String arg) { private int process1(String arg) { AgentTracer.TracerAPI tracerAPI = AgentTracer.get(); AgentSpan span = tracerAPI.buildSpan("dynamic-instrumentation", "process2").start(); - try (AgentScope scope = tracerAPI.activateManualSpan(span)) { + try (ContextScope scope = tracerAPI.activateManualSpan(span)) { return process2(arg) + 1; } finally { span.finish(); @@ -55,7 +55,7 @@ private int process1(String arg) { private int process2(String arg) { AgentTracer.TracerAPI tracerAPI = AgentTracer.get(); AgentSpan span = tracerAPI.buildSpan("dynamic-instrumentation", "process3").start(); - try (AgentScope scope = tracerAPI.activateManualSpan(span)) { + try (ContextScope scope = tracerAPI.activateManualSpan(span)) { return process3(arg) + 1; } finally { span.finish(); diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CapturedSnapshot28.java b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CapturedSnapshot28.java index 5060b569597..a756ffd10c1 100644 --- a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CapturedSnapshot28.java +++ b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CapturedSnapshot28.java @@ -1,7 +1,7 @@ package com.datadog.debugger; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.TracerInstaller; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import datadog.trace.core.CoreTracer; @@ -26,7 +26,7 @@ public class CapturedSnapshot28 { public static int main(String arg) { AgentTracer.TracerAPI tracerAPI = AgentTracer.get(); AgentSpan span = tracerAPI.buildSpan("dynamic-instrumentation", "process").start(); - try (AgentScope scope = tracerAPI.activateManualSpan(span)) { + try (ContextScope scope = tracerAPI.activateManualSpan(span)) { return new CapturedSnapshot28().process(arg); } finally { span.finish(); diff --git a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/Reporter.java b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/Reporter.java index f5b9a16ff00..2a8ecd671b2 100644 --- a/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/Reporter.java +++ b/dd-java-agent/agent-iast/src/main/java/com/datadog/iast/Reporter.java @@ -7,6 +7,7 @@ import com.datadog.iast.model.Vulnerability; import com.datadog.iast.model.VulnerabilityBatch; import com.datadog.iast.taint.TaintedObjects; +import datadog.context.ContextScope; import datadog.trace.api.Config; import datadog.trace.api.ProductTraceSource; import datadog.trace.api.gateway.RequestContext; @@ -61,7 +62,7 @@ public void report(@Nullable final AgentSpan span, @Nonnull final Vulnerability } if (span == null) { final AgentSpan newSpan = startNewSpan(); - try (final AgentScope autoClosed = tracer().activateManualSpan(newSpan)) { + try (final ContextScope autoClosed = tracer().activateManualSpan(newSpan)) { vulnerability.updateSpan(newSpan); reportVulnerability(newSpan, vulnerability); } finally { diff --git a/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/TracingListener.java b/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/TracingListener.java index b51b7b67398..e645c2e4660 100644 --- a/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/TracingListener.java +++ b/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/TracingListener.java @@ -17,7 +17,7 @@ import com.aerospike.client.listener.RecordListener; import com.aerospike.client.listener.RecordSequenceListener; import com.aerospike.client.listener.WriteListener; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope.Continuation; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.util.List; @@ -73,7 +73,7 @@ public void onSuccess(final Key key, final boolean exists) { clientSpan.finish(); if (listener != null) { - try (final AgentScope scope = continuation.activate()) { + try (final ContextScope scope = continuation.activate()) { if (listener instanceof ExistsListener) { ((ExistsListener) listener).onSuccess(key, exists); } else if (listener instanceof DeleteListener) { @@ -91,7 +91,7 @@ public void onSuccess(final Key[] keys, final boolean[] exists) { clientSpan.finish(); if (listener != null) { - try (final AgentScope scope = continuation.activate()) { + try (final ContextScope scope = continuation.activate()) { ((ExistsArrayListener) listener).onSuccess(keys, exists); } } else { @@ -105,7 +105,7 @@ public void onSuccess(final Key key, final Record record) { clientSpan.finish(); if (listener != null) { - try (final AgentScope scope = continuation.activate()) { + try (final ContextScope scope = continuation.activate()) { ((RecordListener) listener).onSuccess(key, record); } } else { @@ -119,7 +119,7 @@ public void onSuccess(final Key[] keys, final Record[] records) { clientSpan.finish(); if (listener != null) { - try (final AgentScope scope = continuation.activate()) { + try (final ContextScope scope = continuation.activate()) { ((RecordArrayListener) listener).onSuccess(keys, records); } } else { @@ -133,7 +133,7 @@ public void onSuccess(final List records) { clientSpan.finish(); if (listener != null) { - try (final AgentScope scope = continuation.activate()) { + try (final ContextScope scope = continuation.activate()) { ((BatchListListener) listener).onSuccess(records); } } else { @@ -147,7 +147,7 @@ public void onSuccess(final Key key) { clientSpan.finish(); if (listener != null) { - try (final AgentScope scope = continuation.activate()) { + try (final ContextScope scope = continuation.activate()) { ((WriteListener) listener).onSuccess(key); } } else { @@ -161,7 +161,7 @@ public void onSuccess(final Key key, final Object obj) { clientSpan.finish(); if (listener != null) { - try (final AgentScope scope = continuation.activate()) { + try (final ContextScope scope = continuation.activate()) { ((ExecuteListener) listener).onSuccess(key, obj); } } else { @@ -175,7 +175,7 @@ public void onSuccess() { clientSpan.finish(); if (listener != null) { - try (final AgentScope scope = continuation.activate()) { + try (final ContextScope scope = continuation.activate()) { if (listener instanceof ExistsSequenceListener) { ((ExistsSequenceListener) listener).onSuccess(); } else if (listener instanceof RecordSequenceListener) { @@ -196,7 +196,7 @@ public void onFailure(final AerospikeException error) { clientSpan.finish(); if (listener != null) { - try (final AgentScope scope = continuation.activate()) { + try (final ContextScope scope = continuation.activate()) { if (listener instanceof ExistsListener) { ((ExistsListener) listener).onFailure(error); } else if (listener instanceof ExistsSequenceListener) { diff --git a/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/test/java/LinearTask.java b/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/test/java/LinearTask.java index caffe6096f5..14be3d3601b 100644 --- a/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/test/java/LinearTask.java +++ b/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/test/java/LinearTask.java @@ -2,7 +2,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; import akka.dispatch.forkjoin.RecursiveTask; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; public class LinearTask extends RecursiveTask { @@ -32,7 +32,7 @@ protected Integer compute() { } else { int next = parent + 1; AgentSpan span = startSpan("test", Integer.toString(next)); - try (AgentScope scope = activateSpan(span)) { + try (ContextScope scope = activateSpan(span)) { LinearTask child = new LinearTask(next, depth); return child.fork().join(); } finally { diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/TraceContinuedFutureCallback.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/TraceContinuedFutureCallback.java index 5217f109822..28714b150c3 100644 --- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/TraceContinuedFutureCallback.java +++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/TraceContinuedFutureCallback.java @@ -3,6 +3,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopContinuation; import static datadog.trace.instrumentation.apachehttpasyncclient.ApacheHttpAsyncClientDecorator.DECORATE; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import org.apache.http.concurrent.FutureCallback; @@ -35,7 +36,7 @@ public void completed(final T result) { if (parentContinuation == noopContinuation()) { completeDelegate(result); } else { - try (final AgentScope scope = parentContinuation.activate()) { + try (final ContextScope scope = parentContinuation.activate()) { completeDelegate(result); } } @@ -51,7 +52,7 @@ public void failed(final Exception ex) { if (parentContinuation == noopContinuation()) { failDelegate(ex); } else { - try (final AgentScope scope = parentContinuation.activate()) { + try (final ContextScope scope = parentContinuation.activate()) { failDelegate(ex); } } @@ -66,7 +67,7 @@ public void cancelled() { if (parentContinuation == noopContinuation()) { cancelDelegate(); } else { - try (final AgentScope scope = parentContinuation.activate()) { + try (final ContextScope scope = parentContinuation.activate()) { cancelDelegate(); } } diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/TraceContinuedFutureCallback.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/TraceContinuedFutureCallback.java index d283b9c7ca5..f279651b0c4 100644 --- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/TraceContinuedFutureCallback.java +++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/TraceContinuedFutureCallback.java @@ -3,6 +3,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopContinuation; import static datadog.trace.instrumentation.apachehttpclient5.ApacheHttpClientDecorator.DECORATE; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import javax.annotation.Nullable; @@ -38,7 +39,7 @@ public void completed(final T result) { if (parentContinuation == noopContinuation()) { completeDelegate(result); } else { - try (final AgentScope scope = parentContinuation.activate()) { + try (final ContextScope scope = parentContinuation.activate()) { completeDelegate(result); } } @@ -54,7 +55,7 @@ public void failed(final Exception ex) { if (parentContinuation == noopContinuation()) { failDelegate(ex); } else { - try (final AgentScope scope = parentContinuation.activate()) { + try (final ContextScope scope = parentContinuation.activate()) { failDelegate(ex); } } @@ -69,7 +70,7 @@ public void cancelled() { if (parentContinuation == noopContinuation()) { cancelDelegate(); } else { - try (final AgentScope scope = parentContinuation.activate()) { + try (final ContextScope scope = parentContinuation.activate()) { cancelDelegate(); } } diff --git a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/TracingServerInterceptor.java b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/TracingServerInterceptor.java index 9661d73feaf..7acce3e37fe 100644 --- a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/TracingServerInterceptor.java +++ b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/TracingServerInterceptor.java @@ -11,6 +11,7 @@ import static datadog.trace.instrumentation.armeria.grpc.server.GrpcServerDecorator.GRPC_SERVER; import static datadog.trace.instrumentation.armeria.grpc.server.GrpcServerDecorator.SERVER_PATHWAY_EDGE_TAGS; +import datadog.context.ContextScope; import datadog.trace.api.Config; import datadog.trace.api.cache.DDCache; import datadog.trace.api.cache.DDCaches; @@ -21,7 +22,6 @@ import datadog.trace.api.gateway.IGSpanInfo; import datadog.trace.api.gateway.RequestContext; import datadog.trace.api.gateway.RequestContextSlot; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; @@ -91,7 +91,7 @@ public ServerCall.Listener interceptCall( DECORATE.onCall(span, call); final ServerCall.Listener result; - try (AgentScope scope = activateSpan(span)) { + try (ContextScope scope = activateSpan(span)) { // Wrap the server call so that we can decorate the span // with the resulting status final TracingServerCall tracingServerCall = new TracingServerCall<>(span, call); @@ -123,7 +123,7 @@ static final class TracingServerCall @Override public void close(final Status status, final Metadata trailers) { DECORATE.onClose(span, status); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { delegate().close(status, trailers); } catch (final Throwable e) { DECORATE.onError(span, e); @@ -153,7 +153,7 @@ public void onMessage(final ReqT message) { startSpan(DECORATE.instrumentationNames()[0], GRPC_MESSAGE, this.span.spanContext()) .setTag("message.type", message.getClass().getName()); DECORATE.afterStart(msgSpan); - try (AgentScope scope = activateSpan(msgSpan)) { + try (ContextScope scope = activateSpan(msgSpan)) { callIGCallbackGrpcMessage(msgSpan, message); delegate().onMessage(message); } catch (final Throwable e) { @@ -173,7 +173,7 @@ public void onMessage(final ReqT message) { @Override public void onHalfClose() { - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { delegate().onHalfClose(); } catch (final Throwable e) { if (span.phasedFinish()) { @@ -189,7 +189,7 @@ public void onHalfClose() { @Override public void onCancel() { // Finishes span. - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { delegate().onCancel(); span.setTag("canceled", true); } catch (CancellationException e) { @@ -210,7 +210,7 @@ public void onCancel() { @Override public void onComplete() { // Finishes span. - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { delegate().onComplete(); } catch (final Throwable e) { DECORATE.onError(span, e); @@ -230,7 +230,7 @@ public void onComplete() { @Override public void onReady() { - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { delegate().onReady(); } catch (final Throwable e) { if (span.phasedFinish()) { diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/AwsSdkClientDecorator.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/AwsSdkClientDecorator.java index e2a56e73500..4f3343ab674 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/AwsSdkClientDecorator.java +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/AwsSdkClientDecorator.java @@ -11,6 +11,7 @@ import com.amazonaws.Request; import com.amazonaws.Response; import com.amazonaws.http.HttpMethodName; +import datadog.context.ContextScope; import datadog.context.propagation.CarrierSetter; import datadog.trace.api.Config; import datadog.trace.api.DDTags; @@ -18,7 +19,6 @@ import datadog.trace.api.cache.DDCaches; import datadog.trace.api.datastreams.DataStreamsTags; import datadog.trace.api.naming.SpanNaming; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import datadog.trace.bootstrap.instrumentation.api.InstrumentationTags; @@ -206,14 +206,14 @@ public AgentSpan onRequest(final AgentSpan span, final Request request) { if (null != streamArn && "AmazonKinesis".equals(awsServiceName)) { switch (awsOperation.getSimpleName()) { case PUT_RECORD_OPERATION_NAME: - try (AgentScope scope = AgentTracer.activateSpan(span)) { + try (ContextScope scope = AgentTracer.activateSpan(span)) { AgentTracer.get() .getDataStreamsMonitoring() .setProduceCheckpoint("kinesis", streamArn); } break; case PUT_RECORDS_OPERATION_NAME: - try (AgentScope scope = AgentTracer.activateSpan(span)) { + try (ContextScope scope = AgentTracer.activateSpan(span)) { List records = access.getRecords(originalRequest); for (Object ignored : records) { AgentTracer.get() @@ -228,12 +228,12 @@ public AgentSpan onRequest(final AgentSpan span, final Request request) { } else if (null != topicName && "AmazonSNS".equals(awsServiceName)) { switch (awsOperation.getSimpleName()) { case PUBLISH_OPERATION_NAME: - try (AgentScope scope = AgentTracer.activateSpan(span)) { + try (ContextScope scope = AgentTracer.activateSpan(span)) { AgentTracer.get().getDataStreamsMonitoring().setProduceCheckpoint("sns", topicName); } break; case PUBLISH_BATCH_OPERATION_NAME: - try (AgentScope scope = AgentTracer.activateSpan(span)) { + try (ContextScope scope = AgentTracer.activateSpan(span)) { List entries = access.getEntries(originalRequest); for (Object ignored : entries) { AgentTracer.get().getDataStreamsMonitoring().setProduceCheckpoint("sns", topicName); diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/TracingExecutionInterceptor.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/TracingExecutionInterceptor.java index 8c0492406e1..980f08ca118 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/TracingExecutionInterceptor.java +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/TracingExecutionInterceptor.java @@ -11,11 +11,11 @@ import static datadog.trace.instrumentation.aws.v2.AwsSdkClientDecorator.DECORATE; import datadog.context.Context; +import datadog.context.ContextScope; import datadog.context.propagation.Propagators; import datadog.trace.api.Config; import datadog.trace.bootstrap.ContextStore; import datadog.trace.bootstrap.InstanceStore; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.util.Optional; import org.slf4j.Logger; @@ -69,7 +69,7 @@ public void afterMarshalling( final Context ddContext = executionAttributes.getAttribute(CONTEXT_ATTRIBUTE); final AgentSpan span = fromContext(ddContext); if (context != null && span != null) { - try (AgentScope ignored = activateSpan(span)) { + try (ContextScope ignored = activateSpan(span)) { DECORATE.onRequest(span, context.httpRequest()); DECORATE.onSdkRequest( ddContext, context.request(), context.httpRequest(), executionAttributes); diff --git a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/TracingSession.java b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/TracingSession.java index 9b9dc069420..23cdb14b3d2 100644 --- a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/TracingSession.java +++ b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra4/TracingSession.java @@ -17,7 +17,7 @@ import com.datastax.oss.driver.api.core.session.Session; import com.datastax.oss.driver.api.core.type.reflect.GenericType; import com.datastax.oss.driver.internal.core.session.SessionWrapper; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.InstrumentationTags; import datadog.trace.util.AgentThreadFactory; @@ -62,7 +62,7 @@ private ResultSet wrapSyncRequest(Statement request) { DECORATE.onStatement(span, getQuery(request)); span.setTag(InstrumentationTags.CASSANDRA_CONTACT_POINTS, contactPoints); - try (AgentScope scope = activateSpan(span)) { + try (ContextScope scope = activateSpan(span)) { ResultSet resultSet = getDelegate().execute(request, Statement.SYNC); DECORATE.onResponse(span, resultSet); DECORATE.beforeFinish(span); @@ -86,7 +86,7 @@ private CompletionStage wrapAsyncRequest(Statement request) { DECORATE.onStatement(span, getQuery(request)); span.setTag(InstrumentationTags.CASSANDRA_CONTACT_POINTS, contactPoints); - try (AgentScope scope = activateSpan(span)) { + try (ContextScope scope = activateSpan(span)) { CompletionStage completionStage = getDelegate().execute(request, Statement.ASYNC); diff --git a/dd-java-agent/instrumentation/gax-1.4/src/test/java/datadog/trace/instrumentation/gax/GaxRetryContinuationTest.java b/dd-java-agent/instrumentation/gax-1.4/src/test/java/datadog/trace/instrumentation/gax/GaxRetryContinuationTest.java index 89daf1b2b9e..f70f1b6280e 100644 --- a/dd-java-agent/instrumentation/gax-1.4/src/test/java/datadog/trace/instrumentation/gax/GaxRetryContinuationTest.java +++ b/dd-java-agent/instrumentation/gax-1.4/src/test/java/datadog/trace/instrumentation/gax/GaxRetryContinuationTest.java @@ -17,8 +17,8 @@ import com.google.api.gax.retrying.RetrySettings; import com.google.api.gax.retrying.RetryingFuture; import com.google.api.gax.retrying.ScheduledRetryingExecutor; +import datadog.context.ContextScope; import datadog.trace.agent.test.AbstractInstrumentationTest; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutionException; @@ -40,7 +40,7 @@ void supersededAttemptListenerDoesNotLeak() throws Exception { RetryingFuture retryingFuture = executor.createFuture(() -> "ok"); AgentSpan span = startSpan("gax", "publish"); - try (AgentScope scope = activateSpan(span)) { + try (ContextScope scope = activateSpan(span)) { // reserve the attempt slot with a placeholder that is never completed SettableApiFuture placeholder = SettableApiFuture.create(); retryingFuture.setAttemptFuture(placeholder); @@ -78,7 +78,7 @@ void singleAttemptSucceedsAndContextNotLeaked() throws Exception { } }); - try (AgentScope scope = activateSpan(parent)) { + try (ContextScope scope = activateSpan(parent)) { future.setAttemptFuture(executor.submit(future)); assertEquals("ok", future.get(5, TimeUnit.SECONDS)); } @@ -118,7 +118,7 @@ void retriedAttemptsSucceedAndContextNotLeaked() throws Exception { } }); - try (AgentScope scope = activateSpan(parent)) { + try (ContextScope scope = activateSpan(parent)) { future.setAttemptFuture(executor.submit(future)); assertEquals("ok", future.get(5, TimeUnit.SECONDS)); } @@ -156,7 +156,7 @@ void exhaustedRetriesContextNotLeaked() throws Exception { } }); - try (AgentScope scope = activateSpan(parent)) { + try (ContextScope scope = activateSpan(parent)) { future.setAttemptFuture(executor.submit(future)); assertThrows(ExecutionException.class, () -> future.get(5, TimeUnit.SECONDS)); } diff --git a/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/MessageReceiverWithAckResponseWrapper.java b/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/MessageReceiverWithAckResponseWrapper.java index aa6ba981dd4..724ae18d775 100644 --- a/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/MessageReceiverWithAckResponseWrapper.java +++ b/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/MessageReceiverWithAckResponseWrapper.java @@ -6,7 +6,7 @@ import com.google.cloud.pubsub.v1.AckReplyConsumerWithResponse; import com.google.cloud.pubsub.v1.MessageReceiverWithAckResponse; import com.google.pubsub.v1.PubsubMessage; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; public class MessageReceiverWithAckResponseWrapper implements MessageReceiverWithAckResponse { @@ -22,7 +22,7 @@ public MessageReceiverWithAckResponseWrapper( @Override public void receiveMessage(PubsubMessage message, AckReplyConsumerWithResponse consumer) { final AgentSpan span = CONSUMER_DECORATE.onConsume(message, subscription); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { this.delegate.receiveMessage(message, consumer); } finally { CONSUMER_DECORATE.beforeFinish(span); diff --git a/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/MessageReceiverWrapper.java b/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/MessageReceiverWrapper.java index fc87a410a08..9199d40141f 100644 --- a/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/MessageReceiverWrapper.java +++ b/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/MessageReceiverWrapper.java @@ -6,7 +6,7 @@ import com.google.cloud.pubsub.v1.AckReplyConsumer; import com.google.cloud.pubsub.v1.MessageReceiver; import com.google.pubsub.v1.PubsubMessage; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; public final class MessageReceiverWrapper implements MessageReceiver { @@ -21,7 +21,7 @@ public MessageReceiverWrapper(String subscription, MessageReceiver delegate) { @Override public void receiveMessage(PubsubMessage message, AckReplyConsumer consumer) { final AgentSpan span = CONSUMER_DECORATE.onConsume(message, subscription); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { this.delegate.receiveMessage(message, consumer); } finally { CONSUMER_DECORATE.beforeFinish(span); diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/InstrumentedDataFetcher.java b/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/InstrumentedDataFetcher.java index 3d74cb5f8a4..98bbc788e2c 100644 --- a/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/InstrumentedDataFetcher.java +++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/InstrumentedDataFetcher.java @@ -5,7 +5,7 @@ import static datadog.trace.instrumentation.graphqljava.GraphQLDecorator.DECORATE; import static datadog.trace.instrumentation.graphqljava.GraphQLDecorator.GRAPHQL_JAVA; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import graphql.execution.instrumentation.parameters.InstrumentationFieldFetchParameters; import graphql.schema.DataFetcher; @@ -31,7 +31,7 @@ public InstrumentedDataFetcher( @Override public Object get(DataFetchingEnvironment environment) throws Exception { if (parameters.isTrivialDataFetcher()) { - try (AgentScope scope = activateSpan(this.requestSpan)) { + try (ContextScope scope = activateSpan(this.requestSpan)) { return dataFetcher.get(environment); } } else { @@ -46,7 +46,7 @@ public Object get(DataFetchingEnvironment environment) throws Exception { GraphQLOutputType fieldType = environment.getFieldType(); fieldSpan.setTag("graphql.type", GraphQLTypeUtil.simplePrint(fieldType)); Object dataValue; - try (AgentScope scope = activateSpan(fieldSpan)) { + try (ContextScope scope = activateSpan(fieldSpan)) { dataValue = dataFetcher.get(environment); } catch (Exception e) { DECORATE.onError(fieldSpan, e); diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/AsyncHandlerAdapter.java b/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/AsyncHandlerAdapter.java index 6dc269a81c1..2a3c84139a0 100644 --- a/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/AsyncHandlerAdapter.java +++ b/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/AsyncHandlerAdapter.java @@ -8,7 +8,7 @@ import com.ning.http.client.HttpResponseHeaders; import com.ning.http.client.HttpResponseStatus; import com.ning.http.client.Response; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; public class AsyncHandlerAdapter implements AsyncHandler { @@ -30,7 +30,7 @@ public void onThrowable(Throwable throwable) { @Override public STATE onBodyPartReceived(HttpResponseBodyPart httpResponseBodyPart) throws Exception { - try (final AgentScope ignored = activateSpan(clientSpan)) { + try (final ContextScope ignored = activateSpan(clientSpan)) { return delegate.onBodyPartReceived(httpResponseBodyPart); } } @@ -38,7 +38,7 @@ public STATE onBodyPartReceived(HttpResponseBodyPart httpResponseBodyPart) throw @Override public STATE onStatusReceived(HttpResponseStatus httpResponseStatus) throws Exception { responseBuilder = responseBuilder.accumulate(httpResponseStatus); - try (final AgentScope ignored = activateSpan(clientSpan)) { + try (final ContextScope ignored = activateSpan(clientSpan)) { return delegate.onStatusReceived(httpResponseStatus); } } @@ -46,7 +46,7 @@ public STATE onStatusReceived(HttpResponseStatus httpResponseStatus) throws Exce @Override public STATE onHeadersReceived(HttpResponseHeaders httpResponseHeaders) throws Exception { responseBuilder = responseBuilder.accumulate(httpResponseHeaders); - try (final AgentScope ignored = activateSpan(clientSpan)) { + try (final ContextScope ignored = activateSpan(clientSpan)) { return delegate.onHeadersReceived(httpResponseHeaders); } } @@ -55,7 +55,7 @@ public STATE onHeadersReceived(HttpResponseHeaders httpResponseHeaders) throws E public T onCompleted() throws Exception { try { final T response; - try (AgentScope ignored = (parentSpan != null ? activateSpan(parentSpan) : null)) { + try (ContextScope ignored = (parentSpan != null ? activateSpan(parentSpan) : null)) { response = delegate.onCompleted(); } if (response instanceof Response) { diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/TracingServerInterceptor.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/TracingServerInterceptor.java index 4726080cbe2..7b45d3b1577 100644 --- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/TracingServerInterceptor.java +++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/TracingServerInterceptor.java @@ -12,6 +12,7 @@ import static datadog.trace.instrumentation.grpc.server.GrpcServerDecorator.GRPC_SERVER; import static datadog.trace.instrumentation.grpc.server.GrpcServerDecorator.SERVER_PATHWAY_EDGE_TAGS; +import datadog.context.ContextScope; import datadog.trace.api.Config; import datadog.trace.api.cache.DDCache; import datadog.trace.api.cache.DDCaches; @@ -22,7 +23,6 @@ import datadog.trace.api.gateway.IGSpanInfo; import datadog.trace.api.gateway.RequestContext; import datadog.trace.api.gateway.RequestContextSlot; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; @@ -92,7 +92,7 @@ public ServerCall.Listener interceptCall( DECORATE.onCall(span, call); final ServerCall.Listener result; - try (AgentScope scope = activateSpan(span)) { + try (ContextScope scope = activateSpan(span)) { // Wrap the server call so that we can decorate the span // with the resulting status final TracingServerCall tracingServerCall = new TracingServerCall<>(span, call); @@ -124,7 +124,7 @@ static final class TracingServerCall @Override public void close(final Status status, final Metadata trailers) { DECORATE.onClose(span, status); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { delegate().close(status, trailers); } catch (final Throwable e) { DECORATE.onError(span, e); @@ -154,7 +154,7 @@ public void onMessage(final ReqT message) { startSpan(COMPONENT_NAME.toString(), GRPC_MESSAGE, this.span.spanContext()) .setTag("message.type", message.getClass().getName()); DECORATE.afterStart(msgSpan); - try (AgentScope scope = activateSpan(msgSpan)) { + try (ContextScope scope = activateSpan(msgSpan)) { callIGCallbackGrpcMessage(msgSpan, message); delegate().onMessage(message); } catch (final Throwable e) { @@ -174,7 +174,7 @@ public void onMessage(final ReqT message) { @Override public void onHalfClose() { - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { delegate().onHalfClose(); } catch (final Throwable e) { if (span.phasedFinish()) { @@ -190,7 +190,7 @@ public void onHalfClose() { @Override public void onCancel() { // Finishes span. - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { delegate().onCancel(); span.setTag("canceled", true); } catch (CancellationException e) { @@ -211,7 +211,7 @@ public void onCancel() { @Override public void onComplete() { // Finishes span. - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { delegate().onComplete(); } catch (final Throwable e) { DECORATE.onError(span, e); @@ -231,7 +231,7 @@ public void onComplete() { @Override public void onReady() { - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { delegate().onReady(); } catch (final Throwable e) { if (span.phasedFinish()) { diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolExecution.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolExecution.java index ce572c0c698..a471986f41b 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolExecution.java +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolExecution.java @@ -3,7 +3,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.util.concurrent.ExecutorService; @@ -26,7 +26,7 @@ public void run() { return; } AgentSpan span = startSpan("test", String.valueOf(depth)); - try (AgentScope scope = activateSpan(span)) { + try (ContextScope scope = activateSpan(span)) { executor.execute(new RecursiveThreadPoolExecution(executor, maxDepth, depth + 1)); } finally { span.finish(); diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolMixedSubmissionAndExecution.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolMixedSubmissionAndExecution.java index ca882efd884..5887fd8a3a2 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolMixedSubmissionAndExecution.java +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolMixedSubmissionAndExecution.java @@ -3,7 +3,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.util.concurrent.ExecutorService; @@ -27,7 +27,7 @@ public void run() { return; } AgentSpan span = startSpan("test", String.valueOf(depth)); - try (AgentScope scope = activateSpan(span)) { + try (ContextScope scope = activateSpan(span)) { if (depth % 2 == 0) { executor.submit( new RecursiveThreadPoolMixedSubmissionAndExecution(executor, maxDepth, depth + 1)); diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolSubmission.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolSubmission.java index 331062a90ca..d5e4ba967a5 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolSubmission.java +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/executor/recursive/RecursiveThreadPoolSubmission.java @@ -3,7 +3,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.util.concurrent.ExecutorService; @@ -26,7 +26,7 @@ public void run() { return; } AgentSpan span = startSpan("test", String.valueOf(depth)); - try (AgentScope scope = activateSpan(span)) { + try (ContextScope scope = activateSpan(span)) { executor.submit(new RecursiveThreadPoolSubmission(executor, maxDepth, depth + 1)); } finally { span.finish(); diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/forkjoin/LinearTask.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/forkjoin/LinearTask.java index 35a3891bc87..5482fd97bde 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/forkjoin/LinearTask.java +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/forkjoin/LinearTask.java @@ -3,7 +3,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.util.concurrent.RecursiveTask; @@ -34,7 +34,7 @@ protected Integer compute() { } else { int next = parent + 1; AgentSpan span = startSpan("test", Integer.toString(next)); - try (AgentScope scope = activateSpan(span)) { + try (ContextScope scope = activateSpan(span)) { LinearTask child = new LinearTask(next, depth); return child.fork().join(); } finally { diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/runnable/Descendant.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/runnable/Descendant.java index 3cf7c6e93f2..9df56e98cff 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/runnable/Descendant.java +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/java/runnable/Descendant.java @@ -3,7 +3,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; public final class Descendant implements Runnable { @@ -17,7 +17,7 @@ public Descendant(String parent) { @Override public void run() { AgentSpan span = startSpan("test", parent + "-child"); - try (AgentScope scope = activateSpan(span)) { + try (ContextScope scope = activateSpan(span)) { } finally { span.finish(); diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/UrlInstrumentation.java b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/UrlInstrumentation.java index 990d3a4ae7c..0b349aff712 100644 --- a/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/UrlInstrumentation.java +++ b/dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/main/java/datadog/trace/instrumentation/java/net/UrlInstrumentation.java @@ -9,9 +9,9 @@ import static net.bytebuddy.matcher.ElementMatchers.isPublic; import com.google.auto.service.AutoService; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.net.URL; import java.net.URLStreamHandler; @@ -55,7 +55,7 @@ public static void errorSpan( final AgentSpan span = startSpan("UrlConnection", DECORATE.operationName(protocol)); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { DECORATE.afterStart(span); DECORATE.onURL(span, url); HTTP_RESOURCE_DECORATOR.withClientPath(span, null, url.getPath()); diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/BodyHandlerWrapper.java b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/BodyHandlerWrapper.java index 569160917e1..883332e891b 100644 --- a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/BodyHandlerWrapper.java +++ b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/BodyHandlerWrapper.java @@ -2,6 +2,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.captureSpan; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.net.http.HttpResponse.BodyHandler; @@ -56,21 +57,21 @@ public void onSubscribe(Flow.Subscription subscription) { @Override public void onNext(List item) { - try (AgentScope ignore = continuation.activate()) { + try (ContextScope ignore = continuation.activate()) { delegate.onNext(item); } } @Override public void onError(Throwable throwable) { - try (AgentScope ignore = continuation.activate()) { + try (ContextScope ignore = continuation.activate()) { delegate.onError(throwable); } } @Override public void onComplete() { - try (AgentScope ignore = continuation.activate()) { + try (ContextScope ignore = continuation.activate()) { delegate.onComplete(); } } diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/CompletableFutureWrapper.java b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/CompletableFutureWrapper.java index 68c304176cf..cc738f88884 100644 --- a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/CompletableFutureWrapper.java +++ b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/CompletableFutureWrapper.java @@ -1,5 +1,6 @@ package datadog.trace.instrumentation.httpclient; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import java.util.concurrent.CompletableFuture; @@ -12,7 +13,7 @@ public static CompletableFuture wrap( CompletableFuture result = new CompletableFuture<>(); future.whenComplete( (T value, Throwable throwable) -> { - try (AgentScope scope = continuation.activate()) { + try (ContextScope scope = continuation.activate()) { if (throwable != null) { result.completeExceptionally(throwable); } else { diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java index 76aacf64d5f..f0d397b89ed 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java @@ -8,6 +8,7 @@ import static datadog.trace.bootstrap.instrumentation.api.InstrumentationTags.INSTRUMENTATION_TIME_MS; import static datadog.trace.bootstrap.instrumentation.api.Tags.*; +import datadog.context.ContextScope; import datadog.trace.api.BaseHash; import datadog.trace.api.Config; import datadog.trace.api.DDTraceId; @@ -15,7 +16,6 @@ import datadog.trace.api.propagation.W3CTraceParent; import datadog.trace.api.telemetry.LogCollector; import datadog.trace.bootstrap.ContextStore; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import datadog.trace.bootstrap.instrumentation.api.InternalSpanTypes; @@ -343,7 +343,7 @@ public long setContextInfo(Connection connection, DBInfo dbInfo) { .start(); DECORATE.afterStart(instrumentationSpan); DECORATE.onConnection(instrumentationSpan, dbInfo); - try (AgentScope scope = activateSpan(instrumentationSpan)) { + try (ContextScope scope = activateSpan(instrumentationSpan)) { final byte samplingDecision = (byte) (instrumentationSpan.forceSamplingDecision() > 0 ? 1 : 0); final byte versionAndSamplingDecision = diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/CallbackWrapper.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/CallbackWrapper.java index 74e393a47c2..90aa89b4f3e 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/CallbackWrapper.java +++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/CallbackWrapper.java @@ -3,6 +3,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpan; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import org.eclipse.jetty.client.Request; @@ -24,7 +25,7 @@ public CallbackWrapper(AgentSpan parent, AgentSpan span, Object delegate) { @Override public void onBegin(Response response) { if (delegate instanceof Response.BeginListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { ((Response.BeginListener) delegate).onBegin(response); } } @@ -33,7 +34,7 @@ public void onBegin(Response response) { @Override public void onComplete(Result result) { if (delegate instanceof Response.CompleteListener) { - try (AgentScope scope = activate(parent)) { + try (ContextScope scope = activate(parent)) { ((Response.CompleteListener) delegate).onComplete(result); } } @@ -42,7 +43,7 @@ public void onComplete(Result result) { @Override public void onFailure(Response response, Throwable failure) { if (delegate instanceof Response.FailureListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { ((Response.FailureListener) delegate).onFailure(response, failure); } } @@ -51,7 +52,7 @@ public void onFailure(Response response, Throwable failure) { @Override public void onHeaders(Response response) { if (delegate instanceof Response.HeadersListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { ((Response.HeadersListener) delegate).onHeaders(response); } } @@ -60,7 +61,7 @@ public void onHeaders(Response response) { @Override public void onSuccess(Response response) { if (delegate instanceof Response.SuccessListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { ((Response.SuccessListener) delegate).onSuccess(response); } } @@ -69,7 +70,7 @@ public void onSuccess(Response response) { @Override public void onBegin(Request request) { if (delegate instanceof Request.BeginListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { ((Request.SuccessListener) delegate).onSuccess(request); } } @@ -78,7 +79,7 @@ public void onBegin(Request request) { @Override public void onCommit(Request request) { if (delegate instanceof Request.CommitListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { ((Request.CommitListener) delegate).onCommit(request); } } @@ -87,7 +88,7 @@ public void onCommit(Request request) { @Override public void onFailure(Request request, Throwable failure) { if (delegate instanceof Request.FailureListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { ((Request.FailureListener) delegate).onFailure(request, failure); } } @@ -96,7 +97,7 @@ public void onFailure(Request request, Throwable failure) { @Override public void onHeaders(Request request) { if (delegate instanceof Request.HeadersListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { ((Request.HeadersListener) delegate).onHeaders(request); } } @@ -105,7 +106,7 @@ public void onHeaders(Request request) { @Override public void onQueued(Request request) { if (delegate instanceof Request.QueuedListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { ((Request.QueuedListener) delegate).onQueued(request); } } @@ -114,7 +115,7 @@ public void onQueued(Request request) { @Override public void onSuccess(Request request) { if (delegate instanceof Request.SuccessListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { ((Request.SuccessListener) delegate).onSuccess(request); } } diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-common/src/main/java/datadog/trace/instrumentation/jetty_client/CallbackWrapper.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-common/src/main/java/datadog/trace/instrumentation/jetty_client/CallbackWrapper.java index a7e623eee19..8b8aa2972dc 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-common/src/main/java/datadog/trace/instrumentation/jetty_client/CallbackWrapper.java +++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-common/src/main/java/datadog/trace/instrumentation/jetty_client/CallbackWrapper.java @@ -2,6 +2,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.nio.ByteBuffer; @@ -25,7 +26,7 @@ public CallbackWrapper(AgentSpan parent, AgentSpan span, Object delegate) { @Override public void onBegin(Response response) { if (delegate instanceof Response.BeginListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { ((Response.BeginListener) delegate).onBegin(response); } } @@ -36,7 +37,7 @@ public void onComplete(Result result) { if (delegate instanceof Response.CompleteListener) { // this probably does the wrong thing, but preserves old behaviour and is consistent // with other http clients with completion callback registration - try (AgentScope scope = activate(parent)) { + try (ContextScope scope = activate(parent)) { ((Response.CompleteListener) delegate).onComplete(result); } } @@ -45,7 +46,7 @@ public void onComplete(Result result) { @Override public void onContent(Response response, ByteBuffer content) { if (delegate instanceof Response.ContentListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { ((Response.ContentListener) delegate).onContent(response, content); } } @@ -54,7 +55,7 @@ public void onContent(Response response, ByteBuffer content) { @Override public void onFailure(Response response, Throwable failure) { if (delegate instanceof Response.FailureListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { ((Response.FailureListener) delegate).onFailure(response, failure); } } @@ -63,7 +64,7 @@ public void onFailure(Response response, Throwable failure) { @Override public boolean onHeader(Response response, HttpField field) { if (delegate instanceof Response.HeaderListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { return ((Response.HeaderListener) delegate).onHeader(response, field); } } @@ -73,7 +74,7 @@ public boolean onHeader(Response response, HttpField field) { @Override public void onHeaders(Response response) { if (delegate instanceof Response.HeadersListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { ((Response.HeadersListener) delegate).onHeaders(response); } } @@ -82,7 +83,7 @@ public void onHeaders(Response response) { @Override public void onSuccess(Response response) { if (delegate instanceof Response.SuccessListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { ((Response.SuccessListener) delegate).onSuccess(response); } } @@ -91,7 +92,7 @@ public void onSuccess(Response response) { @Override public void onBegin(Request request) { if (delegate instanceof Request.BeginListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { ((Request.SuccessListener) delegate).onSuccess(request); } } @@ -100,7 +101,7 @@ public void onBegin(Request request) { @Override public void onCommit(Request request) { if (delegate instanceof Request.CommitListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { ((Request.CommitListener) delegate).onCommit(request); } } @@ -109,7 +110,7 @@ public void onCommit(Request request) { @Override public void onContent(Request request, ByteBuffer content) { if (delegate instanceof Request.ContentListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { ((Request.ContentListener) delegate).onContent(request, content); } } @@ -118,7 +119,7 @@ public void onContent(Request request, ByteBuffer content) { @Override public void onFailure(Request request, Throwable failure) { if (delegate instanceof Request.FailureListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { ((Request.FailureListener) delegate).onFailure(request, failure); } } @@ -127,7 +128,7 @@ public void onFailure(Request request, Throwable failure) { @Override public void onHeaders(Request request) { if (delegate instanceof Request.HeadersListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { ((Request.HeadersListener) delegate).onHeaders(request); } } @@ -136,7 +137,7 @@ public void onHeaders(Request request) { @Override public void onQueued(Request request) { if (delegate instanceof Request.QueuedListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { ((Request.QueuedListener) delegate).onQueued(request); } } @@ -145,7 +146,7 @@ public void onQueued(Request request) { @Override public void onSuccess(Request request) { if (delegate instanceof Request.SuccessListener) { - try (AgentScope scope = activate(span)) { + try (ContextScope scope = activate(span)) { ((Request.SuccessListener) delegate).onSuccess(request); } } diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/JettyRunnableWrapper.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/JettyRunnableWrapper.java index 3c14020cafe..6c9eeb3e048 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/JettyRunnableWrapper.java +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/main/java17/datadog/trace/instrumentation/jetty12/JettyRunnableWrapper.java @@ -5,6 +5,7 @@ import static datadog.trace.bootstrap.instrumentation.java.concurrent.ExcludeFilter.ExcludeType.RUNNABLE; import static datadog.trace.bootstrap.instrumentation.java.concurrent.ExcludeFilter.exclude; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope; public class JettyRunnableWrapper implements Runnable { @@ -19,7 +20,7 @@ public JettyRunnableWrapper(Runnable runnable, AgentScope.Continuation continuat @Override public void run() { - try (AgentScope scope = continuation.activate()) { + try (ContextScope scope = continuation.activate()) { runnable.run(); } } diff --git a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/DatadogMessageListener.java b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/DatadogMessageListener.java index c597552fb27..991d4823fc6 100644 --- a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/DatadogMessageListener.java +++ b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/DatadogMessageListener.java @@ -11,8 +11,8 @@ import static datadog.trace.instrumentation.jms.MessageExtractAdapter.GETTER; import static java.util.concurrent.TimeUnit.MILLISECONDS; +import datadog.context.ContextScope; import datadog.trace.bootstrap.ContextStore; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext; import datadog.trace.bootstrap.instrumentation.jms.MessageConsumerState; @@ -71,7 +71,7 @@ public void onMessage(Message message) { // span will be finished by Session.commit/rollback/close sessionState.finishOnCommit(span); } - try (AgentScope scope = activateSpan(span)) { + try (ContextScope scope = activateSpan(span)) { messageListener.onMessage(message); } catch (RuntimeException | Error thrown) { CONSUMER_DECORATE.onError(span, thrown); diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestFailedThenSucceed.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestFailedThenSucceed.java index 7c46ae4042e..94220ba0bd5 100644 --- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestFailedThenSucceed.java +++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.10/src/test/java/org/example/TestFailedThenSucceed.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import org.junit.After; @@ -17,7 +17,7 @@ public class TestFailedThenSucceed { public void setUp() { AgentTracer.TracerAPI agentTracer = AgentTracer.get(); AgentSpan span = agentTracer.buildSpan("junit-manual", "set-up").start(); - try (AgentScope scope = agentTracer.activateManualSpan(span)) { + try (ContextScope scope = agentTracer.activateManualSpan(span)) { // tracing setup to verify that it is executed for every retry } span.finish(); @@ -32,7 +32,7 @@ public void test_failed_then_succeed() { public void tearDown() { AgentTracer.TracerAPI agentTracer = AgentTracer.get(); AgentSpan span = agentTracer.buildSpan("junit-manual", "tear-down").start(); - try (AgentScope scope = agentTracer.activateManualSpan(span)) { + try (ContextScope scope = agentTracer.activateManualSpan(span)) { // tracing teardown to verify that it is executed for every retry } span.finish(); diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestFailedThenSucceed.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestFailedThenSucceed.java index 38ea775d7d8..cac99b64d40 100644 --- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestFailedThenSucceed.java +++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.3/src/test/java/org/example/TestFailedThenSucceed.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import org.junit.jupiter.api.AfterEach; @@ -17,7 +17,7 @@ public class TestFailedThenSucceed { public void setUp() { AgentTracer.TracerAPI agentTracer = AgentTracer.get(); AgentSpan span = agentTracer.buildSpan("junit-manual", "set-up").start(); - try (AgentScope scope = agentTracer.activateManualSpan(span)) { + try (ContextScope scope = agentTracer.activateManualSpan(span)) { // tracing setup to verify that it is executed for every retry } span.finish(); @@ -32,7 +32,7 @@ public void test_failed_then_succeed() { public void tearDown() { AgentTracer.TracerAPI agentTracer = AgentTracer.get(); AgentSpan span = agentTracer.buildSpan("junit-manual", "tear-down").start(); - try (AgentScope scope = agentTracer.activateManualSpan(span)) { + try (ContextScope scope = agentTracer.activateManualSpan(span)) { // tracing teardown to verify that it is executed for every retry } span.finish(); diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/BeforeAfterOperationsTracer.java b/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/BeforeAfterOperationsTracer.java index 19d56086a4b..b20b1a7d3f5 100644 --- a/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/BeforeAfterOperationsTracer.java +++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5.8/src/main/java/datadog/trace/instrumentation/junit5/BeforeAfterOperationsTracer.java @@ -1,6 +1,6 @@ package datadog.trace.instrumentation.junit5; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import datadog.trace.bootstrap.instrumentation.api.Tags; @@ -51,7 +51,7 @@ private static void traceInvocation( Invocation invocation, Method executable, String operationName) throws Throwable { AgentSpan agentSpan = AgentTracer.startSpan("junit", executable.getName()); agentSpan.setTag(Tags.TEST_CALLBACK, operationName); - try (AgentScope agentScope = AgentTracer.activateSpan(agentSpan)) { + try (ContextScope agentScope = AgentTracer.activateSpan(agentSpan)) { invocation.proceed(); } catch (Throwable t) { agentSpan.addThrowable(t); diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerCallback.java b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerCallback.java index d96d99916d1..c536e147e77 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerCallback.java +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerCallback.java @@ -5,8 +5,8 @@ import static datadog.trace.bootstrap.instrumentation.api.InstrumentationTags.PARTITION; import static datadog.trace.instrumentation.kafka_clients.KafkaDecorator.PRODUCER_DECORATE; +import datadog.context.ContextScope; import datadog.trace.api.datastreams.DataStreamsTags; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import javax.annotation.Nullable; @@ -41,7 +41,7 @@ public void onCompletion(final RecordMetadata metadata, final Exception exceptio span.finish(); if (callback != null) { if (parent != null) { - try (final AgentScope scope = activateSpan(parent)) { + try (final ContextScope scope = activateSpan(parent)) { callback.onCompletion(metadata, exception); } } else { diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/KafkaProducerCallback.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/KafkaProducerCallback.java index 898508dc541..dd7bb52989c 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/KafkaProducerCallback.java +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/KafkaProducerCallback.java @@ -5,8 +5,8 @@ import static datadog.trace.bootstrap.instrumentation.api.InstrumentationTags.PARTITION; import static datadog.trace.instrumentation.kafka_clients38.KafkaDecorator.PRODUCER_DECORATE; +import datadog.context.ContextScope; import datadog.trace.api.datastreams.DataStreamsTags; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import org.apache.kafka.clients.producer.Callback; @@ -40,7 +40,7 @@ public void onCompletion(final RecordMetadata metadata, final Exception exceptio span.finish(); if (callback != null) { if (parent != null) { - try (final AgentScope scope = activateSpan(parent)) { + try (final ContextScope scope = activateSpan(parent)) { callback.onCompletion(metadata, exception); } } else { diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/EncodeHttpResponseAdvice.java b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/EncodeHttpResponseAdvice.java index 84535d254b7..8cb199cb8e6 100644 --- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/EncodeHttpResponseAdvice.java +++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/EncodeHttpResponseAdvice.java @@ -4,7 +4,7 @@ import static datadog.trace.instrumentation.micronaut.v4_0.MicronautDecorator.DECORATE; import static datadog.trace.instrumentation.micronaut.v4_0.MicronautDecorator.SPAN_ATTRIBUTE; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import io.micronaut.http.HttpResponse; import io.micronaut.http.server.netty.NettyHttpRequest; @@ -21,7 +21,7 @@ public static void finishHandlerSpan( return; } - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { DECORATE.onResponse(span, message); DECORATE.beforeFinish(span); span.finish(); diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/EncodeHttpResponseAdvice2.java b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/EncodeHttpResponseAdvice2.java index 6d003a1781d..0b522672828 100644 --- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/EncodeHttpResponseAdvice2.java +++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/EncodeHttpResponseAdvice2.java @@ -4,7 +4,7 @@ import static datadog.trace.instrumentation.micronaut.v4_0.MicronautDecorator.DECORATE; import static datadog.trace.instrumentation.micronaut.v4_0.MicronautDecorator.SPAN_ATTRIBUTE; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import io.micronaut.http.HttpResponse; import io.micronaut.http.server.netty.NettyHttpRequest; @@ -20,7 +20,7 @@ public static void finishHandlerSpan( return; } - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { DECORATE.onResponse(span, message); DECORATE.beforeFinish(span); span.finish(); diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/EncodeHttpResponseAdvice3.java b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/EncodeHttpResponseAdvice3.java index a68dea11b96..cd9bfae612a 100644 --- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/EncodeHttpResponseAdvice3.java +++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-4.0/src/main/java17/datadog/trace/instrumentation/micronaut/v4_0/EncodeHttpResponseAdvice3.java @@ -4,7 +4,7 @@ import static datadog.trace.instrumentation.micronaut.v4_0.MicronautDecorator.DECORATE; import static datadog.trace.instrumentation.micronaut.v4_0.MicronautDecorator.SPAN_ATTRIBUTE; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import io.micronaut.http.HttpRequest; import io.micronaut.http.HttpResponse; @@ -20,7 +20,7 @@ public static void finishHandlerSpan( return; } - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { DECORATE.onResponse(span, message); DECORATE.beforeFinish(span); span.finish(); diff --git a/dd-java-agent/instrumentation/mongo/mongo-common/src/main/java/datadog/trace/instrumentation/mongo/MongoCommandListener.java b/dd-java-agent/instrumentation/mongo/mongo-common/src/main/java/datadog/trace/instrumentation/mongo/MongoCommandListener.java index d11c5b463c9..d37cdd69359 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-common/src/main/java/datadog/trace/instrumentation/mongo/MongoCommandListener.java +++ b/dd-java-agent/instrumentation/mongo/mongo-common/src/main/java/datadog/trace/instrumentation/mongo/MongoCommandListener.java @@ -12,11 +12,11 @@ import com.mongodb.event.CommandListener; import com.mongodb.event.CommandStartedEvent; import com.mongodb.event.CommandSucceededEvent; +import datadog.context.ContextScope; import datadog.trace.api.Config; import datadog.trace.api.cache.DDCache; import datadog.trace.api.cache.DDCaches; import datadog.trace.bootstrap.ContextStore; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.Tags; import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString; @@ -133,7 +133,7 @@ public void commandStarted(final CommandStartedEvent event) { shouldForceCloseSpanScope = false; } - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { decorator.afterStart(span); decorator.onConnection(span, event); // overlay Mongo application name if we have it (replaces the deprecated cluster description) diff --git a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientRequestTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientRequestTracingHandler.java index 7a5ae7d1dff..0ba5fee3b3a 100644 --- a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientRequestTracingHandler.java +++ b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientRequestTracingHandler.java @@ -10,6 +10,7 @@ import static datadog.trace.instrumentation.netty38.client.NettyHttpClientDecorator.NETTY_CLIENT_REQUEST; import static datadog.trace.instrumentation.netty38.client.NettyResponseInjectAdapter.SETTER; +import datadog.context.ContextScope; import datadog.trace.bootstrap.ContextStore; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; @@ -42,7 +43,7 @@ public void writeRequested(final ChannelHandlerContext ctx, final MessageEvent m final ChannelTraceContext channelTraceContext = contextStore.putIfAbsent(ctx.getChannel(), ChannelTraceContext.Factory.INSTANCE); - AgentScope parentScope = null; + ContextScope parentScope = null; final AgentScope.Continuation continuation = channelTraceContext.getConnectionContinuation(); if (continuation != null) { parentScope = continuation.activate(); @@ -56,7 +57,7 @@ public void writeRequested(final ChannelHandlerContext ctx, final MessageEvent m NettyHttpClientDecorator decorate = isSecure ? DECORATE_SECURE : DECORATE; final AgentSpan span = startSpan(NETTY_CLIENT.toString(), NETTY_CLIENT_REQUEST); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { decorate.afterStart(span); decorate.onRequest(span, request); diff --git a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientResponseTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientResponseTracingHandler.java index abda3d05acf..e25a261bb56 100644 --- a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientResponseTracingHandler.java +++ b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/client/HttpClientResponseTracingHandler.java @@ -4,8 +4,8 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpan; import static datadog.trace.instrumentation.netty38.client.NettyHttpClientDecorator.DECORATE; +import datadog.context.ContextScope; import datadog.trace.bootstrap.ContextStore; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.instrumentation.netty38.ChannelTraceContext; import org.jboss.netty.channel.Channel; @@ -40,7 +40,7 @@ public void messageReceived(final ChannelHandlerContext ctx, final MessageEvent final boolean finishSpan = msg.getMessage() instanceof HttpResponse; if (span != null && finishSpan) { - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { DECORATE.onResponse(span, (HttpResponse) msg.getMessage()); DECORATE.beforeFinish(span); span.finish(); @@ -48,7 +48,7 @@ public void messageReceived(final ChannelHandlerContext ctx, final MessageEvent } // We want the callback in the scope of the parent, not the client span - try (final AgentScope scope = activateSpan(parent)) { + try (final ContextScope scope = activateSpan(parent)) { ctx.sendUpstream(msg); } } @@ -68,7 +68,7 @@ public void exceptionCaught(ChannelHandlerContext ctx, ExceptionEvent e) throws if (span != null) { // If an exception is passed to this point, it likely means it was unhandled and the // client span won't be finished with a proper response, so we should finish the span here. - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { DECORATE.onError(span, e.getCause()); DECORATE.beforeFinish(span); span.finish(); @@ -76,7 +76,7 @@ public void exceptionCaught(ChannelHandlerContext ctx, ExceptionEvent e) throws } // We want the callback in the scope of the parent, not the client span - try (final AgentScope scope = activateSpan(parent)) { + try (final ContextScope scope = activateSpan(parent)) { super.exceptionCaught(ctx, e); } } diff --git a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerRequestTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerRequestTracingHandler.java index 70c990db900..6abae5803a6 100644 --- a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerRequestTracingHandler.java +++ b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerRequestTracingHandler.java @@ -4,8 +4,8 @@ import static datadog.trace.bootstrap.instrumentation.decorator.WebsocketDecorator.DECORATE; import static datadog.trace.bootstrap.instrumentation.websocket.HandlersExtractor.MESSAGE_TYPE_TEXT; +import datadog.context.ContextScope; import datadog.trace.bootstrap.ContextStore; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.websocket.HandlerContext; import datadog.trace.instrumentation.netty38.ChannelTraceContext; @@ -55,7 +55,7 @@ public void messageReceived(ChannelHandlerContext ctx, MessageEvent event) throw final AgentSpan span = DECORATE.onReceiveFrameStart( receiverContext, textFrame.getText(), textFrame.isFinalFragment()); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.sendUpstream(event); // WebSocket Read Text Start } finally { @@ -75,7 +75,7 @@ public void messageReceived(ChannelHandlerContext ctx, MessageEvent event) throw receiverContext, binaryFrame.getBinaryData().array(), binaryFrame.isFinalFragment()); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.sendUpstream(event); } finally { // WebSocket Read Binary End @@ -98,7 +98,7 @@ public void messageReceived(ChannelHandlerContext ctx, MessageEvent event) throw ? continuationWebSocketFrame.getText() : continuationWebSocketFrame.getBinaryData().array(), continuationWebSocketFrame.isFinalFragment()); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.sendUpstream(event); } finally { if (continuationWebSocketFrame.isFinalFragment()) { @@ -118,7 +118,7 @@ public void messageReceived(ChannelHandlerContext ctx, MessageEvent event) throw traceContext.setReceiverHandlerContext(null); final AgentSpan span = DECORATE.onSessionCloseReceived(receiverContext, reasonText, statusCode); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.sendUpstream(event); if (closeFrame.isFinalFragment()) { DECORATE.onFrameEnd(receiverContext); diff --git a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerResponseTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerResponseTracingHandler.java index 637d1a4abca..e05ef0bd455 100644 --- a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerResponseTracingHandler.java +++ b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/server/websocket/WebSocketServerResponseTracingHandler.java @@ -5,8 +5,8 @@ import static datadog.trace.bootstrap.instrumentation.websocket.HandlersExtractor.MESSAGE_TYPE_BINARY; import static datadog.trace.bootstrap.instrumentation.websocket.HandlersExtractor.MESSAGE_TYPE_TEXT; +import datadog.context.ContextScope; import datadog.trace.bootstrap.ContextStore; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.websocket.HandlerContext; import datadog.trace.instrumentation.netty38.ChannelTraceContext; @@ -46,7 +46,7 @@ public void writeRequested(ChannelHandlerContext ctx, MessageEvent event) throws final AgentSpan span = DECORATE.onSendFrameStart( handlerContext, MESSAGE_TYPE_TEXT, textFrame.getText().length()); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.sendDownstream(event); } finally { // WebSocket Write Text End @@ -65,7 +65,7 @@ public void writeRequested(ChannelHandlerContext ctx, MessageEvent event) throws handlerContext, MESSAGE_TYPE_BINARY, binaryFrame.getBinaryData().readableBytes()); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.sendDownstream(event); } finally { // WebSocket Write Binary End @@ -86,7 +86,7 @@ public void writeRequested(ChannelHandlerContext ctx, MessageEvent event) throws MESSAGE_TYPE_TEXT.equals(handlerContext.getMessageType()) ? continuationWebSocketFrame.getText().length() : continuationWebSocketFrame.getBinaryData().readableBytes()); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.sendDownstream(event); } finally { // WebSocket Write Binary End @@ -105,7 +105,7 @@ public void writeRequested(ChannelHandlerContext ctx, MessageEvent event) throws traceContext.setSenderHandlerContext(null); final AgentSpan span = DECORATE.onSessionCloseIssued(handlerContext, reasonText, statusCode); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.sendDownstream(event); } finally { if (closeFrame.isFinalFragment()) { diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientRequestTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientRequestTracingHandler.java index fc20990ffc8..3cef514fb35 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientRequestTracingHandler.java +++ b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientRequestTracingHandler.java @@ -15,6 +15,7 @@ import static datadog.trace.instrumentation.netty40.client.NettyResponseInjectAdapter.SETTER; import datadog.context.Context; +import datadog.context.ContextScope; import datadog.trace.api.Config; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; @@ -53,7 +54,7 @@ public void write(final ChannelHandlerContext ctx, final Object msg, final Chann return; } - AgentScope parentScope = null; + ContextScope parentScope = null; final AgentScope.Continuation continuation = ctx.channel().attr(CONNECT_PARENT_CONTINUATION_ATTRIBUTE_KEY).getAndRemove(); if (continuation != null) { @@ -80,7 +81,7 @@ public void write(final ChannelHandlerContext ctx, final Object msg, final Chann final AgentSpan span = startSpan(NETTY_CLIENT.toString(), NETTY_CLIENT_REQUEST); final Context context = getCurrentContext().with(span); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { decorate.afterStart(span); decorate.onRequest(span, request); diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientResponseTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientResponseTracingHandler.java index 75ec585739f..0983dec8529 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientResponseTracingHandler.java +++ b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/client/HttpClientResponseTracingHandler.java @@ -8,7 +8,7 @@ import static datadog.trace.instrumentation.netty40.client.NettyHttpClientDecorator.DECORATE; import datadog.context.Context; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; @@ -37,7 +37,7 @@ public void channelRead(final ChannelHandlerContext ctx, final Object msg) { final boolean finishSpan = msg instanceof HttpResponse; if (span != null && finishSpan) { - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { DECORATE.onResponse(span, (HttpResponse) msg); DECORATE.beforeFinish(span); span.finish(); @@ -45,7 +45,7 @@ public void channelRead(final ChannelHandlerContext ctx, final Object msg) { } // We want the callback in the scope of the parent, not the client span - try (final AgentScope scope = activateSpan(parent)) { + try (final ContextScope scope = activateSpan(parent)) { ctx.fireChannelRead(msg); } } @@ -66,14 +66,14 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws E if (span != null) { // If an exception is passed to this point, it likely means it was unhandled and the // client span won't be finished with a proper response, so we should finish the span here. - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { DECORATE.onError(span, cause); DECORATE.beforeFinish(span); span.finish(); } } // We want the callback in the scope of the parent, not the client span - try (final AgentScope scope = activateSpan(parent)) { + try (final ContextScope scope = activateSpan(parent)) { super.exceptionCaught(ctx, cause); } } @@ -92,13 +92,13 @@ public void channelInactive(ChannelHandlerContext ctx) throws Exception { } if (span != null && span != parent) { - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { DECORATE.beforeFinish(span); span.finish(); } } // We want the callback in the scope of the parent, not the client span - try (final AgentScope scope = activateSpan(parent)) { + try (final ContextScope scope = activateSpan(parent)) { super.channelInactive(ctx); } } diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/websocket/WebSocketServerRequestTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/websocket/WebSocketServerRequestTracingHandler.java index 6ec281b3ae9..5d6bbec1ee0 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/websocket/WebSocketServerRequestTracingHandler.java +++ b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/websocket/WebSocketServerRequestTracingHandler.java @@ -5,7 +5,7 @@ import static datadog.trace.bootstrap.instrumentation.websocket.HandlersExtractor.MESSAGE_TYPE_TEXT; import static datadog.trace.instrumentation.netty40.AttributeKeys.*; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.websocket.HandlerContext; import io.netty.channel.Channel; @@ -43,7 +43,7 @@ public void channelRead(ChannelHandlerContext ctx, Object frame) { final AgentSpan span = DECORATE.onReceiveFrameStart( receiverContext, textFrame.text(), textFrame.isFinalFragment()); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.fireChannelRead(textFrame); // WebSocket Read Text Start } finally { @@ -63,7 +63,7 @@ public void channelRead(ChannelHandlerContext ctx, Object frame) { receiverContext, binaryFrame.content().nioBuffer(), binaryFrame.isFinalFragment()); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.fireChannelRead(binaryFrame); } finally { // WebSocket Read Binary End @@ -86,7 +86,7 @@ public void channelRead(ChannelHandlerContext ctx, Object frame) { ? continuationWebSocketFrame.text() : continuationWebSocketFrame.content().nioBuffer(), continuationWebSocketFrame.isFinalFragment()); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.fireChannelRead(continuationWebSocketFrame); } finally { if (continuationWebSocketFrame.isFinalFragment()) { @@ -106,7 +106,7 @@ public void channelRead(ChannelHandlerContext ctx, Object frame) { channel.attr(WEBSOCKET_RECEIVER_HANDLER_CONTEXT).remove(); final AgentSpan span = DECORATE.onSessionCloseReceived(receiverContext, reasonText, statusCode); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.fireChannelRead(closeFrame); if (closeFrame.isFinalFragment()) { DECORATE.onFrameEnd(receiverContext); diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/websocket/WebSocketServerResponseTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/websocket/WebSocketServerResponseTracingHandler.java index bdea83f8bc2..bb6cd290ee8 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/websocket/WebSocketServerResponseTracingHandler.java +++ b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/websocket/WebSocketServerResponseTracingHandler.java @@ -6,7 +6,7 @@ import static datadog.trace.bootstrap.instrumentation.websocket.HandlersExtractor.MESSAGE_TYPE_TEXT; import static datadog.trace.instrumentation.netty40.AttributeKeys.WEBSOCKET_SENDER_HANDLER_CONTEXT; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.websocket.HandlerContext; import io.netty.channel.*; @@ -32,7 +32,7 @@ public void write(ChannelHandlerContext ctx, Object frame, ChannelPromise promis final AgentSpan span = DECORATE.onSendFrameStart( handlerContext, MESSAGE_TYPE_TEXT, textFrame.text().length()); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.write(frame, promise); } finally { // WebSocket Write Text End @@ -49,7 +49,7 @@ public void write(ChannelHandlerContext ctx, Object frame, ChannelPromise promis final AgentSpan span = DECORATE.onSendFrameStart( handlerContext, MESSAGE_TYPE_BINARY, binaryFrame.content().readableBytes()); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.write(frame, promise); } finally { // WebSocket Write Binary End @@ -70,7 +70,7 @@ public void write(ChannelHandlerContext ctx, Object frame, ChannelPromise promis MESSAGE_TYPE_TEXT.equals(handlerContext.getMessageType()) ? continuationWebSocketFrame.text().length() : continuationWebSocketFrame.content().readableBytes()); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.write(frame, promise); } finally { // WebSocket Write Binary End @@ -89,7 +89,7 @@ public void write(ChannelHandlerContext ctx, Object frame, ChannelPromise promis channel.attr(WEBSOCKET_SENDER_HANDLER_CONTEXT).remove(); final AgentSpan span = DECORATE.onSessionCloseIssued(handlerContext, reasonText, statusCode); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.write(frame, promise); } finally { if (closeFrame.isFinalFragment()) { diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientRequestTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientRequestTracingHandler.java index 70d82ba6836..33031aa4c73 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientRequestTracingHandler.java +++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientRequestTracingHandler.java @@ -15,6 +15,7 @@ import static datadog.trace.instrumentation.netty41.client.NettyResponseInjectAdapter.SETTER; import datadog.context.Context; +import datadog.context.ContextScope; import datadog.trace.api.Config; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; @@ -54,7 +55,7 @@ public void write(final ChannelHandlerContext ctx, final Object msg, final Chann return; } - AgentScope parentScope = null; + ContextScope parentScope = null; final AgentScope.Continuation continuation = takeConnectParentContinuation(ctx); if (continuation != null) { parentScope = continuation.activate(); @@ -81,7 +82,7 @@ public void write(final ChannelHandlerContext ctx, final Object msg, final Chann final AgentSpan span = startSpan(NETTY_CLIENT.toString(), NETTY_CLIENT_REQUEST); final Context context = getCurrentContext().with(span); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { decorate.afterStart(span); decorate.onRequest(span, request); diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientResponseTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientResponseTracingHandler.java index a1973706338..871745c00d7 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientResponseTracingHandler.java +++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientResponseTracingHandler.java @@ -8,7 +8,7 @@ import static datadog.trace.instrumentation.netty41.client.NettyHttpClientDecorator.DECORATE; import datadog.context.Context; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; @@ -43,7 +43,7 @@ public void channelRead(final ChannelHandlerContext ctx, final Object msg) { || "websocket" .equals(((HttpResponse) msg).headers().get(HttpHeaderNames.UPGRADE))); if (finishSpan) { - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { DECORATE.onResponse(span, (HttpResponse) msg); DECORATE.beforeFinish(span); span.finish(); @@ -56,7 +56,7 @@ public void channelRead(final ChannelHandlerContext ctx, final Object msg) { } // We want the callback in the scope of the parent, not the client span - try (final AgentScope scope = activateSpan(parent)) { + try (final ContextScope scope = activateSpan(parent)) { ctx.fireChannelRead(msg); } } @@ -77,14 +77,14 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws E if (span != null) { // If an exception is passed to this point, it likely means it was unhandled and the // client span won't be finished with a proper response, so we should finish the span here. - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { DECORATE.onError(span, cause); DECORATE.beforeFinish(span); span.finish(); } } // We want the callback in the scope of the parent, not the client span - try (final AgentScope scope = activateSpan(parent)) { + try (final ContextScope scope = activateSpan(parent)) { super.exceptionCaught(ctx, cause); } } @@ -103,13 +103,13 @@ public void channelInactive(ChannelHandlerContext ctx) throws Exception { } if (span != null && span != parent) { - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { DECORATE.beforeFinish(span); span.finish(); } } // We want the callback in the scope of the parent, not the client span - try (final AgentScope scope = activateSpan(parent)) { + try (final ContextScope scope = activateSpan(parent)) { super.channelInactive(ctx); } } diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/websocket/WebSocketServerInboundTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/websocket/WebSocketServerInboundTracingHandler.java index 882a826e15e..24aab8b5500 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/websocket/WebSocketServerInboundTracingHandler.java +++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/websocket/WebSocketServerInboundTracingHandler.java @@ -6,7 +6,7 @@ import static datadog.trace.instrumentation.netty41.AttributeKeys.WEBSOCKET_RECEIVER_HANDLER_CONTEXT; import static datadog.trace.instrumentation.netty41.AttributeKeys.WEBSOCKET_SENDER_HANDLER_CONTEXT; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.websocket.HandlerContext; import io.netty.channel.*; @@ -44,7 +44,7 @@ public void channelRead(ChannelHandlerContext ctx, Object frame) { final AgentSpan span = DECORATE.onReceiveFrameStart( receiverContext, textFrame.text(), textFrame.isFinalFragment()); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.fireChannelRead(textFrame); // WebSocket Read Text Start } finally { @@ -64,7 +64,7 @@ public void channelRead(ChannelHandlerContext ctx, Object frame) { receiverContext, binaryFrame.content().nioBuffer(), binaryFrame.isFinalFragment()); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.fireChannelRead(binaryFrame); } finally { // WebSocket Read Binary End @@ -87,7 +87,7 @@ public void channelRead(ChannelHandlerContext ctx, Object frame) { ? continuationWebSocketFrame.text() : continuationWebSocketFrame.content().nioBuffer(), continuationWebSocketFrame.isFinalFragment()); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.fireChannelRead(continuationWebSocketFrame); } finally { if (continuationWebSocketFrame.isFinalFragment()) { @@ -107,7 +107,7 @@ public void channelRead(ChannelHandlerContext ctx, Object frame) { channel.attr(WEBSOCKET_RECEIVER_HANDLER_CONTEXT).remove(); final AgentSpan span = DECORATE.onSessionCloseReceived(receiverContext, reasonText, statusCode); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.fireChannelRead(closeFrame); if (closeFrame.isFinalFragment()) { DECORATE.onFrameEnd(receiverContext); diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/websocket/WebSocketServerOutboundTracingHandler.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/websocket/WebSocketServerOutboundTracingHandler.java index e500c2357f5..3f1b7a69674 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/websocket/WebSocketServerOutboundTracingHandler.java +++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/websocket/WebSocketServerOutboundTracingHandler.java @@ -6,7 +6,7 @@ import static datadog.trace.bootstrap.instrumentation.websocket.HandlersExtractor.MESSAGE_TYPE_TEXT; import static datadog.trace.instrumentation.netty41.AttributeKeys.WEBSOCKET_SENDER_HANDLER_CONTEXT; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.websocket.HandlerContext; import io.netty.channel.*; @@ -36,7 +36,7 @@ public void write(ChannelHandlerContext ctx, Object frame, ChannelPromise promis final AgentSpan span = DECORATE.onSendFrameStart( handlerContext, MESSAGE_TYPE_TEXT, textFrame.text().length()); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.write(frame, promise); } finally { // WebSocket Write Text End @@ -53,7 +53,7 @@ public void write(ChannelHandlerContext ctx, Object frame, ChannelPromise promis final AgentSpan span = DECORATE.onSendFrameStart( handlerContext, MESSAGE_TYPE_BINARY, binaryFrame.content().readableBytes()); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.write(frame, promise); } finally { // WebSocket Write Binary End @@ -74,7 +74,7 @@ public void write(ChannelHandlerContext ctx, Object frame, ChannelPromise promis MESSAGE_TYPE_TEXT.equals(handlerContext.getMessageType()) ? continuationWebSocketFrame.text().length() : continuationWebSocketFrame.content().readableBytes()); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.write(frame, promise); } finally { // WebSocket Write Binary End @@ -93,7 +93,7 @@ public void write(ChannelHandlerContext ctx, Object frame, ChannelPromise promis channel.attr(WEBSOCKET_SENDER_HANDLER_CONTEXT).remove(); final AgentSpan span = DECORATE.onSessionCloseIssued(handlerContext, reasonText, statusCode); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { ctx.write(frame, promise); } finally { if (closeFrame.isFinalFragment()) { diff --git a/dd-java-agent/instrumentation/netty/netty-promise-4.0/src/main/java/datadog/trace/instrumentation/netty4/promise/ListenerWrapper.java b/dd-java-agent/instrumentation/netty/netty-promise-4.0/src/main/java/datadog/trace/instrumentation/netty4/promise/ListenerWrapper.java index f0cffb08460..3c41a5e1140 100644 --- a/dd-java-agent/instrumentation/netty/netty-promise-4.0/src/main/java/datadog/trace/instrumentation/netty4/promise/ListenerWrapper.java +++ b/dd-java-agent/instrumentation/netty/netty-promise-4.0/src/main/java/datadog/trace/instrumentation/netty4/promise/ListenerWrapper.java @@ -4,6 +4,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.captureActiveSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopContinuation; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import io.netty.util.concurrent.Future; import io.netty.util.concurrent.GenericFutureListener; @@ -40,7 +41,7 @@ public GenericWrapper( @Override public void operationComplete(T future) throws Exception { - try (AgentScope scope = continuation.activate()) { + try (ContextScope scope = continuation.activate()) { listener.operationComplete(future); } } @@ -60,7 +61,7 @@ public GenericProgressiveWrapper( @Override public void operationProgressed(S future, long progress, long total) throws Exception { // not yet complete, not ready to do final activation of continuation - try (AgentScope scope = activateSpan(continuation.span())) { + try (ContextScope scope = activateSpan(continuation.span())) { listener.operationProgressed(future, progress, total); } } diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/TracingInterceptor.java b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/TracingInterceptor.java index 4a2fbb473fd..46469204281 100644 --- a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/TracingInterceptor.java +++ b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/TracingInterceptor.java @@ -10,7 +10,7 @@ import com.squareup.okhttp.Interceptor; import com.squareup.okhttp.Request; import com.squareup.okhttp.Response; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.io.IOException; @@ -19,7 +19,7 @@ public class TracingInterceptor implements Interceptor { public Response intercept(final Chain chain) throws IOException { final AgentSpan span = startSpan("okhttp", OKHTTP_REQUEST); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { DECORATE.afterStart(span); DECORATE.onRequest(span, chain.request()); diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/TracingInterceptor.java b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/TracingInterceptor.java index ee8e04362b5..0246a81f531 100644 --- a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/TracingInterceptor.java +++ b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/TracingInterceptor.java @@ -7,7 +7,7 @@ import static datadog.trace.instrumentation.okhttp3.OkHttpClientDecorator.OKHTTP_REQUEST; import static datadog.trace.instrumentation.okhttp3.RequestBuilderInjectAdapter.SETTER; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.io.IOException; import okhttp3.Interceptor; @@ -23,7 +23,7 @@ public Response intercept(final Chain chain) throws IOException { final AgentSpan span = startSpan("okhttp", OKHTTP_REQUEST); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { DECORATE.afterStart(span); DECORATE.onRequest(span, chain.request()); diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/test/java/datadog/trace/instrumentation/openai_java/SessionIdPropagationForkedTest.java b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/test/java/datadog/trace/instrumentation/openai_java/SessionIdPropagationForkedTest.java index 19695ee9ea7..5914d280e80 100644 --- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/test/java/datadog/trace/instrumentation/openai_java/SessionIdPropagationForkedTest.java +++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/test/java/datadog/trace/instrumentation/openai_java/SessionIdPropagationForkedTest.java @@ -13,7 +13,6 @@ import datadog.context.ContextScope; import datadog.trace.agent.test.AbstractInstrumentationTest; import datadog.trace.api.llmobs.LLMObsContext; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import datadog.trace.core.DDSpan; @@ -77,7 +76,7 @@ void openAiRequestSpanInheritsSessionIdFromActiveContext() throws Exception { String expectedSessionId = "session-propagation-test-abc"; AgentSpan parentSpan = AgentTracer.startSpan("test", "parent"); - try (AgentScope ignored1 = AgentTracer.activateSpan(parentSpan)) { + try (ContextScope ignored1 = AgentTracer.activateSpan(parentSpan)) { try (ContextScope ignored2 = LLMObsContext.attach(parentSpan.spanContext(), expectedSessionId)) { try { diff --git a/dd-java-agent/instrumentation/play-ws/play-ws-1.0/src/main/java/datadog/trace/instrumentation/playws1/AsyncHandlerWrapper.java b/dd-java-agent/instrumentation/play-ws/play-ws-1.0/src/main/java/datadog/trace/instrumentation/playws1/AsyncHandlerWrapper.java index 27502d6d1e4..64f01569dec 100644 --- a/dd-java-agent/instrumentation/play-ws/play-ws-1.0/src/main/java/datadog/trace/instrumentation/playws1/AsyncHandlerWrapper.java +++ b/dd-java-agent/instrumentation/play-ws/play-ws-1.0/src/main/java/datadog/trace/instrumentation/playws1/AsyncHandlerWrapper.java @@ -3,6 +3,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.captureSpan; import static datadog.trace.instrumentation.playws.PlayWSClientDecorator.DECORATE; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import play.shaded.ahc.org.asynchttpclient.AsyncHandler; @@ -53,7 +54,7 @@ public Object onCompleted() throws Exception { span.finish(); if (continuation != null) { - try (final AgentScope scope = continuation.activate()) { + try (final ContextScope scope = continuation.activate()) { return delegate.onCompleted(); } } else { @@ -68,7 +69,7 @@ public void onThrowable(final Throwable throwable) { span.finish(); if (continuation != null) { - try (final AgentScope scope = continuation.activate()) { + try (final ContextScope scope = continuation.activate()) { delegate.onThrowable(throwable); } } else { diff --git a/dd-java-agent/instrumentation/play-ws/play-ws-2.0/src/main/java/datadog/trace/instrumentation/playws2/AsyncHandlerWrapper.java b/dd-java-agent/instrumentation/play-ws/play-ws-2.0/src/main/java/datadog/trace/instrumentation/playws2/AsyncHandlerWrapper.java index 3572424749e..82e80328724 100644 --- a/dd-java-agent/instrumentation/play-ws/play-ws-2.0/src/main/java/datadog/trace/instrumentation/playws2/AsyncHandlerWrapper.java +++ b/dd-java-agent/instrumentation/play-ws/play-ws-2.0/src/main/java/datadog/trace/instrumentation/playws2/AsyncHandlerWrapper.java @@ -3,6 +3,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.captureSpan; import static datadog.trace.instrumentation.playws.PlayWSClientDecorator.DECORATE; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.net.InetSocketAddress; @@ -57,7 +58,7 @@ public Object onCompleted() throws Exception { span.finish(); if (continuation != null) { - try (final AgentScope scope = continuation.activate()) { + try (final ContextScope scope = continuation.activate()) { return delegate.onCompleted(); } } else { @@ -72,7 +73,7 @@ public void onThrowable(final Throwable throwable) { span.finish(); if (continuation != null) { - try (final AgentScope scope = continuation.activate()) { + try (final ContextScope scope = continuation.activate()) { delegate.onThrowable(throwable); } } else { diff --git a/dd-java-agent/instrumentation/play-ws/play-ws-2.1/src/main/java/datadog/trace/instrumentation/playws21/AsyncHandlerWrapper.java b/dd-java-agent/instrumentation/play-ws/play-ws-2.1/src/main/java/datadog/trace/instrumentation/playws21/AsyncHandlerWrapper.java index b442f327c0b..2f864174bda 100644 --- a/dd-java-agent/instrumentation/play-ws/play-ws-2.1/src/main/java/datadog/trace/instrumentation/playws21/AsyncHandlerWrapper.java +++ b/dd-java-agent/instrumentation/play-ws/play-ws-2.1/src/main/java/datadog/trace/instrumentation/playws21/AsyncHandlerWrapper.java @@ -3,6 +3,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.captureSpan; import static datadog.trace.instrumentation.playws.PlayWSClientDecorator.DECORATE; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.net.InetSocketAddress; @@ -58,7 +59,7 @@ public Object onCompleted() throws Exception { span.finish(); if (continuation != null) { - try (final AgentScope scope = continuation.activate()) { + try (final ContextScope scope = continuation.activate()) { return delegate.onCompleted(); } } else { @@ -73,7 +74,7 @@ public void onThrowable(final Throwable throwable) { span.finish(); if (continuation != null) { - try (final AgentScope scope = continuation.activate()) { + try (final ContextScope scope = continuation.activate()) { delegate.onThrowable(throwable); } } else { diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ActionWrapper.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ActionWrapper.java index 23ab189156f..b0ce89cc2cd 100644 --- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ActionWrapper.java +++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/ActionWrapper.java @@ -2,7 +2,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -22,7 +22,7 @@ private ActionWrapper(final Action delegate, final AgentSpan span) { @Override public void execute(final T t) throws Exception { - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { delegate.execute(t); } } diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/BlockWrapper.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/BlockWrapper.java index 2dc9eb10690..7fe94d5a86e 100644 --- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/BlockWrapper.java +++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/BlockWrapper.java @@ -2,7 +2,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -23,7 +23,7 @@ private BlockWrapper(final Block delegate, final AgentSpan span) { @Override public void execute() throws Exception { - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { delegate.execute(); } } diff --git a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/TracingHandler.java b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/TracingHandler.java index 022af818747..7c5ad8b19b2 100644 --- a/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/TracingHandler.java +++ b/dd-java-agent/instrumentation/ratpack-1.5/src/main/java/datadog/trace/instrumentation/ratpack/TracingHandler.java @@ -8,8 +8,8 @@ import static datadog.trace.instrumentation.ratpack.RatpackServerDecorator.DECORATE; import com.google.common.reflect.TypeToken; +import datadog.context.ContextScope; import datadog.trace.api.gateway.Flow; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import io.netty.util.Attribute; import io.netty.util.AttributeKey; @@ -45,12 +45,12 @@ public void handle(final Context ctx) { boolean setFinalizer = false; - try (final AgentScope scope = activateSpan(ratpackSpan)) { + try (final ContextScope scope = activateSpan(ratpackSpan)) { ctx.getResponse() .beforeSend( response -> { - try (final AgentScope ignored = activateSpan(ratpackSpan)) { + try (final ContextScope ignored = activateSpan(ratpackSpan)) { if (nettySpan != null) { // Rename the netty span resource name with the ratpack route. DECORATE.onContext(nettySpan, ctx); diff --git a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/WrapperWithContext.java b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/WrapperWithContext.java index a791f605bbb..6d4553508d1 100644 --- a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/WrapperWithContext.java +++ b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/WrapperWithContext.java @@ -1,5 +1,6 @@ package datadog.trace.instrumentation.resilience4j; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; @@ -32,7 +33,7 @@ public CheckedConsumerWithContext( @Override public void accept(I arg) throws Throwable { - try (AgentScope ignore = activateScope()) { + try (ContextScope ignore = activateScope()) { delegate.accept(arg); } finally { finishSpanIfNeeded(); @@ -52,7 +53,7 @@ public ConsumerWithContext( @Override public void accept(I arg) { - try (AgentScope ignore = activateScope()) { + try (ContextScope ignore = activateScope()) { delegate.accept(arg); } finally { finishSpanIfNeeded(); @@ -72,7 +73,7 @@ public CheckedFunctionWithContext( @Override public O apply(I arg) throws Throwable { - try (AgentScope ignore = activateScope()) { + try (ContextScope ignore = activateScope()) { return delegate.apply(arg); } finally { finishSpanIfNeeded(); @@ -92,7 +93,7 @@ public SupplierWithContext( @Override public O get() { - try (AgentScope ignore = activateScope()) { + try (ContextScope ignore = activateScope()) { return delegate.get(); } finally { finishSpanIfNeeded(); @@ -112,7 +113,7 @@ public CallableWithContext( @Override public O call() throws Exception { - try (AgentScope ignore = activateScope()) { + try (ContextScope ignore = activateScope()) { return delegate.call(); } finally { finishSpanIfNeeded(); @@ -132,7 +133,7 @@ public FunctionWithContext( @Override public O apply(I arg) { - try (AgentScope ignore = activateScope()) { + try (ContextScope ignore = activateScope()) { return delegate.apply(arg); } finally { finishSpanIfNeeded(); @@ -152,7 +153,7 @@ public CheckedSupplierWithContext( @Override public O get() throws Throwable { - try (AgentScope ignore = activateScope()) { + try (ContextScope ignore = activateScope()) { return delegate.get(); } finally { finishSpanIfNeeded(); @@ -172,7 +173,7 @@ public CheckedRunnableWithContext( @Override public void run() throws Throwable { - try (AgentScope ignore = activateScope()) { + try (ContextScope ignore = activateScope()) { delegate.run(); } finally { finishSpanIfNeeded(); @@ -192,7 +193,7 @@ public RunnableWithContext( @Override public void run() { - try (AgentScope ignore = activateScope()) { + try (ContextScope ignore = activateScope()) { delegate.run(); } finally { finishSpanIfNeeded(); @@ -212,7 +213,7 @@ public SupplierOfCompletionStageWithContext( @Override public CompletionStage get() { - try (AgentScope ignore = activateScope()) { + try (ContextScope ignore = activateScope()) { return delegate .get() .whenComplete( @@ -235,7 +236,7 @@ public SupplierOfFutureWithContext( @Override public Future get() { - try (AgentScope ignore = activateScope()) { + try (ContextScope ignore = activateScope()) { Future future = delegate.get(); if (future instanceof CompletableFuture) { ((CompletableFuture) future) diff --git a/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/ReactorHelper.java b/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/ReactorHelper.java index 97dc83e0859..84b8c878b5e 100644 --- a/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/ReactorHelper.java +++ b/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/src/main/java/datadog/trace/instrumentation/resilience4j/ReactorHelper.java @@ -2,7 +2,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.util.function.BiConsumer; import java.util.function.Consumer; @@ -31,7 +31,7 @@ public static Function, Publisher> wrapFunction( spanDecorator.afterStart(current); } spanDecorator.decorate(current, null); - try (AgentScope scope = activateSpan(current)) { + try (ContextScope scope = activateSpan(current)) { Publisher ret = operator.apply(value); attachContext.accept(ret, current); if (owned == null) { diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/src/main/java/datadog/trace/instrumentation/jaxrs/ClientTracingFilter.java b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/src/main/java/datadog/trace/instrumentation/jaxrs/ClientTracingFilter.java index 639891cace2..45e6c04a3a0 100644 --- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/src/main/java/datadog/trace/instrumentation/jaxrs/ClientTracingFilter.java +++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-2.0/src/main/java/datadog/trace/instrumentation/jaxrs/ClientTracingFilter.java @@ -8,7 +8,7 @@ import static datadog.trace.instrumentation.jaxrs.JaxRsClientDecorator.JAX_RS_CLIENT; import static datadog.trace.instrumentation.jaxrs.JaxRsClientDecorator.JAX_RS_CLIENT_CALL; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import javax.annotation.Priority; import javax.ws.rs.Priorities; @@ -24,7 +24,7 @@ public class ClientTracingFilter implements ClientRequestFilter, ClientResponseF @Override public void filter(final ClientRequestContext requestContext) { final AgentSpan span = startSpan(JAX_RS_CLIENT.toString(), JAX_RS_CLIENT_CALL); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { DECORATE.afterStart(span); DECORATE.onRequest(span, requestContext); DECORATE.injectContext(current().with(span), requestContext.getHeaders(), SETTER); diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-1.0/src/main/java/datadog/trace/instrumentation/rxjava/TracedOnSubscribe.java b/dd-java-agent/instrumentation/rxjava/rxjava-1.0/src/main/java/datadog/trace/instrumentation/rxjava/TracedOnSubscribe.java index dadbb510029..f88a82fa3d6 100644 --- a/dd-java-agent/instrumentation/rxjava/rxjava-1.0/src/main/java/datadog/trace/instrumentation/rxjava/TracedOnSubscribe.java +++ b/dd-java-agent/instrumentation/rxjava/rxjava-1.0/src/main/java/datadog/trace/instrumentation/rxjava/TracedOnSubscribe.java @@ -4,7 +4,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.decorator.BaseDecorator; import rx.DDTracingUtil; @@ -39,7 +39,7 @@ public void call(final Subscriber subscriber) { instrumentationName(), operationName, parent != null ? parent.spanContext() : null); afterStart(span); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { delegate.call(new TracedSubscriber(span, subscriber, decorator)); } } diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-1.0/src/main/java/datadog/trace/instrumentation/rxjava/TracedSubscriber.java b/dd-java-agent/instrumentation/rxjava/rxjava-1.0/src/main/java/datadog/trace/instrumentation/rxjava/TracedSubscriber.java index c9eccecbc85..9eeb30270f4 100644 --- a/dd-java-agent/instrumentation/rxjava/rxjava-1.0/src/main/java/datadog/trace/instrumentation/rxjava/TracedSubscriber.java +++ b/dd-java-agent/instrumentation/rxjava/rxjava-1.0/src/main/java/datadog/trace/instrumentation/rxjava/TracedSubscriber.java @@ -2,7 +2,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.decorator.BaseDecorator; import java.util.concurrent.atomic.AtomicReference; @@ -28,7 +28,7 @@ public TracedSubscriber( public void onStart() { final AgentSpan span = spanRef.get(); if (span != null) { - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { delegate.onStart(); } } else { @@ -40,7 +40,7 @@ public void onStart() { public void onNext(final T value) { final AgentSpan span = spanRef.get(); if (span != null) { - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { delegate.onNext(value); } catch (final Throwable e) { onError(e); @@ -55,7 +55,7 @@ public void onCompleted() { final AgentSpan span = spanRef.getAndSet(null); if (span != null) { boolean errored = false; - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { delegate.onCompleted(); } catch (final Throwable e) { // Repopulate the spanRef for onError @@ -78,7 +78,7 @@ public void onCompleted() { public void onError(final Throwable e) { final AgentSpan span = spanRef.getAndSet(null); if (span != null) { - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { decorator.onError(span, e); delegate.onError(e); } catch (final Throwable e2) { diff --git a/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/test/java/LinearTask.java b/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/test/java/LinearTask.java index c62b49217fe..0bfd9877d15 100644 --- a/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/test/java/LinearTask.java +++ b/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/test/java/LinearTask.java @@ -1,7 +1,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import scala.concurrent.forkjoin.RecursiveTask; @@ -32,7 +32,7 @@ protected Integer compute() { } else { int next = parent + 1; AgentSpan span = startSpan("test", Integer.toString(next)); - try (AgentScope scope = activateSpan(span)) { + try (ContextScope scope = activateSpan(span)) { LinearTask child = new LinearTask(next, depth); return child.fork().join(); } finally { diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpannedMethodInvocation.java b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpannedMethodInvocation.java index 7e5fbea27c7..c9b210c5185 100644 --- a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpannedMethodInvocation.java +++ b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpannedMethodInvocation.java @@ -5,6 +5,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.instrumentation.springscheduling.SpringSchedulingDecorator.DECORATE; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.lang.reflect.AccessibleObject; @@ -42,14 +43,14 @@ public Object proceed() throws Throwable { } private Object invokeWithContinuation(CharSequence spanName) throws Throwable { - try (AgentScope scope = continuation.activate()) { + try (ContextScope scope = continuation.activate()) { return invokeWithSpan(spanName); } } private Object invokeWithSpan(CharSequence spanName) throws Throwable { AgentSpan span = startSpan("spring-scheduling", spanName); - try (AgentScope scope = activateSpan(span)) { + try (ContextScope scope = activateSpan(span)) { return delegate.proceed(); } finally { span.finish(); diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingRunnableWrapper.java b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingRunnableWrapper.java index bf0dc7ceced..553f4518d83 100644 --- a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingRunnableWrapper.java +++ b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/src/main/java/datadog/trace/instrumentation/springscheduling/SpringSchedulingRunnableWrapper.java @@ -7,8 +7,8 @@ import static datadog.trace.instrumentation.springscheduling.SpringSchedulingDecorator.DECORATE; import static datadog.trace.instrumentation.springscheduling.SpringSchedulingDecorator.SCHEDULED_CALL; +import datadog.context.ContextScope; import datadog.trace.api.Config; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.util.MethodHandles; import java.lang.invoke.MethodHandle; @@ -60,7 +60,7 @@ public void run() { : startSpan("spring-scheduling", SCHEDULED_CALL, null); DECORATE.afterStart(span); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { DECORATE.onRun(span, runnable); try { diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/TraceWebClientSubscriber.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/TraceWebClientSubscriber.java index b04c5cf9eea..c0d75bf4999 100644 --- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/TraceWebClientSubscriber.java +++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/TraceWebClientSubscriber.java @@ -4,7 +4,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpan; import static datadog.trace.instrumentation.springwebflux.client.SpringWebfluxHttpClientDecorator.DECORATE; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import org.reactivestreams.Subscription; import org.springframework.web.reactive.function.client.ClientResponse; @@ -32,14 +32,14 @@ public TraceWebClientSubscriber( @Override public void onSubscribe(final Subscription subscription) { - try (final AgentScope scope = activateSpan(parent)) { + try (final ContextScope scope = activateSpan(parent)) { actual.onSubscribe(subscription); } } @Override public void onNext(final ClientResponse response) { - try (final AgentScope scope = activateSpan(parent)) { + try (final ContextScope scope = activateSpan(parent)) { actual.onNext(response); } finally { DECORATE.onResponse(span, response); @@ -50,7 +50,7 @@ public void onNext(final ClientResponse response) { @Override public void onError(final Throwable t) { - try (final AgentScope scope = activateSpan(parent)) { + try (final ContextScope scope = activateSpan(parent)) { actual.onError(t); } finally { DECORATE.onError(span, t); @@ -62,7 +62,7 @@ public void onError(final Throwable t) { @Override public void onComplete() { - try (final AgentScope scope = activateSpan(parent)) { + try (final ContextScope scope = activateSpan(parent)) { actual.onComplete(); } } diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/WebClientTracingFilter.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/WebClientTracingFilter.java index 79f0e3c5310..ad84ba4be92 100644 --- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/WebClientTracingFilter.java +++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/client/WebClientTracingFilter.java @@ -6,7 +6,7 @@ import static datadog.trace.instrumentation.springwebflux.client.SpringWebfluxHttpClientDecorator.DECORATE; import static datadog.trace.instrumentation.springwebflux.client.SpringWebfluxHttpClientDecorator.HTTP_REQUEST; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.util.List; import org.springframework.web.reactive.function.client.ClientRequest; @@ -54,7 +54,7 @@ public void subscribe(final CoreSubscriber subscriber) { DECORATE.afterStart(span); DECORATE.onRequest(span, request); AgentSpan parent = activeSpan(); - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { TraceWebClientSubscriber tracingSubscriber = new TraceWebClientSubscriber(subscriber, span, parent); next.exchange(request).doOnCancel(tracingSubscriber::onCancel).subscribe(tracingSubscriber); diff --git a/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/CompletionListener.java b/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/CompletionListener.java index a3c31f49522..d079b05c342 100644 --- a/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/CompletionListener.java +++ b/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/CompletionListener.java @@ -3,7 +3,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.instrumentation.spymemcached.MemcacheClientDecorator.DECORATE; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; @@ -19,14 +19,14 @@ public abstract class CompletionListener { public CompletionListener(final AgentSpan span, final String methodName) { this.span = span; - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { DECORATE.afterStart(span); DECORATE.onOperation(span, methodName); } } protected void closeAsyncSpan(final T future) { - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { try { processResult(span, future); } catch (final CancellationException e) { @@ -54,7 +54,7 @@ protected void closeAsyncSpan(final T future) { } protected void closeSyncSpan(final Throwable thrown) { - try (final AgentScope scope = activateSpan(span)) { + try (final ContextScope scope = activateSpan(span)) { DECORATE.onError(span, thrown); DECORATE.beforeFinish(span); span.finish(); diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/TaskInstrumentation.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/TaskInstrumentation.java index c4b3ca071a4..d99a6c9b5a9 100644 --- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/TaskInstrumentation.java +++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/TaskInstrumentation.java @@ -11,6 +11,7 @@ import com.tibco.pe.core.ProcessGroup; import com.tibco.pe.core.Task; import com.tibco.pe.plugin.ProcessContext; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; import datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers; @@ -87,7 +88,7 @@ public static void after( @Advice.Enter boolean traced, @Advice.Local("ddActivityInfo") ActivityHelper.ActivityInfo ddActivityInfo, @Advice.Local("ddScope") AgentScope ddScope) { - try (AgentScope closeMe = ddScope) { + try (ContextScope closeMe = ddScope) { if (!traced) { return; } diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/ProcessInstrumentation.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/ProcessInstrumentation.java index e6a90077917..d6a070d0126 100644 --- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/ProcessInstrumentation.java +++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/ProcessInstrumentation.java @@ -11,12 +11,12 @@ import com.tibco.pvm.api.PmProcessInstance; import com.tibco.pvm.api.PmWorkUnit; import com.tibco.pvm.api.session.PmContext; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; import datadog.trace.api.Config; import datadog.trace.bootstrap.ContextStore; import datadog.trace.bootstrap.InstrumentationContext; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.type.TypeDescription; @@ -65,7 +65,7 @@ public static void onExit( // cannot find the name } } - try (AgentScope maybeScope = parentSpan != null ? activateSpan(parentSpan) : null) { + try (ContextScope maybeScope = parentSpan != null ? activateSpan(parentSpan) : null) { AgentSpan span = startSpan("tibco_bw", TibcoDecorator.TIBCO_PROCESS_OPERATION); TibcoDecorator.DECORATE.afterStart(span); if (appName != null) { diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/UndertowRunnableWrapper.java b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/UndertowRunnableWrapper.java index 0b27f27fe2d..2385d8cb8cd 100644 --- a/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/UndertowRunnableWrapper.java +++ b/dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/UndertowRunnableWrapper.java @@ -5,6 +5,7 @@ import static datadog.trace.bootstrap.instrumentation.java.concurrent.ExcludeFilter.ExcludeType.RUNNABLE; import static datadog.trace.bootstrap.instrumentation.java.concurrent.ExcludeFilter.exclude; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import io.undertow.server.HttpServerExchange; @@ -23,7 +24,7 @@ public UndertowRunnableWrapper( @Override public void run() { - try (AgentScope scope = continuation.activate()) { + try (ContextScope scope = continuation.activate()) { runnable.run(); } } diff --git a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisAPIImplSendAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisAPIImplSendAdvice.java index 3c8aadba9a3..3599f31233d 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisAPIImplSendAdvice.java +++ b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisAPIImplSendAdvice.java @@ -4,8 +4,8 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpan; import static datadog.trace.instrumentation.vertx_redis_client.VertxRedisClientDecorator.DECORATE; +import datadog.context.ContextScope; import datadog.trace.bootstrap.InstrumentationContext; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import io.vertx.core.Future; import io.vertx.core.net.SocketAddress; import io.vertx.redis.client.Redis; @@ -27,7 +27,7 @@ public static void afterSend( */ // Note that we should not _leak_ the active scope to the handler if it gets executed directly - try (AgentScope scope = activateSpan(noopSpan())) { + try (ContextScope scope = activateSpan(noopSpan())) { // Get the handler from the context, set by RedisAPICallAdvice ResponseHandlerWrapper handler = InstrumentationContext.get(RedisAPI.class, ResponseHandlerWrapper.class).get(self); diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteHandlerWrapper.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteHandlerWrapper.java index b001826420e..0f7a5adade7 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteHandlerWrapper.java +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteHandlerWrapper.java @@ -8,7 +8,7 @@ import static datadog.trace.instrumentation.vertx_3_4.server.VertxDecorator.DECORATE; import static datadog.trace.instrumentation.vertx_3_4.server.VertxDecorator.INSTRUMENTATION_NAME; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.Tags; import io.vertx.core.Handler; @@ -62,7 +62,7 @@ public void handle(final RoutingContext routingContext) { } setRoute(routingContext); } - try (final AgentScope scope = span != null ? activateSpan(span) : noopScope()) { + try (final ContextScope scope = span != null ? activateSpan(span) : noopScope()) { try { actual.handle(routingContext); } catch (final Throwable t) { diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteHandlerWrapper.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteHandlerWrapper.java index 19b344b75f6..c34fb32cdfb 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteHandlerWrapper.java +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteHandlerWrapper.java @@ -8,7 +8,7 @@ import static datadog.trace.instrumentation.vertx_4_0.server.VertxDecorator.DECORATE; import static datadog.trace.instrumentation.vertx_4_0.server.VertxDecorator.INSTRUMENTATION_NAME; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.Tags; import io.vertx.core.Handler; @@ -60,7 +60,7 @@ public void handle(final RoutingContext routingContext) { setRoute(routingContext); } - try (final AgentScope scope = span != null ? activateSpan(span) : noopScope()) { + try (final ContextScope scope = span != null ? activateSpan(span) : noopScope()) { try { actual.handle(routingContext); } catch (final Throwable t) { diff --git a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/TracingOutputStream.java b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/TracingOutputStream.java index 6aa3d2f01eb..83b5de0ea20 100644 --- a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/TracingOutputStream.java +++ b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/TracingOutputStream.java @@ -4,8 +4,8 @@ import static datadog.trace.bootstrap.instrumentation.decorator.WebsocketDecorator.DECORATE; import static datadog.trace.bootstrap.instrumentation.websocket.HandlersExtractor.MESSAGE_TYPE_BINARY; +import datadog.context.ContextScope; import datadog.trace.bootstrap.CallDepthThreadLocalMap; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.websocket.HandlerContext; import java.io.IOException; import java.io.OutputStream; @@ -26,7 +26,7 @@ public void write(int b) throws IOException { if (doTrace) { DECORATE.onSendFrameStart(handlerContext, MESSAGE_TYPE_BINARY, 1); } - try (final AgentScope ignored = activateSpan(handlerContext.getWebsocketSpan())) { + try (final ContextScope ignored = activateSpan(handlerContext.getWebsocketSpan())) { delegate.write(b); } finally { if (doTrace) { @@ -41,7 +41,7 @@ public void write(byte[] b, int off, int len) throws IOException { if (doTrace) { DECORATE.onSendFrameStart(handlerContext, MESSAGE_TYPE_BINARY, len); } - try (final AgentScope ignored = activateSpan(handlerContext.getWebsocketSpan())) { + try (final ContextScope ignored = activateSpan(handlerContext.getWebsocketSpan())) { delegate.write(b, off, len); } finally { if (doTrace) { @@ -53,7 +53,7 @@ public void write(byte[] b, int off, int len) throws IOException { @Override public void close() throws IOException { final boolean doTrace = CallDepthThreadLocalMap.incrementCallDepth(HandlerContext.class) == 0; - try (final AgentScope ignored = + try (final ContextScope ignored = handlerContext.getWebsocketSpan() != null ? activateSpan(handlerContext.getWebsocketSpan()) : null) { diff --git a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/TracingSendHandler.java b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/TracingSendHandler.java index 1401ae0f502..c5a582859a3 100644 --- a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/TracingSendHandler.java +++ b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/TracingSendHandler.java @@ -3,7 +3,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.decorator.WebsocketDecorator.DECORATE; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.websocket.HandlerContext; import javax.websocket.SendHandler; @@ -21,7 +21,7 @@ public TracingSendHandler(SendHandler delegate, HandlerContext handlerContext) { @Override public void onResult(SendResult sendResult) { final AgentSpan wsSpan = handlerContext.getWebsocketSpan(); - try (final AgentScope ignored = activateSpan(wsSpan)) { + try (final ContextScope ignored = activateSpan(wsSpan)) { delegate.onResult(sendResult); } finally { if (sendResult.getException() != null) { diff --git a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/TracingWriter.java b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/TracingWriter.java index 4d37d1ba307..075637763df 100644 --- a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/TracingWriter.java +++ b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/TracingWriter.java @@ -4,8 +4,8 @@ import static datadog.trace.bootstrap.instrumentation.decorator.WebsocketDecorator.DECORATE; import static datadog.trace.bootstrap.instrumentation.websocket.HandlersExtractor.MESSAGE_TYPE_TEXT; +import datadog.context.ContextScope; import datadog.trace.bootstrap.CallDepthThreadLocalMap; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.websocket.HandlerContext; import java.io.IOException; import java.io.Writer; @@ -26,7 +26,7 @@ public void write(char[] cbuf, int off, int len) throws IOException { if (doTrace) { DECORATE.onSendFrameStart(handlerContext, MESSAGE_TYPE_TEXT, len); } - try (final AgentScope ignored = activateSpan(handlerContext.getWebsocketSpan())) { + try (final ContextScope ignored = activateSpan(handlerContext.getWebsocketSpan())) { delegate.write(cbuf, off, len); } finally { if (doTrace) { @@ -43,7 +43,7 @@ public void flush() throws IOException { @Override public void close() throws IOException { final boolean doTrace = CallDepthThreadLocalMap.incrementCallDepth(HandlerContext.class) == 0; - try (final AgentScope ignored = + try (final ContextScope ignored = handlerContext.getWebsocketSpan() != null ? activateSpan(handlerContext.getWebsocketSpan()) : null) { diff --git a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10.0/src/main/java11/datadog/trace/instrumentation/websocket/jetty10/MethodHandleWrappers.java b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10.0/src/main/java11/datadog/trace/instrumentation/websocket/jetty10/MethodHandleWrappers.java index 7896b2eb5a6..c1af95f1cdd 100644 --- a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10.0/src/main/java11/datadog/trace/instrumentation/websocket/jetty10/MethodHandleWrappers.java +++ b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-10.0/src/main/java11/datadog/trace/instrumentation/websocket/jetty10/MethodHandleWrappers.java @@ -3,11 +3,11 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.decorator.WebsocketDecorator.DECORATE; +import datadog.context.ContextScope; import datadog.trace.api.Config; import datadog.trace.bootstrap.CallDepthThreadLocalMap; import datadog.trace.bootstrap.ContextStore; import datadog.trace.bootstrap.ExceptionLogger; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import datadog.trace.bootstrap.instrumentation.websocket.HandlerContext; @@ -117,7 +117,7 @@ public static void onClose( if (handlerContext != null) { final HandlerContext.Receiver closeContext = new HandlerContext.Receiver(handlerContext.getHandshakeSpan(), session.getId()); - try (AgentScope ignored = + try (ContextScope ignored = activateSpan( DECORATE.onSessionCloseReceived( closeContext, @@ -163,7 +163,7 @@ public static Object onMessage( ExceptionLogger.LOGGER.debug("Unforeseen error instrumenting jetty websocket POJO", t); } if (wsSpan != null) { - try (AgentScope ignored = activateSpan(wsSpan)) { + try (ContextScope ignored = activateSpan(wsSpan)) { return delegate.invokeWithArguments(args); } catch (Throwable t) { finishSpan = true; diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/java/lang/ProcessImplInstrumentationHelpers.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/java/lang/ProcessImplInstrumentationHelpers.java index e5e2f2ab6f2..09a16559910 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/java/lang/ProcessImplInstrumentationHelpers.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/java/lang/ProcessImplInstrumentationHelpers.java @@ -6,6 +6,7 @@ import static java.lang.invoke.MethodType.methodType; import datadog.appsec.api.blocking.BlockingException; +import datadog.context.ContextScope; import datadog.trace.api.Config; import datadog.trace.api.gateway.BlockResponseFunction; import datadog.trace.api.gateway.Flow; @@ -313,7 +314,7 @@ private static void finishSpan( span.finish(); return; } - try (final AgentScope scope = parentContinuation.activate()) { + try (final ContextScope scope = parentContinuation.activate()) { span.finish(); } }