Skip to content

Adds a null guard against parentObservation #10103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davsclaus merged 1 commit into from
May 16, 2023
Merged

Adds a null guard against parentObservation #10103

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...l-observation/src/main/java/org/apache/camel/observation/MicrometerObservationTracer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down