Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #32817 from izeye

Browse Source 
* gh-32817:
  Handle null span in LazyTracingSpanContextSupplier consistently

Closes gh-32817
This commit is contained in:
Andy Wilkinson
2022-10-27 18:03:26 +01:00
parent 67e4ac4f1e 8d17d2d443
commit 26d61b9295
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/exemplars/ExemplarsAutoConfiguration.java
View File

@@ -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