Skip to content

Prefer using activeSpan() over activeScope() #8492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 4, 2025
Merged

Prefer using activeSpan() over activeScope() #8492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .../java/datadog/trace/instrumentation/akkahttp/DatadogServerRequestResponseFlowWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package datadog.trace.instrumentation.akkahttp;

import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeScope;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan;

import akka.http.scaladsl.model.HttpRequest;
import akka.http.scaladsl.model.HttpResponse;
Expand Down Expand Up @@ -142,11 +142,11 @@ public void onPush() throws Exception {
response = newResponse;
}
DatadogWrapperHelper.finishSpan(span, response);
// Check if the active scope is still the scope from when the request came in,
// Check if the active span matches the scope from when the request came in,
// and close it. If it's not, then it will be cleaned up actor message
// processing instrumentation that drives this state machine
AgentScope activeScope = activeScope();
if (activeScope == scope) {
AgentSpan activeSpan = activeSpan();
if (activeSpan == scope.span()) {
scope.close();
}
}
Expand Down
9 changes: 5 additions & 4 deletions ...java/datadog/trace/instrumentation/pekkohttp/DatadogServerRequestResponseFlowWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package datadog.trace.instrumentation.pekkohttp;

import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeScope;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan;

import datadog.trace.bootstrap.instrumentation.api.AgentScope;
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import java.util.Queue;
import java.util.concurrent.ArrayBlockingQueue;
import org.apache.pekko.http.scaladsl.model.HttpRequest;
Expand Down Expand Up @@ -113,11 +114,11 @@ public void onPush() throws Exception {
final AgentScope scope = scopes.poll();
if (scope != null) {
DatadogWrapperHelper.finishSpan(scope.span(), response);
// Check if the active scope is still the scope from when the request came in,
// Check if the active span matches the scope from when the request came in,
// and close it. If it's not, then it will be cleaned up actor message
// processing instrumentation that drives this state machine
AgentScope activeScope = activeScope();
if (activeScope == scope) {
AgentSpan activeSpan = activeSpan();
if (activeSpan == scope.span()) {
scope.close();
}
}
Expand Down
6 changes: 3 additions & 3 deletions ...t/src/main/java/datadog/trace/instrumentation/sslsocket/SocketConnectInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import datadog.trace.agent.tooling.InstrumenterModule;
import datadog.trace.api.InstrumenterConfig;
import datadog.trace.bootstrap.config.provider.ConfigProvider;
import datadog.trace.bootstrap.instrumentation.api.AgentScope;
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
import net.bytebuddy.asm.Advice;

Expand Down Expand Up @@ -53,8 +53,8 @@ public static final class DisableWallclockSampling {

@Advice.OnMethodEnter(suppress = Throwable.class)
public static boolean before() {
AgentScope active = AgentTracer.activeScope();
if (active != null) {
AgentSpan activeSpan = AgentTracer.activeSpan();
if (activeSpan != null) {
AgentTracer.get().getProfilingContext().onDetach();
return true;
}
Expand Down
6 changes: 3 additions & 3 deletions ...rtow-2.0/src/main/java/datadog/trace/instrumentation/undertow/HandlerInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ public static void onEnter(
@Advice.Argument(value = 0, readOnly = false) HttpHandler handler,
@Advice.Argument(1) final HttpServerExchange exchange,
@Advice.Local("agentScope") AgentScope scope) {
AgentScope currentScope = AgentTracer.activeScope();
if (currentScope != null) {
AgentSpan localRootSpan = currentScope.span().getLocalRootSpan();
AgentSpan activeSpan = AgentTracer.activeSpan();
if (activeSpan != null) {
AgentSpan localRootSpan = activeSpan.getLocalRootSpan();
if (DECORATE.spanName().equals(localRootSpan.getSpanName())) {
// if we can here through the dispatch of an HttpHandler, rather than that of a
// plain Runnable, then Connects.executeRootHandler() will still have been called,
Expand Down
Loading