From b354bafbe98ab8c9ded79f653c0f3170b5efc3ea Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@vmware.com>
Date: Tue, 16 May 2023 11:37:27 +0200
Subject: [PATCH] Adds a null guard against parentObservation (shouldn't happen
 but better safe than sorry)

---
 .../apache/camel/observation/MicrometerObservationTracer.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/camel-observation/src/main/java/org/apache/camel/observation/MicrometerObservationTracer.java b/components/camel-observation/src/main/java/org/apache/camel/observation/MicrometerObservationTracer.java
index 937879c8825f2..e670cf69220be 100644
--- a/components/camel-observation/src/main/java/org/apache/camel/observation/MicrometerObservationTracer.java
+++ b/components/camel-observation/src/main/java/org/apache/camel/observation/MicrometerObservationTracer.java
@@ -140,7 +140,7 @@ protected SpanAdapter startSendingEventSpan(
         Observation parentObservation = getParentObservation(parent);
         Tracer.SpanInScope scope = null;
         try {
-            if (parentObservation != observationRegistry.getCurrentObservation()) {
+            if (parentObservation != null && parentObservation != observationRegistry.getCurrentObservation()) {
                 // Because Camel allows to close scopes multiple times
                 TracingObservationHandler.TracingContext tracingContext
                         = parentObservation.getContextView().get(TracingObservationHandler.TracingContext.class);