Skip to content

Commit 9cce8a7

Browse files
lauritAlex Kats
laurit
authored and
Alex Kats
committed
Fix lettuce latest dep tests (open-telemetry#12552)
1 parent 49e69c8 commit 9cce8a7

File tree

14 files changed

+433
-366
lines changed

14 files changed

+433
-366
lines changed

‎instrumentation/lettuce/lettuce-5.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceAsyncClientTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class LettuceAsyncClientTest extends AbstractLettuceAsyncClientTest {
1616
static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
1717

1818
@Override
19-
public InstrumentationExtension getInstrumentationExtension() {
19+
public InstrumentationExtension testing() {
2020
return testing;
2121
}
2222

‎instrumentation/lettuce/lettuce-5.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceReactiveClientTest.java

+19-17
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class LettuceReactiveClientTest extends AbstractLettuceReactiveClientTest {
2424
static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
2525

2626
@Override
27-
public InstrumentationExtension getInstrumentationExtension() {
27+
public InstrumentationExtension testing() {
2828
return testing;
2929
}
3030

@@ -38,12 +38,12 @@ protected RedisClient createClient(String uri) {
3838
@SuppressWarnings("deprecation") // using deprecated semconv
3939
@Test
4040
void testAsyncSubscriberWithSpecificThreadPool() {
41-
getInstrumentationExtension()
41+
testing()
4242
.runWithSpan(
4343
"test-parent",
4444
() -> reactiveCommands.set("a", "1").then(reactiveCommands.get("a")).subscribe());
4545

46-
getInstrumentationExtension()
46+
testing()
4747
.waitAndAssertTraces(
4848
trace ->
4949
trace.hasSpansSatisfyingExactly(
@@ -53,13 +53,14 @@ void testAsyncSubscriberWithSpecificThreadPool() {
5353
.hasKind(SpanKind.CLIENT)
5454
.hasParent(trace.getSpan(0))
5555
.hasAttributesSatisfyingExactly(
56-
equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"),
57-
equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip),
58-
equalTo(NetworkAttributes.NETWORK_PEER_PORT, port),
59-
equalTo(ServerAttributes.SERVER_ADDRESS, host),
60-
equalTo(ServerAttributes.SERVER_PORT, port),
61-
equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"),
62-
equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET a ?"))
56+
addExtraAttributes(
57+
equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"),
58+
equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip),
59+
equalTo(NetworkAttributes.NETWORK_PEER_PORT, port),
60+
equalTo(ServerAttributes.SERVER_ADDRESS, host),
61+
equalTo(ServerAttributes.SERVER_PORT, port),
62+
equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"),
63+
equalTo(DbIncubatingAttributes.DB_STATEMENT, "SET a ?")))
6364
.hasEventsSatisfyingExactly(
6465
event -> event.hasName("redis.encode.start"),
6566
event -> event.hasName("redis.encode.end")),
@@ -68,13 +69,14 @@ void testAsyncSubscriberWithSpecificThreadPool() {
6869
.hasKind(SpanKind.CLIENT)
6970
.hasParent(trace.getSpan(0))
7071
.hasAttributesSatisfyingExactly(
71-
equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"),
72-
equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip),
73-
equalTo(NetworkAttributes.NETWORK_PEER_PORT, port),
74-
equalTo(ServerAttributes.SERVER_ADDRESS, host),
75-
equalTo(ServerAttributes.SERVER_PORT, port),
76-
equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"),
77-
equalTo(DbIncubatingAttributes.DB_STATEMENT, "GET a"))
72+
addExtraAttributes(
73+
equalTo(NetworkAttributes.NETWORK_TYPE, "ipv4"),
74+
equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip),
75+
equalTo(NetworkAttributes.NETWORK_PEER_PORT, port),
76+
equalTo(ServerAttributes.SERVER_ADDRESS, host),
77+
equalTo(ServerAttributes.SERVER_PORT, port),
78+
equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"),
79+
equalTo(DbIncubatingAttributes.DB_STATEMENT, "GET a")))
7880
.hasEventsSatisfyingExactly(
7981
event -> event.hasName("redis.encode.start"),
8082
event -> event.hasName("redis.encode.end"))));

‎instrumentation/lettuce/lettuce-5.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceSyncClientAuthTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class LettuceSyncClientAuthTest extends AbstractLettuceSyncClientTest {
1616
static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
1717

1818
@Override
19-
public InstrumentationExtension getInstrumentationExtension() {
19+
public InstrumentationExtension testing() {
2020
return testing;
2121
}
2222

‎instrumentation/lettuce/lettuce-5.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/lettuce/v5_1/LettuceSyncClientTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class LettuceSyncClientTest extends AbstractLettuceSyncClientTest {
1616
static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
1717

1818
@Override
19-
public InstrumentationExtension getInstrumentationExtension() {
19+
public InstrumentationExtension testing() {
2020
return testing;
2121
}
2222

‎instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ public synchronized Tracer.Span start(RedisCommand<?, ?, ?> command) {
234234
if (span == null) {
235235
throw new IllegalStateException("Span started but null, this is a programming error.");
236236
}
237-
span.updateName(command.getType().name());
237+
span.updateName(command.getType().toString());
238238

239239
if (command.getArgs() != null) {
240240
argsList = OtelCommandArgsUtil.getCommandArgs(command.getArgs());
@@ -306,6 +306,9 @@ public synchronized Tracer.Span annotate(String value) {
306306
@Override
307307
@CanIgnoreReturnValue
308308
public synchronized Tracer.Span tag(String key, String value) {
309+
if (value == null || value.isEmpty()) {
310+
return this;
311+
}
309312
if (key.equals("redis.args")) {
310313
argsString = value;
311314
return this;

‎instrumentation/lettuce/lettuce-5.1/library/src/test/java/io/opentelemetry/instrumentation/lettuce/v5_1/LettuceAsyncClientTest.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,15 @@ class LettuceAsyncClientTest extends AbstractLettuceAsyncClientTest {
1616
static InstrumentationExtension testing = LibraryInstrumentationExtension.create();
1717

1818
@Override
19-
public InstrumentationExtension getInstrumentationExtension() {
19+
public InstrumentationExtension testing() {
2020
return testing;
2121
}
2222

2323
@Override
2424
protected RedisClient createClient(String uri) {
2525
return RedisClient.create(
2626
ClientResources.builder()
27-
.tracing(
28-
LettuceTelemetry.create(getInstrumentationExtension().getOpenTelemetry())
29-
.newTracing())
27+
.tracing(LettuceTelemetry.create(testing().getOpenTelemetry()).newTracing())
3028
.build(),
3129
uri);
3230
}

‎instrumentation/lettuce/lettuce-5.1/library/src/test/java/io/opentelemetry/instrumentation/lettuce/v5_1/LettuceReactiveClientTest.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class LettuceReactiveClientTest extends AbstractLettuceReactiveClientTest {
1919
static final InstrumentationExtension testing = LibraryInstrumentationExtension.create();
2020

2121
@Override
22-
public InstrumentationExtension getInstrumentationExtension() {
22+
public InstrumentationExtension testing() {
2323
return testing;
2424
}
2525

@@ -29,9 +29,7 @@ public InstrumentationExtension getInstrumentationExtension() {
2929
protected RedisClient createClient(String uri) {
3030
return RedisClient.create(
3131
ClientResources.builder()
32-
.tracing(
33-
LettuceTelemetry.create(getInstrumentationExtension().getOpenTelemetry())
34-
.newTracing())
32+
.tracing(LettuceTelemetry.create(testing().getOpenTelemetry()).newTracing())
3533
.build(),
3634
uri);
3735
}

‎instrumentation/lettuce/lettuce-5.1/library/src/test/java/io/opentelemetry/instrumentation/lettuce/v5_1/LettuceSyncClientAuthTest.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,15 @@ class LettuceSyncClientAuthTest extends AbstractLettuceSyncClientAuthTest {
1616
static InstrumentationExtension testing = LibraryInstrumentationExtension.create();
1717

1818
@Override
19-
public InstrumentationExtension getInstrumentationExtension() {
19+
public InstrumentationExtension testing() {
2020
return testing;
2121
}
2222

2323
@Override
2424
protected RedisClient createClient(String uri) {
2525
return RedisClient.create(
2626
ClientResources.builder()
27-
.tracing(
28-
LettuceTelemetry.create(getInstrumentationExtension().getOpenTelemetry())
29-
.newTracing())
27+
.tracing(LettuceTelemetry.create(testing().getOpenTelemetry()).newTracing())
3028
.build(),
3129
uri);
3230
}

‎instrumentation/lettuce/lettuce-5.1/library/src/test/java/io/opentelemetry/instrumentation/lettuce/v5_1/LettuceSyncClientTest.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,15 @@ class LettuceSyncClientTest extends AbstractLettuceSyncClientTest {
1616
static final InstrumentationExtension testing = LibraryInstrumentationExtension.create();
1717

1818
@Override
19-
public InstrumentationExtension getInstrumentationExtension() {
19+
public InstrumentationExtension testing() {
2020
return testing;
2121
}
2222

2323
@Override
2424
protected RedisClient createClient(String uri) {
2525
return RedisClient.create(
2626
ClientResources.builder()
27-
.tracing(
28-
LettuceTelemetry.create(getInstrumentationExtension().getOpenTelemetry())
29-
.newTracing())
27+
.tracing(LettuceTelemetry.create(testing().getOpenTelemetry()).newTracing())
3028
.build(),
3129
uri);
3230
}

0 commit comments

Comments
 (0)