diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/exemplars/ExemplarsAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/exemplars/ExemplarsAutoConfiguration.java index c5d21e5ef22..b48aaf48914 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/exemplars/ExemplarsAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/exemplars/ExemplarsAutoConfiguration.java @@ -67,12 +67,14 @@ public class ExemplarsAutoConfiguration { @Override public String getTraceId() { - return currentSpan().context().traceId(); + Span currentSpan = currentSpan(); + return (currentSpan != null) ? currentSpan.context().traceId() : null; } @Override public String getSpanId() { - return currentSpan().context().spanId(); + Span currentSpan = currentSpan(); + return (currentSpan != null) ? currentSpan.context().spanId() : null; } @Override