diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceReactiveClientInstrumentation.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceReactiveClientInstrumentation.java index a86c7e69e36..201bbe7ce47 100644 --- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceReactiveClientInstrumentation.java +++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceReactiveClientInstrumentation.java @@ -37,12 +37,7 @@ *

When it is a set of commands that is being executed we want to have the information about the * number of processed commands - this can be achieved by hooking into {@linkplain * io.lettuce.core.RedisPublisher.RedisSubscription#onNext(Object)} method, incrementing the tracked - * count until the associated subscription command has been cancelled. In order to propagate the - * parent span active at the time of issuing the Redis command it is necessary to instrument - * {@linkplain io.lettuce.core.AbstractRedisReactiveCommands}, intercepting all createMono - * and create*Flux methods - capturing the parent span when {@linkplain - * reactor.core.publisher.Mono} or {@linkplain reactor.core.publisher.Flux} instance is created and - * reactivating each time they are subscribed. + * count until the associated subscription command has been cancelled. */ @AutoService(InstrumenterModule.class) public class LettuceReactiveClientInstrumentation extends InstrumenterModule.Tracing @@ -56,16 +51,13 @@ public LettuceReactiveClientInstrumentation() { public String[] knownMatchingTypes() { return new String[] { "io.lettuce.core.RedisPublisher$RedisSubscription", - "io.lettuce.core.RedisPublisher$SubscriptionCommand", - "io.lettuce.core.AbstractRedisReactiveCommands" + "io.lettuce.core.RedisPublisher$SubscriptionCommand" }; } @Override public String[] helperClassNames() { return new String[] { - packageName + ".rx.RedisSubscriptionSubscribeAdvice", - packageName + ".rx.RedisSubscriptionSubscribeAdvice$State", packageName + ".rx.RedisSubscriptionState", packageName + ".LettuceInstrumentationUtil", packageName + ".LettuceClientDecorator" diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/LettuceFlowTracker.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/LettuceFlowTracker.java deleted file mode 100644 index 36d27ba2ce0..00000000000 --- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/LettuceFlowTracker.java +++ /dev/null @@ -1,23 +0,0 @@ -package datadog.trace.instrumentation.lettuce5.rx; - -import datadog.trace.bootstrap.instrumentation.api.AgentSpan; -import datadog.trace.bootstrap.instrumentation.api.AgentTracer; -import java.util.function.Consumer; - -public final class LettuceFlowTracker implements Consumer { - public final AgentSpan flowSpan; - - public LettuceFlowTracker(AgentSpan flowSpan) { - this.flowSpan = flowSpan; - } - - @Override - public void accept(R r) { - if (flowSpan != null) { - AgentSpan previousSpan = AgentTracer.activeSpan(); - if (flowSpan != previousSpan) { - AgentTracer.activateSpan(flowSpan); - } - } - } -} diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/LettuceFluxCreationAdvice.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/LettuceFluxCreationAdvice.java deleted file mode 100644 index c0dfc5e611f..00000000000 --- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/LettuceFluxCreationAdvice.java +++ /dev/null @@ -1,24 +0,0 @@ -package datadog.trace.instrumentation.lettuce5.rx; - -import datadog.trace.bootstrap.instrumentation.api.AgentTracer; -import io.lettuce.core.protocol.RedisCommand; -import java.util.function.Supplier; -import net.bytebuddy.asm.Advice; -import reactor.core.publisher.Flux; - -public class LettuceFluxCreationAdvice { - - @Advice.OnMethodEnter(suppress = Throwable.class) - public static RedisCommand extractCommandName( - @Advice.Argument(0) final Supplier supplier) { - return supplier.get(); - } - - // throwables wouldn't matter here, because no spans have been started due to redis command not - // being run until the user subscribes to the Mono publisher - @Advice.OnMethodExit(suppress = Throwable.class) - public static void afterCreateFlux(@Advice.Return(readOnly = false) Flux publisher) { - LettuceFlowTracker tracker = new LettuceFlowTracker(AgentTracer.activeSpan()); - publisher = publisher.doOnSubscribe(tracker); - } -} diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/LettuceMonoCreationAdvice.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/LettuceMonoCreationAdvice.java deleted file mode 100644 index 9cff6bbcc9c..00000000000 --- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/LettuceMonoCreationAdvice.java +++ /dev/null @@ -1,24 +0,0 @@ -package datadog.trace.instrumentation.lettuce5.rx; - -import datadog.trace.bootstrap.instrumentation.api.AgentTracer; -import io.lettuce.core.protocol.RedisCommand; -import java.util.function.Supplier; -import net.bytebuddy.asm.Advice; -import reactor.core.publisher.Mono; - -public class LettuceMonoCreationAdvice { - - @Advice.OnMethodEnter(suppress = Throwable.class) - public static RedisCommand extractCommandName( - @Advice.Argument(0) final Supplier supplier) { - return supplier.get(); - } - - // throwables wouldn't matter here, because no spans have been started due to redis command not - // being run until the user subscribes to the Mono publisher - @Advice.OnMethodExit(suppress = Throwable.class) - public static void afterCreateMono(@Advice.Return(readOnly = false) Mono publisher) { - LettuceFlowTracker tracker = new LettuceFlowTracker(AgentTracer.activeSpan()); - publisher = publisher.doOnSubscribe(tracker); - } -} diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionState.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionState.java index b41ea907f8d..548ffeb4461 100644 --- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionState.java +++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionState.java @@ -1,11 +1,9 @@ package datadog.trace.instrumentation.lettuce5.rx; -import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import io.lettuce.core.api.StatefulConnection; public final class RedisSubscriptionState { public boolean cancelled = false; public int count = 0; - public AgentSpan parentSpan; public StatefulConnection connection; } diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionSubscribeAdvice.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionSubscribeAdvice.java index 4f7124e35a6..332b0331927 100644 --- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionSubscribeAdvice.java +++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionSubscribeAdvice.java @@ -1,11 +1,9 @@ package datadog.trace.instrumentation.lettuce5.rx; -import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.instrumentation.lettuce5.LettuceClientDecorator.DECORATE; import static datadog.trace.instrumentation.lettuce5.LettuceInstrumentationUtil.expectsResponse; -import datadog.context.ContextScope; import datadog.trace.bootstrap.InstrumentationContext; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.instrumentation.lettuce5.LettuceClientDecorator; @@ -16,33 +14,18 @@ import org.reactivestreams.Subscription; public class RedisSubscriptionSubscribeAdvice { - public static final class State { - public final ContextScope parentScope; - public final AgentSpan span; - - public State(ContextScope parentScope, AgentSpan span) { - this.parentScope = parentScope; - this.span = span; - } - } - @Advice.OnMethodEnter(suppress = Throwable.class) - public static State beforeSubscribe( + public static AgentSpan beforeSubscribe( @Advice.This Subscription subscription, @Advice.FieldValue("command") RedisCommand command, @Advice.FieldValue("subscriptionCommand") RedisCommand subscriptionCommand) { - ContextScope parentScope = null; RedisSubscriptionState state = (RedisSubscriptionState) InstrumentationContext.get( "io.lettuce.core.RedisPublisher$RedisSubscription", "datadog.trace.instrumentation.lettuce5.rx.RedisSubscriptionState") .get(subscription); - AgentSpan parentSpan = state != null ? state.parentSpan : null; - if (parentSpan != null) { - parentScope = activateSpan(parentSpan); - } AgentSpan span = startSpan( LettuceClientDecorator.REDIS_CLIENT.toString(), LettuceClientDecorator.OPERATION_NAME); @@ -56,24 +39,21 @@ public static State beforeSubscribe( } DECORATE.onCommand(span, command); - return new State(parentScope, span); + return span; } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void afterSubscribe( @Advice.FieldValue("command") RedisCommand command, @Advice.FieldValue("subscriptionCommand") RedisCommand subscriptionCommand, - @Advice.Enter State state, + @Advice.Enter AgentSpan span, @Advice.Thrown Throwable throwable) { if (throwable != null || !expectsResponse(command)) { - DECORATE.onError(state.span, throwable); - DECORATE.beforeFinish(state.span); - state.span.finish(); + DECORATE.onError(span, throwable); + DECORATE.beforeFinish(span); + span.finish(); InstrumentationContext.get(RedisCommand.class, AgentSpan.class) .put(subscriptionCommand, null); } - if (state.parentScope != null) { - state.parentScope.close(); - } } }