Skip to content

Commit 46428dc

Browse files
author
Andrew Kent
committed
Enable Lettuce instrumentation by default
1 parent 37a54b5 commit 46428dc

File tree

6 files changed

+1
-31
lines changed

6 files changed

+1
-31
lines changed

dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/lettuce/LettuceAsyncCommandsInstrumentation.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@ public LettuceAsyncCommandsInstrumentation() {
1616
super("lettuce", "lettuce-5-async");
1717
}
1818

19-
@Override
20-
protected boolean defaultEnabled() {
21-
return false;
22-
}
23-
2419
@Override
2520
public ElementMatcher typeMatcher() {
2621
return named("io.lettuce.core.AbstractRedisAsyncCommands");

dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/lettuce/LettuceClientInstrumentation.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@ public LettuceClientInstrumentation() {
2323
super("lettuce");
2424
}
2525

26-
@Override
27-
protected boolean defaultEnabled() {
28-
return false;
29-
}
30-
3126
@Override
3227
public ElementMatcher typeMatcher() {
3328
return named("io.lettuce.core.RedisClient");

dd-java-agent/instrumentation/lettuce-5/src/main/java/datadog/trace/instrumentation/lettuce/LettuceReactiveCommandsInstrumentation.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,6 @@ public LettuceReactiveCommandsInstrumentation() {
1818
super("lettuce", "lettuce-5-rx");
1919
}
2020

21-
@Override
22-
protected boolean defaultEnabled() {
23-
return false;
24-
}
25-
2621
@Override
2722
public ElementMatcher typeMatcher() {
2823
return named("io.lettuce.core.AbstractRedisReactiveCommands");

dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceAsyncClientTest.groovy

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@ import static datadog.trace.agent.test.ListWriterAssert.assertTraces
2727
import static datadog.trace.instrumentation.lettuce.LettuceInstrumentationUtil.AGENT_CRASHING_COMMAND_PREFIX
2828

2929
class LettuceAsyncClientTest extends AgentTestRunner {
30-
31-
static {
32-
System.setProperty("dd.integration.lettuce.enabled", "true")
33-
}
34-
3530
public static final String HOST = "127.0.0.1"
3631
public static final int PORT = TestUtils.randomOpenPort()
3732
public static final int INCORRECT_PORT = TestUtils.randomOpenPort()

dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceReactiveClientTest.groovy

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@ import static datadog.trace.agent.test.ListWriterAssert.assertTraces
1414
import static datadog.trace.instrumentation.lettuce.LettuceInstrumentationUtil.AGENT_CRASHING_COMMAND_PREFIX
1515

1616
class LettuceReactiveClientTest extends AgentTestRunner {
17-
18-
static {
19-
System.setProperty("dd.integration.lettuce.enabled", "true")
20-
}
21-
2217
public static final String HOST = "127.0.0.1"
2318
public static final int PORT = TestUtils.randomOpenPort()
2419
public static final int DB_INDEX = 0
@@ -60,7 +55,7 @@ class LettuceReactiveClientTest extends AgentTestRunner {
6055
connection.close()
6156
redisServer.stop()
6257
}
63-
58+
6459
def "set command with subscribe on a defined consumer"() {
6560
setup:
6661
def conds = new AsyncConditions()

dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceSyncClientTest.groovy

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@ import static datadog.trace.agent.test.ListWriterAssert.assertTraces
1414
import static datadog.trace.instrumentation.lettuce.LettuceInstrumentationUtil.AGENT_CRASHING_COMMAND_PREFIX
1515

1616
class LettuceSyncClientTest extends AgentTestRunner {
17-
18-
static {
19-
System.setProperty("dd.integration.lettuce.enabled", "true")
20-
}
21-
2217
public static final String HOST = "127.0.0.1"
2318
public static final int PORT = TestUtils.randomOpenPort()
2419
public static final int INCORRECT_PORT = TestUtils.randomOpenPort()

0 commit comments

Comments
 (0)