Merge pull request #32817 from izeye

* gh-32817:
  Handle null span in LazyTracingSpanContextSupplier consistently

Closes gh-32817
pull/32920/head
Andy Wilkinson 2 years ago
commit 26d61b9295

@ -67,12 +67,14 @@ public class ExemplarsAutoConfiguration {
@Override @Override
public String getTraceId() { public String getTraceId() {
return currentSpan().context().traceId(); Span currentSpan = currentSpan();
return (currentSpan != null) ? currentSpan.context().traceId() : null;
} }
@Override @Override
public String getSpanId() { public String getSpanId() {
return currentSpan().context().spanId(); Span currentSpan = currentSpan();
return (currentSpan != null) ? currentSpan.context().spanId() : null;
} }
@Override @Override

Loading…
Cancel
Save