Skip to content

Migrate zio instrumentation to new Context API #8527

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 10, 2025
Merged

Migrate zio instrumentation to new Context API #8527

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
53 changes: 23 additions & 30 deletions ...tation/zio/zio-2.0/src/main/java/datadog/trace/instrumentation/zio/v2_0/FiberContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,63 +2,56 @@

import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.captureActiveSpan;

import datadog.context.Context;
import datadog.trace.bootstrap.instrumentation.api.AgentScope;
import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
import datadog.trace.bootstrap.instrumentation.api.ScopeState;

public class FiberContext {
private final ScopeState state;
private final Context context;
private AgentScope.Continuation continuation;
private AgentScope scope;
private ScopeState oldState;
private Context oldContext;

private FiberContext(ScopeState state) {
this.state = state;
this.scope = null;
this.oldState = null;
private FiberContext(Context context) {
this.context = context;
this.continuation = captureActiveSpan();
this.scope = null;
this.oldContext = null;
}

public static FiberContext create() {
final ScopeState state = AgentTracer.get().newScopeState();
return new FiberContext(state);
return new FiberContext(Context.root());
}

public void onEnd() {
if (this.scope != null) {
this.scope.close();
this.scope = null;
if (scope != null) {
scope.close();
scope = null;
}
if (continuation != null) {
continuation.cancel();
continuation = null;
}

if (this.oldState != null) {
this.oldState.activate();
this.oldState = null;
if (oldContext != null) {
oldContext.swap();
oldContext = null;
}
}

public void onSuspend() {
if (this.scope != null && continuation != null) {
this.scope.close();
this.scope = null;
if (scope != null && continuation != null) {
scope.close();
scope = null;
}
if (this.oldState != null) {
this.oldState.activate();
this.oldState = null;
if (oldContext != null) {
oldContext.swap();
oldContext = null;
}
}

public void onResume() {
this.oldState = AgentTracer.get().newScopeState();
this.oldState.fetchFromActive();

this.state.activate();

if (this.continuation != null) {
this.scope = continuation.activate();
oldContext = context.swap();
if (continuation != null) {
scope = continuation.activate();
continuation = null;
}
}
Expand Down