[camel] branch main updated: Adds a null guard against parentObservation (shouldn't happen but better safe than sorry) (#10103)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new a01d9ffbca1 Adds a null guard against parentObservation (shouldn't 
happen but better safe than sorry) (#10103)
a01d9ffbca1 is described below

commit a01d9ffbca1461a9559f5982d60fea1a53bf16ba
Author: Marcin Grzejszczak <mgrzejszc...@vmware.com>
AuthorDate: Tue May 16 12:32:05 2023 +0200

    Adds a null guard against parentObservation (shouldn't happen but better 
safe than sorry) (#10103)
---
 .../java/org/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 bc0c4c78603..aa5baec9d4f 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 @@ public class MicrometerObservationTracer extends 
org.apache.camel.tracing.Tracer
         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);