From 663992d6262f13095aa6eb57ff9114294f73043d Mon Sep 17 00:00:00 2001 From: Brian Devins-Suresh Date: Tue, 12 May 2020 14:27:00 -0400 Subject: [PATCH 1/2] Rename java packages for lettuce 4 and 5 --- .../LettuceAsyncCommandsInstrumentation.java | 2 +- .../LettuceClientInstrumentation.java | 2 +- .../InstrumentationPoints.java | 4 +-- .../LettuceAsyncCommandsAdvice.java | 3 +-- .../LettuceClientDecorator.java | 27 ++++++++++--------- .../RedisConnectionAdvice.java | 6 ++--- ....groovy => Lettuce4AsyncClientTest.groovy} | 12 ++++----- ...t.groovy => Lettuce4SyncClientTest.groovy} | 4 +-- .../LettuceAsyncCommandsInstrumentation.java | 2 +- .../LettuceClientInstrumentation.java | 2 +- ...ettuceReactiveCommandsInstrumentation.java | 2 +- .../ConnectionFutureAdvice.java | 4 +-- .../LettuceAsyncBiFunction.java | 4 +-- .../LettuceAsyncCommandsAdvice.java | 6 ++--- .../LettuceClientDecorator.java | 2 +- .../LettuceInstrumentationUtil.java | 2 +- .../rx/LettuceFluxCreationAdvice.java | 4 +-- .../rx/LettuceFluxTerminationRunnable.java | 4 +-- .../rx/LettuceMonoCreationAdvice.java | 4 +-- .../rx/LettuceMonoDualConsumer.java | 4 +-- ....groovy => Lettuce5AsyncClientTest.groovy} | 4 +-- ...oovy => Lettuce5ReactiveClientTest.groovy} | 4 +-- ...t.groovy => Lettuce5SyncClientTest.groovy} | 4 +-- 23 files changed, 55 insertions(+), 57 deletions(-) rename dd-java-agent/instrumentation/lettuce-4/src/main/java/datadog/trace/instrumentation/{lettuce => lettuce4}/LettuceAsyncCommandsInstrumentation.java (96%) rename dd-java-agent/instrumentation/lettuce-4/src/main/java/datadog/trace/instrumentation/{lettuce => lettuce4}/LettuceClientInstrumentation.java (96%) rename dd-java-agent/instrumentation/lettuce-4/src/main/java8/datadog/trace/instrumentation/{lettuce => lettuce4}/InstrumentationPoints.java (97%) rename dd-java-agent/instrumentation/lettuce-4/src/main/java8/datadog/trace/instrumentation/{lettuce => lettuce4}/LettuceAsyncCommandsAdvice.java (94%) rename dd-java-agent/instrumentation/lettuce-4/src/main/java8/datadog/trace/instrumentation/{lettuce => lettuce4}/LettuceClientDecorator.java (68%) rename dd-java-agent/instrumentation/lettuce-4/src/main/java8/datadog/trace/instrumentation/{lettuce => lettuce4}/RedisConnectionAdvice.java (73%) rename dd-java-agent/instrumentation/lettuce-4/src/test/groovy/{LettuceAsyncClientTest.groovy => Lettuce4AsyncClientTest.groovy} (98%) rename dd-java-agent/instrumentation/lettuce-4/src/test/groovy/{LettuceSyncClientTest.groovy => Lettuce4SyncClientTest.groovy} (98%) rename dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/{lettuce => lettuce5}/LettuceAsyncCommandsInstrumentation.java (96%) rename dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/{lettuce => lettuce5}/LettuceClientInstrumentation.java (97%) rename dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/{lettuce => lettuce5}/LettuceReactiveCommandsInstrumentation.java (98%) rename dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/{lettuce => lettuce5}/ConnectionFutureAdvice.java (91%) rename dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/{lettuce => lettuce5}/LettuceAsyncBiFunction.java (88%) rename dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/{lettuce => lettuce5}/LettuceAsyncCommandsAdvice.java (87%) rename dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/{lettuce => lettuce5}/LettuceClientDecorator.java (97%) rename dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/{lettuce => lettuce5}/LettuceInstrumentationUtil.java (98%) rename dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/{lettuce => lettuce5}/rx/LettuceFluxCreationAdvice.java (89%) rename dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/{lettuce => lettuce5}/rx/LettuceFluxTerminationRunnable.java (95%) rename dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/{lettuce => lettuce5}/rx/LettuceMonoCreationAdvice.java (88%) rename dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/{lettuce => lettuce5}/rx/LettuceMonoDualConsumer.java (91%) rename dd-java-agent/instrumentation/lettuce-5/src/test/groovy/{LettuceAsyncClientTest.groovy => Lettuce5AsyncClientTest.groovy} (98%) rename dd-java-agent/instrumentation/lettuce-5/src/test/groovy/{LettuceReactiveClientTest.groovy => Lettuce5ReactiveClientTest.groovy} (98%) rename dd-java-agent/instrumentation/lettuce-5/src/test/groovy/{LettuceSyncClientTest.groovy => Lettuce5SyncClientTest.groovy} (98%) diff --git a/dd-java-agent/instrumentation/lettuce-4/src/main/java/datadog/trace/instrumentation/lettuce/LettuceAsyncCommandsInstrumentation.java b/dd-java-agent/instrumentation/lettuce-4/src/main/java/datadog/trace/instrumentation/lettuce4/LettuceAsyncCommandsInstrumentation.java similarity index 96% rename from dd-java-agent/instrumentation/lettuce-4/src/main/java/datadog/trace/instrumentation/lettuce/LettuceAsyncCommandsInstrumentation.java rename to dd-java-agent/instrumentation/lettuce-4/src/main/java/datadog/trace/instrumentation/lettuce4/LettuceAsyncCommandsInstrumentation.java index e618650194a..d360d094296 100644 --- a/dd-java-agent/instrumentation/lettuce-4/src/main/java/datadog/trace/instrumentation/lettuce/LettuceAsyncCommandsInstrumentation.java +++ b/dd-java-agent/instrumentation/lettuce-4/src/main/java/datadog/trace/instrumentation/lettuce4/LettuceAsyncCommandsInstrumentation.java @@ -1,4 +1,4 @@ -package datadog.trace.instrumentation.lettuce; +package datadog.trace.instrumentation.lettuce4; import static java.util.Collections.singletonMap; import static net.bytebuddy.matcher.ElementMatchers.isMethod; diff --git a/dd-java-agent/instrumentation/lettuce-4/src/main/java/datadog/trace/instrumentation/lettuce/LettuceClientInstrumentation.java b/dd-java-agent/instrumentation/lettuce-4/src/main/java/datadog/trace/instrumentation/lettuce4/LettuceClientInstrumentation.java similarity index 96% rename from dd-java-agent/instrumentation/lettuce-4/src/main/java/datadog/trace/instrumentation/lettuce/LettuceClientInstrumentation.java rename to dd-java-agent/instrumentation/lettuce-4/src/main/java/datadog/trace/instrumentation/lettuce4/LettuceClientInstrumentation.java index bb1d00119f8..d1fba502e79 100644 --- a/dd-java-agent/instrumentation/lettuce-4/src/main/java/datadog/trace/instrumentation/lettuce/LettuceClientInstrumentation.java +++ b/dd-java-agent/instrumentation/lettuce-4/src/main/java/datadog/trace/instrumentation/lettuce4/LettuceClientInstrumentation.java @@ -1,4 +1,4 @@ -package datadog.trace.instrumentation.lettuce; +package datadog.trace.instrumentation.lettuce4; import static java.util.Collections.singletonMap; import static net.bytebuddy.matcher.ElementMatchers.isMethod; diff --git a/dd-java-agent/instrumentation/lettuce-4/src/main/java8/datadog/trace/instrumentation/lettuce/InstrumentationPoints.java b/dd-java-agent/instrumentation/lettuce-4/src/main/java8/datadog/trace/instrumentation/lettuce4/InstrumentationPoints.java similarity index 97% rename from dd-java-agent/instrumentation/lettuce-4/src/main/java8/datadog/trace/instrumentation/lettuce/InstrumentationPoints.java rename to dd-java-agent/instrumentation/lettuce-4/src/main/java8/datadog/trace/instrumentation/lettuce4/InstrumentationPoints.java index 1d04f1efb82..8d837238e75 100644 --- a/dd-java-agent/instrumentation/lettuce-4/src/main/java8/datadog/trace/instrumentation/lettuce/InstrumentationPoints.java +++ b/dd-java-agent/instrumentation/lettuce-4/src/main/java8/datadog/trace/instrumentation/lettuce4/InstrumentationPoints.java @@ -1,4 +1,4 @@ -package datadog.trace.instrumentation.lettuce; +package datadog.trace.instrumentation.lettuce4; import static com.lambdaworks.redis.protocol.CommandKeyword.SEGFAULT; import static com.lambdaworks.redis.protocol.CommandType.CLIENT; @@ -10,7 +10,7 @@ import static com.lambdaworks.redis.protocol.CommandType.SHUTDOWN; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; -import static datadog.trace.instrumentation.lettuce.LettuceClientDecorator.DECORATE; +import static datadog.trace.instrumentation.lettuce4.LettuceClientDecorator.DECORATE; import com.lambdaworks.redis.RedisURI; import com.lambdaworks.redis.protocol.AsyncCommand; diff --git a/dd-java-agent/instrumentation/lettuce-4/src/main/java8/datadog/trace/instrumentation/lettuce/LettuceAsyncCommandsAdvice.java b/dd-java-agent/instrumentation/lettuce-4/src/main/java8/datadog/trace/instrumentation/lettuce4/LettuceAsyncCommandsAdvice.java similarity index 94% rename from dd-java-agent/instrumentation/lettuce-4/src/main/java8/datadog/trace/instrumentation/lettuce/LettuceAsyncCommandsAdvice.java rename to dd-java-agent/instrumentation/lettuce-4/src/main/java8/datadog/trace/instrumentation/lettuce4/LettuceAsyncCommandsAdvice.java index 68002ccf99d..fc7ceb9d504 100644 --- a/dd-java-agent/instrumentation/lettuce-4/src/main/java8/datadog/trace/instrumentation/lettuce/LettuceAsyncCommandsAdvice.java +++ b/dd-java-agent/instrumentation/lettuce-4/src/main/java8/datadog/trace/instrumentation/lettuce4/LettuceAsyncCommandsAdvice.java @@ -1,4 +1,4 @@ -package datadog.trace.instrumentation.lettuce; +package datadog.trace.instrumentation.lettuce4; import com.lambdaworks.redis.protocol.AsyncCommand; import com.lambdaworks.redis.protocol.RedisCommand; @@ -20,5 +20,4 @@ public static void onExit( @Advice.Return final AsyncCommand asyncCommand) { InstrumentationPoints.afterCommand(command, scope, throwable, asyncCommand); } - } diff --git a/dd-java-agent/instrumentation/lettuce-4/src/main/java8/datadog/trace/instrumentation/lettuce/LettuceClientDecorator.java b/dd-java-agent/instrumentation/lettuce-4/src/main/java8/datadog/trace/instrumentation/lettuce4/LettuceClientDecorator.java similarity index 68% rename from dd-java-agent/instrumentation/lettuce-4/src/main/java8/datadog/trace/instrumentation/lettuce/LettuceClientDecorator.java rename to dd-java-agent/instrumentation/lettuce-4/src/main/java8/datadog/trace/instrumentation/lettuce4/LettuceClientDecorator.java index c9084db3d8d..69d413378a8 100644 --- a/dd-java-agent/instrumentation/lettuce-4/src/main/java8/datadog/trace/instrumentation/lettuce/LettuceClientDecorator.java +++ b/dd-java-agent/instrumentation/lettuce-4/src/main/java8/datadog/trace/instrumentation/lettuce4/LettuceClientDecorator.java @@ -1,6 +1,6 @@ -package datadog.trace.instrumentation.lettuce; +package datadog.trace.instrumentation.lettuce4; -import static datadog.trace.instrumentation.lettuce.InstrumentationPoints.getCommandResourceName; +import static datadog.trace.instrumentation.lettuce4.InstrumentationPoints.getCommandResourceName; import com.lambdaworks.redis.RedisURI; import com.lambdaworks.redis.protocol.RedisCommand; @@ -40,17 +40,17 @@ protected String dbType() { } @Override - protected String dbUser(RedisURI connection) { + protected String dbUser(final RedisURI connection) { return null; } @Override - protected String dbInstance(RedisURI connection) { + protected String dbInstance(final RedisURI connection) { return null; } @Override - public AgentSpan onConnection(AgentSpan span, RedisURI connection) { + public AgentSpan onConnection(final AgentSpan span, final RedisURI connection) { if (connection != null) { span.setTag(Tags.PEER_HOSTNAME, connection.getHost()); span.setTag(Tags.PEER_PORT, connection.getPort()); @@ -60,18 +60,19 @@ public AgentSpan onConnection(AgentSpan span, RedisURI connection) { return super.onConnection(span, connection); } - public AgentSpan onCommand(AgentSpan span, RedisCommand command) { - span.setTag(DDTags.RESOURCE_NAME, + public AgentSpan onCommand(final AgentSpan span, final RedisCommand command) { + span.setTag( + DDTags.RESOURCE_NAME, null == command ? "Redis Command" : getCommandResourceName(command.getType())); return span; } - private static String resourceName(RedisURI connection) { + private static String resourceName(final RedisURI connection) { return "CONNECT:" - + connection.getHost() - + ":" - + connection.getPort() - + "/" - + connection.getDatabase(); + + connection.getHost() + + ":" + + connection.getPort() + + "/" + + connection.getDatabase(); } } diff --git a/dd-java-agent/instrumentation/lettuce-4/src/main/java8/datadog/trace/instrumentation/lettuce/RedisConnectionAdvice.java b/dd-java-agent/instrumentation/lettuce-4/src/main/java8/datadog/trace/instrumentation/lettuce4/RedisConnectionAdvice.java similarity index 73% rename from dd-java-agent/instrumentation/lettuce-4/src/main/java8/datadog/trace/instrumentation/lettuce/RedisConnectionAdvice.java rename to dd-java-agent/instrumentation/lettuce-4/src/main/java8/datadog/trace/instrumentation/lettuce4/RedisConnectionAdvice.java index e2cf6bd0123..c240134fa5f 100644 --- a/dd-java-agent/instrumentation/lettuce-4/src/main/java8/datadog/trace/instrumentation/lettuce/RedisConnectionAdvice.java +++ b/dd-java-agent/instrumentation/lettuce-4/src/main/java8/datadog/trace/instrumentation/lettuce4/RedisConnectionAdvice.java @@ -1,4 +1,4 @@ -package datadog.trace.instrumentation.lettuce; +package datadog.trace.instrumentation.lettuce4; import com.lambdaworks.redis.RedisURI; import datadog.trace.bootstrap.instrumentation.api.AgentScope; @@ -12,8 +12,8 @@ public static AgentScope onEnter(@Advice.Argument(1) final RedisURI redisURI) { } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) - public static void onExit(@Advice.Enter final AgentScope scope, - @Advice.Thrown final Throwable throwable) { + public static void onExit( + @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { InstrumentationPoints.afterConnect(scope, throwable); } } diff --git a/dd-java-agent/instrumentation/lettuce-4/src/test/groovy/LettuceAsyncClientTest.groovy b/dd-java-agent/instrumentation/lettuce-4/src/test/groovy/Lettuce4AsyncClientTest.groovy similarity index 98% rename from dd-java-agent/instrumentation/lettuce-4/src/test/groovy/LettuceAsyncClientTest.groovy rename to dd-java-agent/instrumentation/lettuce-4/src/test/groovy/Lettuce4AsyncClientTest.groovy index d1ce0c72615..c9c7722fa17 100644 --- a/dd-java-agent/instrumentation/lettuce-4/src/test/groovy/LettuceAsyncClientTest.groovy +++ b/dd-java-agent/instrumentation/lettuce-4/src/test/groovy/Lettuce4AsyncClientTest.groovy @@ -1,20 +1,20 @@ import com.lambdaworks.redis.ClientOptions import com.lambdaworks.redis.RedisClient +import com.lambdaworks.redis.RedisConnectionException import com.lambdaworks.redis.RedisFuture import com.lambdaworks.redis.RedisURI import com.lambdaworks.redis.api.StatefulConnection import com.lambdaworks.redis.api.async.RedisAsyncCommands import com.lambdaworks.redis.api.sync.RedisCommands +import com.lambdaworks.redis.codec.Utf8StringCodec import com.lambdaworks.redis.protocol.AsyncCommand import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.utils.PortUtils import datadog.trace.api.DDSpanTypes import datadog.trace.bootstrap.instrumentation.api.Tags - import redis.embedded.RedisServer import spock.lang.Shared import spock.util.concurrent.AsyncConditions -import com.lambdaworks.redis.codec.Utf8StringCodec import java.util.concurrent.CancellationException import java.util.concurrent.TimeUnit @@ -23,11 +23,9 @@ import java.util.function.BiFunction import java.util.function.Consumer import java.util.function.Function -import com.lambdaworks.redis.RedisConnectionException - -import static datadog.trace.instrumentation.lettuce.InstrumentationPoints.AGENT_CRASHING_COMMAND_PREFIX +import static datadog.trace.instrumentation.lettuce4.InstrumentationPoints.AGENT_CRASHING_COMMAND_PREFIX -class LettuceAsyncClientTest extends AgentTestRunner { +class Lettuce4AsyncClientTest extends AgentTestRunner { public static final String HOST = "127.0.0.1" public static final int DB_INDEX = 0 // Disable autoreconnect so we do not get stray traces popping up on server shutdown @@ -107,7 +105,7 @@ class LettuceAsyncClientTest extends AgentTestRunner { when: StatefulConnection connection = testConnectionClient.connect(new Utf8StringCodec(), - new RedisURI(HOST, port, 3, TimeUnit.SECONDS)) + new RedisURI(HOST, port, 3, TimeUnit.SECONDS)) then: connection != null diff --git a/dd-java-agent/instrumentation/lettuce-4/src/test/groovy/LettuceSyncClientTest.groovy b/dd-java-agent/instrumentation/lettuce-4/src/test/groovy/Lettuce4SyncClientTest.groovy similarity index 98% rename from dd-java-agent/instrumentation/lettuce-4/src/test/groovy/LettuceSyncClientTest.groovy rename to dd-java-agent/instrumentation/lettuce-4/src/test/groovy/Lettuce4SyncClientTest.groovy index b05d2eb23e8..86e9d0a1f36 100644 --- a/dd-java-agent/instrumentation/lettuce-4/src/test/groovy/LettuceSyncClientTest.groovy +++ b/dd-java-agent/instrumentation/lettuce-4/src/test/groovy/Lettuce4SyncClientTest.groovy @@ -10,9 +10,9 @@ import datadog.trace.bootstrap.instrumentation.api.Tags import redis.embedded.RedisServer import spock.lang.Shared -import static datadog.trace.instrumentation.lettuce.InstrumentationPoints.AGENT_CRASHING_COMMAND_PREFIX +import static datadog.trace.instrumentation.lettuce4.InstrumentationPoints.AGENT_CRASHING_COMMAND_PREFIX -class LettuceSyncClientTest extends AgentTestRunner { +class Lettuce4SyncClientTest extends AgentTestRunner { public static final String HOST = "127.0.0.1" public static final int DB_INDEX = 0 // Disable autoreconnect so we do not get stray traces popping up on server shutdown diff --git a/dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/lettuce/LettuceAsyncCommandsInstrumentation.java b/dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceAsyncCommandsInstrumentation.java similarity index 96% rename from dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/lettuce/LettuceAsyncCommandsInstrumentation.java rename to dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceAsyncCommandsInstrumentation.java index 4423c72fd14..0999197a4da 100644 --- a/dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/lettuce/LettuceAsyncCommandsInstrumentation.java +++ b/dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceAsyncCommandsInstrumentation.java @@ -1,4 +1,4 @@ -package datadog.trace.instrumentation.lettuce; +package datadog.trace.instrumentation.lettuce5; import static java.util.Collections.singletonMap; import static net.bytebuddy.matcher.ElementMatchers.isMethod; diff --git a/dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/lettuce/LettuceClientInstrumentation.java b/dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceClientInstrumentation.java similarity index 97% rename from dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/lettuce/LettuceClientInstrumentation.java rename to dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceClientInstrumentation.java index 1820fd20835..32d564bc205 100644 --- a/dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/lettuce/LettuceClientInstrumentation.java +++ b/dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceClientInstrumentation.java @@ -1,4 +1,4 @@ -package datadog.trace.instrumentation.lettuce; +package datadog.trace.instrumentation.lettuce5; import static java.util.Collections.singletonMap; import static net.bytebuddy.matcher.ElementMatchers.isMethod; diff --git a/dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/lettuce/LettuceReactiveCommandsInstrumentation.java b/dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceReactiveCommandsInstrumentation.java similarity index 98% rename from dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/lettuce/LettuceReactiveCommandsInstrumentation.java rename to dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceReactiveCommandsInstrumentation.java index 2f3c0837652..2d1bf246477 100644 --- a/dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/lettuce/LettuceReactiveCommandsInstrumentation.java +++ b/dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceReactiveCommandsInstrumentation.java @@ -1,4 +1,4 @@ -package datadog.trace.instrumentation.lettuce; +package datadog.trace.instrumentation.lettuce5; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isPublic; diff --git a/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/ConnectionFutureAdvice.java b/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce5/ConnectionFutureAdvice.java similarity index 91% rename from dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/ConnectionFutureAdvice.java rename to dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce5/ConnectionFutureAdvice.java index 40c835624d5..5aac19b328b 100644 --- a/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/ConnectionFutureAdvice.java +++ b/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce5/ConnectionFutureAdvice.java @@ -1,8 +1,8 @@ -package datadog.trace.instrumentation.lettuce; +package datadog.trace.instrumentation.lettuce5; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; -import static datadog.trace.instrumentation.lettuce.LettuceClientDecorator.DECORATE; +import static datadog.trace.instrumentation.lettuce5.LettuceClientDecorator.DECORATE; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; diff --git a/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/LettuceAsyncBiFunction.java b/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce5/LettuceAsyncBiFunction.java similarity index 88% rename from dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/LettuceAsyncBiFunction.java rename to dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce5/LettuceAsyncBiFunction.java index 5fd53c0bcf3..f9c1a34d83f 100644 --- a/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/LettuceAsyncBiFunction.java +++ b/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce5/LettuceAsyncBiFunction.java @@ -1,6 +1,6 @@ -package datadog.trace.instrumentation.lettuce; +package datadog.trace.instrumentation.lettuce5; -import static datadog.trace.instrumentation.lettuce.LettuceClientDecorator.DECORATE; +import static datadog.trace.instrumentation.lettuce5.LettuceClientDecorator.DECORATE; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.util.concurrent.CancellationException; diff --git a/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/LettuceAsyncCommandsAdvice.java b/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce5/LettuceAsyncCommandsAdvice.java similarity index 87% rename from dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/LettuceAsyncCommandsAdvice.java rename to dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce5/LettuceAsyncCommandsAdvice.java index 11ad946e718..78f3e7decdd 100644 --- a/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/LettuceAsyncCommandsAdvice.java +++ b/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce5/LettuceAsyncCommandsAdvice.java @@ -1,9 +1,9 @@ -package datadog.trace.instrumentation.lettuce; +package datadog.trace.instrumentation.lettuce5; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; -import static datadog.trace.instrumentation.lettuce.LettuceClientDecorator.DECORATE; -import static datadog.trace.instrumentation.lettuce.LettuceInstrumentationUtil.expectsResponse; +import static datadog.trace.instrumentation.lettuce5.LettuceClientDecorator.DECORATE; +import static datadog.trace.instrumentation.lettuce5.LettuceInstrumentationUtil.expectsResponse; import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; diff --git a/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/LettuceClientDecorator.java b/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce5/LettuceClientDecorator.java similarity index 97% rename from dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/LettuceClientDecorator.java rename to dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce5/LettuceClientDecorator.java index 9dfccb0d055..cdb0f52d36b 100644 --- a/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/LettuceClientDecorator.java +++ b/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce5/LettuceClientDecorator.java @@ -1,4 +1,4 @@ -package datadog.trace.instrumentation.lettuce; +package datadog.trace.instrumentation.lettuce5; import datadog.trace.api.DDSpanTypes; import datadog.trace.api.DDTags; diff --git a/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/LettuceInstrumentationUtil.java b/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce5/LettuceInstrumentationUtil.java similarity index 98% rename from dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/LettuceInstrumentationUtil.java rename to dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce5/LettuceInstrumentationUtil.java index 3db762081fa..87b8efac443 100644 --- a/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/LettuceInstrumentationUtil.java +++ b/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce5/LettuceInstrumentationUtil.java @@ -1,4 +1,4 @@ -package datadog.trace.instrumentation.lettuce; +package datadog.trace.instrumentation.lettuce5; import io.lettuce.core.protocol.RedisCommand; import java.util.Arrays; diff --git a/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/rx/LettuceFluxCreationAdvice.java b/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce5/rx/LettuceFluxCreationAdvice.java similarity index 89% rename from dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/rx/LettuceFluxCreationAdvice.java rename to dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce5/rx/LettuceFluxCreationAdvice.java index b3d0ea8d7c4..65d2e5f8267 100644 --- a/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/rx/LettuceFluxCreationAdvice.java +++ b/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce5/rx/LettuceFluxCreationAdvice.java @@ -1,6 +1,6 @@ -package datadog.trace.instrumentation.lettuce.rx; +package datadog.trace.instrumentation.lettuce5.rx; -import static datadog.trace.instrumentation.lettuce.LettuceInstrumentationUtil.expectsResponse; +import static datadog.trace.instrumentation.lettuce5.LettuceInstrumentationUtil.expectsResponse; import io.lettuce.core.protocol.RedisCommand; import java.util.function.Supplier; diff --git a/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/rx/LettuceFluxTerminationRunnable.java b/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce5/rx/LettuceFluxTerminationRunnable.java similarity index 95% rename from dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/rx/LettuceFluxTerminationRunnable.java rename to dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce5/rx/LettuceFluxTerminationRunnable.java index e0eef191008..5119189ff79 100644 --- a/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/rx/LettuceFluxTerminationRunnable.java +++ b/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce5/rx/LettuceFluxTerminationRunnable.java @@ -1,7 +1,7 @@ -package datadog.trace.instrumentation.lettuce.rx; +package datadog.trace.instrumentation.lettuce5.rx; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; -import static datadog.trace.instrumentation.lettuce.LettuceClientDecorator.DECORATE; +import static datadog.trace.instrumentation.lettuce5.LettuceClientDecorator.DECORATE; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import io.lettuce.core.protocol.RedisCommand; diff --git a/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/rx/LettuceMonoCreationAdvice.java b/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce5/rx/LettuceMonoCreationAdvice.java similarity index 88% rename from dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/rx/LettuceMonoCreationAdvice.java rename to dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce5/rx/LettuceMonoCreationAdvice.java index 1c7bad34db2..fef7cc3be67 100644 --- a/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/rx/LettuceMonoCreationAdvice.java +++ b/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce5/rx/LettuceMonoCreationAdvice.java @@ -1,6 +1,6 @@ -package datadog.trace.instrumentation.lettuce.rx; +package datadog.trace.instrumentation.lettuce5.rx; -import static datadog.trace.instrumentation.lettuce.LettuceInstrumentationUtil.expectsResponse; +import static datadog.trace.instrumentation.lettuce5.LettuceInstrumentationUtil.expectsResponse; import io.lettuce.core.protocol.RedisCommand; import java.util.function.Supplier; diff --git a/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/rx/LettuceMonoDualConsumer.java b/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce5/rx/LettuceMonoDualConsumer.java similarity index 91% rename from dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/rx/LettuceMonoDualConsumer.java rename to dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce5/rx/LettuceMonoDualConsumer.java index 3699c7f3d1c..612982fbd45 100644 --- a/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce/rx/LettuceMonoDualConsumer.java +++ b/dd-java-agent/instrumentation/lettuce-5/src/main/java8/datadog/trace/instrumentation/lettuce5/rx/LettuceMonoDualConsumer.java @@ -1,7 +1,7 @@ -package datadog.trace.instrumentation.lettuce.rx; +package datadog.trace.instrumentation.lettuce5.rx; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; -import static datadog.trace.instrumentation.lettuce.LettuceClientDecorator.DECORATE; +import static datadog.trace.instrumentation.lettuce5.LettuceClientDecorator.DECORATE; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import io.lettuce.core.protocol.RedisCommand; diff --git a/dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceAsyncClientTest.groovy b/dd-java-agent/instrumentation/lettuce-5/src/test/groovy/Lettuce5AsyncClientTest.groovy similarity index 98% rename from dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceAsyncClientTest.groovy rename to dd-java-agent/instrumentation/lettuce-5/src/test/groovy/Lettuce5AsyncClientTest.groovy index 481b5a1040e..06ab5a1e1e9 100644 --- a/dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceAsyncClientTest.groovy +++ b/dd-java-agent/instrumentation/lettuce-5/src/test/groovy/Lettuce5AsyncClientTest.groovy @@ -25,9 +25,9 @@ import java.util.function.BiFunction import java.util.function.Consumer import java.util.function.Function -import static datadog.trace.instrumentation.lettuce.LettuceInstrumentationUtil.AGENT_CRASHING_COMMAND_PREFIX +import static datadog.trace.instrumentation.lettuce5.LettuceInstrumentationUtil.AGENT_CRASHING_COMMAND_PREFIX -class LettuceAsyncClientTest extends AgentTestRunner { +class Lettuce5AsyncClientTest extends AgentTestRunner { public static final String HOST = "127.0.0.1" public static final int DB_INDEX = 0 // Disable autoreconnect so we do not get stray traces popping up on server shutdown diff --git a/dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceReactiveClientTest.groovy b/dd-java-agent/instrumentation/lettuce-5/src/test/groovy/Lettuce5ReactiveClientTest.groovy similarity index 98% rename from dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceReactiveClientTest.groovy rename to dd-java-agent/instrumentation/lettuce-5/src/test/groovy/Lettuce5ReactiveClientTest.groovy index 2f20c687739..625939b696d 100644 --- a/dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceReactiveClientTest.groovy +++ b/dd-java-agent/instrumentation/lettuce-5/src/test/groovy/Lettuce5ReactiveClientTest.groovy @@ -18,9 +18,9 @@ import spock.util.concurrent.AsyncConditions import java.util.function.Consumer import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace -import static datadog.trace.instrumentation.lettuce.LettuceInstrumentationUtil.AGENT_CRASHING_COMMAND_PREFIX +import static datadog.trace.instrumentation.lettuce5.LettuceInstrumentationUtil.AGENT_CRASHING_COMMAND_PREFIX -class LettuceReactiveClientTest extends AgentTestRunner { +class Lettuce5ReactiveClientTest extends AgentTestRunner { public static final String HOST = "127.0.0.1" public static final int DB_INDEX = 0 // Disable autoreconnect so we do not get stray traces popping up on server shutdown diff --git a/dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceSyncClientTest.groovy b/dd-java-agent/instrumentation/lettuce-5/src/test/groovy/Lettuce5SyncClientTest.groovy similarity index 98% rename from dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceSyncClientTest.groovy rename to dd-java-agent/instrumentation/lettuce-5/src/test/groovy/Lettuce5SyncClientTest.groovy index 0fb0ace7cae..e1bdcece9fa 100644 --- a/dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceSyncClientTest.groovy +++ b/dd-java-agent/instrumentation/lettuce-5/src/test/groovy/Lettuce5SyncClientTest.groovy @@ -12,9 +12,9 @@ import spock.lang.Shared import java.util.concurrent.CompletionException -import static datadog.trace.instrumentation.lettuce.LettuceInstrumentationUtil.AGENT_CRASHING_COMMAND_PREFIX +import static datadog.trace.instrumentation.lettuce5.LettuceInstrumentationUtil.AGENT_CRASHING_COMMAND_PREFIX -class LettuceSyncClientTest extends AgentTestRunner { +class Lettuce5SyncClientTest extends AgentTestRunner { public static final String HOST = "127.0.0.1" public static final int DB_INDEX = 0 // Disable autoreconnect so we do not get stray traces popping up on server shutdown From d7a8148d84a01cd399432b252e71b2ca28a4bbe8 Mon Sep 17 00:00:00 2001 From: Brian Devins-Suresh Date: Tue, 12 May 2020 15:41:13 -0400 Subject: [PATCH 2/2] Prevent this from happening in the future, verified locally against master --- dd-java-agent/instrumentation/instrumentation.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/dd-java-agent/instrumentation/instrumentation.gradle b/dd-java-agent/instrumentation/instrumentation.gradle index a3583a3c3b0..15e2a77242a 100644 --- a/dd-java-agent/instrumentation/instrumentation.gradle +++ b/dd-java-agent/instrumentation/instrumentation.gradle @@ -83,6 +83,7 @@ dependencies { } shadowJar { + duplicatesStrategy = DuplicatesStrategy.FAIL dependencies deps.sharedInverse dependencies { exclude(project(':dd-java-agent:agent-bootstrap'))