From 14571a55690733981f513433d4ab768361263313 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 6 Jun 2023 10:51:01 +0200 Subject: [PATCH] Polishing. Reformat code. Fix typo. See #2591 Original pull request: #2592 --- .../MicrometerTracingAdapter.java | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/observability/MicrometerTracingAdapter.java b/src/main/java/org/springframework/data/redis/connection/lettuce/observability/MicrometerTracingAdapter.java index b05c0cabe..72aa9fdc9 100644 --- a/src/main/java/org/springframework/data/redis/connection/lettuce/observability/MicrometerTracingAdapter.java +++ b/src/main/java/org/springframework/data/redis/connection/lettuce/observability/MicrometerTracingAdapter.java @@ -130,27 +130,28 @@ public class MicrometerTracingAdapter implements Tracing { return postProcessSpan(createObservation(traceContext)); } - private Observation createObservation(@Nullable TraceContext traceContext) { - return RedisObservation.REDIS_COMMAND_OBSERVATION.observation(observationRegistry, - () -> { - LettuceObservationContext context = new LettuceObservationContext(serviceName); - if (traceContext instanceof MicrometerTraceContext micrometerTraceContext) { - context.setParentObservation(micrometerTraceContext.observation); - } - return context; - }); + private Observation createObservation(@Nullable TraceContext parentContext) { + + return RedisObservation.REDIS_COMMAND_OBSERVATION.observation(observationRegistry, () -> { + + LettuceObservationContext context = new LettuceObservationContext(serviceName); + + if (parentContext instanceof MicrometerTraceContext traceContext) { + context.setParentObservation(traceContext.observation()); + } + return context; + }); } private Tracer.Span postProcessSpan(Observation observation) { - return !observation.isNoop() - ? new MicrometerSpan(observation.observationConvention(observationConvention)) + return !observation.isNoop() ? new MicrometerSpan(observation.observationConvention(observationConvention)) : NoOpSpan.INSTANCE; } } /** - * No-op {@link Span} implemementation. + * No-op {@link Span} implementation. */ static class NoOpSpan extends Tracer.Span {