DeferredTracer avoids an unnecessary deep copy of the current trace (#676)

carterkozak · web-flow · commit 26f354d0692d · 2021-01-20T00:07:27.000Z
DeferredTracer avoids an unnecessary deep copy of the current trace
diff --git a/changelog/@unreleased/pr-676.v2.yml b/changelog/@unreleased/pr-676.v2.yml
@@ -0,0 +1,5 @@
+type: improvement
+improvement:
+  description: DeferredTracer avoids an unnecessary deep copy of the current trace
+  links:
+  - https://github.com/palantir/tracing-java/pull/676
diff --git a/tracing/src/main/java/com/palantir/tracing/DeferredTracer.java b/tracing/src/main/java/com/palantir/tracing/DeferredTracer.java
@@ -120,7 +120,7 @@ CloseableTrace withTrace() {
             return NopCloseableTrace.INSTANCE;
         }
 
-        Optional<Trace> originalTrace = Tracer.copyTrace();
+        Optional<Trace> originalTrace = Tracer.getAndClearTraceIfPresent();
 
         Tracer.setTrace(Trace.of(isObservable, traceId, Optional.ofNullable(requestId)));
         if (parentSpanId != null) {

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ CloseableTrace withTrace() {`
`120`	`120`	`return NopCloseableTrace.INSTANCE;`
`121`	`121`	`}`
`122`	`122`
`123`		`- Optional<Trace> originalTrace = Tracer.copyTrace();`
	`123`	`+ Optional<Trace> originalTrace = Tracer.getAndClearTraceIfPresent();`
`124`	`124`
`125`	`125`	`Tracer.setTrace(Trace.of(isObservable, traceId, Optional.ofNullable(requestId)));`
`126`	`126`	`if (parentSpanId != null) {`