Skip to content
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

Improve how nested MDC scopes are handled in the Jaeger extension #8778

Merged
merged 1 commit into from
Apr 23, 2020
Merged

Improve how nested MDC scopes are handled in the Jaeger extension #8778

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
9 changes: 6 additions & 3 deletions extensions/jaeger/deployment/src/test/java/io/quarkus/jaeger/test/NestedMdcScopesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertSame;

import java.util.Map;

Expand All @@ -23,26 +24,28 @@ public void mdcIsRestoredCorrectly() {

assertNull(mdcScopeManager.active());
assertNull(threadLocalScopeManager.active());
assertNull(MDC.get("traceId"));

JaegerSpanContext span = new JaegerSpanContext(1, 1, 1, 1, Byte.valueOf("0"));
Scope scope = mdcScopeManager.activate(new TestSpan(span), true);
assertEquals(span, threadLocalScopeManager.active().span().context());
assertSame(span, threadLocalScopeManager.active().span().context());
assertEquals("10000000000000001", MDC.get("traceId"));

JaegerSpanContext subSpan = new JaegerSpanContext(2, 2, 2, 1, Byte.valueOf("0"));
Scope subScope = mdcScopeManager.activate(new TestSpan(subSpan), true);
assertEquals(subSpan, threadLocalScopeManager.active().span().context());
assertSame(subSpan, threadLocalScopeManager.active().span().context());
assertEquals("20000000000000002", MDC.get("traceId"));

subScope.close();

assertEquals(span, threadLocalScopeManager.active().span().context());
assertSame(span, threadLocalScopeManager.active().span().context());
assertEquals("10000000000000001", MDC.get("traceId"));

scope.close();

assertNull(mdcScopeManager.active());
assertNull(threadLocalScopeManager.active());
assertNull(MDC.get("traceId"));
}

static class TestSpan implements Span {
Expand Down
20 changes: 15 additions & 5 deletions extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/MDCScope.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,15 @@ public class MDCScope implements Scope {
private static final String SAMPLED = "sampled";

private final Scope wrapped;
private final Scope toRestore;
private final Object originalTraceId;
private final Object originalSpanId;
private final Object originalSampled;

public MDCScope(Scope toRestore, Scope scope) {
this.toRestore = toRestore;
public MDCScope(Scope scope) {
this.wrapped = scope;
this.originalTraceId = MDC.get(TRACE_ID);
this.originalSpanId = MDC.get(SPAN_ID);
this.originalSampled = MDC.get(SAMPLED);
if (scope.span().context() instanceof JaegerSpanContext) {
putContext((JaegerSpanContext) scope.span().context());
}
Expand All @@ -36,8 +40,14 @@ public void close() {
MDC.remove(SPAN_ID);
MDC.remove(SAMPLED);

if (toRestore != null && toRestore.span().context() instanceof JaegerSpanContext) {
putContext(((JaegerSpanContext) toRestore.span().context()));
if (originalTraceId != null) {
MDC.put(TRACE_ID, originalTraceId);
}
if (originalSpanId != null) {
MDC.put(SPAN_ID, originalSpanId);
}
if (originalSampled != null) {
MDC.put(SAMPLED, originalSampled);
}
}

Expand Down
3 changes: 1 addition & 2 deletions extensions/jaeger/runtime/src/main/java/io/quarkus/jaeger/runtime/MDCScopeManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ public MDCScopeManager(ScopeManager scopeManager) {

@Override
public Scope activate(Span span, boolean finishSpanOnClose) {
Scope current = wrapped.active();
return new MDCScope(current, wrapped.activate(span, finishSpanOnClose));
return new MDCScope(wrapped.activate(span, finishSpanOnClose));
}

@Override
Expand Down