From c58d7ce3f9fcfab9d74af042d2347bde74a68385 Mon Sep 17 00:00:00 2001 From: Tadaya Tsuyukubo Date: Mon, 19 Sep 2022 20:11:43 -0700 Subject: [PATCH] Adapt API change in "Context#getParentObservation" Adapt the change by https://github.com/micrometer-metrics/micrometer/pull/3423 --- .../tracing/handler/TracingObservationHandler.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/micrometer-tracing/src/main/java/io/micrometer/tracing/handler/TracingObservationHandler.java b/micrometer-tracing/src/main/java/io/micrometer/tracing/handler/TracingObservationHandler.java index 5fcb52a8..c2caa6e4 100755 --- a/micrometer-tracing/src/main/java/io/micrometer/tracing/handler/TracingObservationHandler.java +++ b/micrometer-tracing/src/main/java/io/micrometer/tracing/handler/TracingObservationHandler.java @@ -23,6 +23,7 @@ import io.micrometer.observation.Observation; import io.micrometer.observation.Observation.Event; import io.micrometer.observation.ObservationHandler; +import io.micrometer.observation.ObservationView; import io.micrometer.tracing.CurrentTraceContext; import io.micrometer.tracing.Span; import io.micrometer.tracing.Tracer; @@ -111,9 +112,9 @@ default Span getParentSpan(Observation.ContextView context) { // This would mean that the user has manually created a tracing context TracingContext tracingContext = context.get(TracingContext.class); if (tracingContext == null) { - Observation observation = context.getParentObservation(); + ObservationView observation = context.getParentObservation(); if (observation != null) { - tracingContext = observation.getContext().get(TracingContext.class); + tracingContext = observation.getContextView().get(TracingContext.class); if (tracingContext != null) { return tracingContext.getSpan(); }