From 8d17d2d44389431f2da83a9e6ca7bdd593e98090 Mon Sep 17 00:00:00 2001
From: Johnny Lim <izeye@naver.com>
Date: Thu, 20 Oct 2022 20:10:51 +0900
Subject: [PATCH] Handle null span in LazyTracingSpanContextSupplier
 consistently

See gh-32817
---
 .../tracing/exemplars/ExemplarsAutoConfiguration.java       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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 c5d21e5ef2..b48aaf4891 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