Skip to content
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

Jump to bottom

Rename java packages for lettuce 4 and 5 to not have collisions #1450

Merged
merged 2 commits into from
May 13, 2020
Merged

Rename java packages for lettuce 4 and 5 to not have collisions #1450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
663992d
Rename java packages for lettuce 4 and 5
May 12, 2020
d7a8148
Prevent this from happening in the future, verified locally against m…
May 12, 2020
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
1 change: 1 addition & 0 deletions dd-java-agent/instrumentation/instrumentation.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ dependencies {
}

shadowJar {
duplicatesStrategy = DuplicatesStrategy.FAIL
dependencies deps.sharedInverse
dependencies {
exclude(project(':dd-java-agent:agent-bootstrap'))
Expand Down
2 changes: 1 addition & 1 deletion .../LettuceAsyncCommandsInstrumentation.java → .../LettuceAsyncCommandsInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...lettuce/LettuceClientInstrumentation.java → ...ettuce4/LettuceClientInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...tation/lettuce/InstrumentationPoints.java → ...ation/lettuce4/InstrumentationPoints.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions ...n/lettuce/LettuceAsyncCommandsAdvice.java → .../lettuce4/LettuceAsyncCommandsAdvice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -20,5 +20,4 @@ public static void onExit(
@Advice.Return final AsyncCommand<?, ?, ?> asyncCommand) {
InstrumentationPoints.afterCommand(command, scope, throwable, asyncCommand);
}

}
27 changes: 14 additions & 13 deletions ...ation/lettuce/LettuceClientDecorator.java → ...tion/lettuce4/LettuceClientDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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());
Expand All @@ -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();
}
}
6 changes: 3 additions & 3 deletions ...tation/lettuce/RedisConnectionAdvice.java → ...ation/lettuce4/RedisConnectionAdvice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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);
}
}
12 changes: 5 additions & 7 deletions ...test/groovy/LettuceAsyncClientTest.groovy → ...est/groovy/Lettuce4AsyncClientTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .../test/groovy/LettuceSyncClientTest.groovy → ...test/groovy/Lettuce4SyncClientTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .../LettuceAsyncCommandsInstrumentation.java → .../LettuceAsyncCommandsInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...lettuce/LettuceClientInstrumentation.java → ...ettuce5/LettuceClientInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ttuceReactiveCommandsInstrumentation.java → ...ttuceReactiveCommandsInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...ation/lettuce/ConnectionFutureAdvice.java → ...tion/lettuce5/ConnectionFutureAdvice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...ation/lettuce/LettuceAsyncBiFunction.java → ...tion/lettuce5/LettuceAsyncBiFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ...n/lettuce/LettuceAsyncCommandsAdvice.java → .../lettuce5/LettuceAsyncCommandsAdvice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ation/lettuce/LettuceClientDecorator.java → ...tion/lettuce5/LettuceClientDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package datadog.trace.instrumentation.lettuce;
package datadog.trace.instrumentation.lettuce5;

import datadog.trace.api.DDSpanTypes;
import datadog.trace.api.DDTags;
Expand Down
2 changes: 1 addition & 1 deletion ...n/lettuce/LettuceInstrumentationUtil.java → .../lettuce5/LettuceInstrumentationUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package datadog.trace.instrumentation.lettuce;
package datadog.trace.instrumentation.lettuce5;

import io.lettuce.core.protocol.RedisCommand;
import java.util.Arrays;
Expand Down
4 changes: 2 additions & 2 deletions ...lettuce/rx/LettuceFluxCreationAdvice.java → ...ettuce5/rx/LettuceFluxCreationAdvice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...ce/rx/LettuceFluxTerminationRunnable.java → ...e5/rx/LettuceFluxTerminationRunnable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...lettuce/rx/LettuceMonoCreationAdvice.java → ...ettuce5/rx/LettuceMonoCreationAdvice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...n/lettuce/rx/LettuceMonoDualConsumer.java → .../lettuce5/rx/LettuceMonoDualConsumer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...test/groovy/LettuceAsyncClientTest.groovy → ...est/groovy/Lettuce5AsyncClientTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...t/groovy/LettuceReactiveClientTest.groovy → .../groovy/Lettuce5ReactiveClientTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .../test/groovy/LettuceSyncClientTest.groovy → ...test/groovy/Lettuce5SyncClientTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down