Skip to content

Fix tests to work with lettuce 7.0 #15120

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

Merged
merged 2 commits into from
Oct 24, 2025
Merged

Fix tests to work with lettuce 7.0 #15120

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
641f8f0
Fix tests to work with lettuce 7.0
trask Oct 23, 2025
87e9562
./gradlew spotlessApply
otelbot[bot] Oct 23, 2025
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
18 changes: 18 additions & 0 deletions ...java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientAuthTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,24 @@ void testAuthCommand() throws Exception {
maybeStable(DB_STATEMENT),
stringAssert ->
stringAssert.startsWith("CLIENT SETINFO lib-ver"))))),
trace ->
trace.hasSpansSatisfyingExactly(
span ->
span.hasName("CLIENT")
.hasKind(SpanKind.CLIENT)
.hasAttributesSatisfyingExactly(
addExtraAttributes(
equalTo(NETWORK_TYPE, "ipv4"),
equalTo(NETWORK_PEER_ADDRESS, ip),
equalTo(NETWORK_PEER_PORT, port),
equalTo(SERVER_ADDRESS, host),
equalTo(SERVER_PORT, port),
equalTo(maybeStable(DB_SYSTEM), "redis"),
satisfies(
maybeStable(DB_STATEMENT),
stringAssert ->
stringAssert.startsWith(
"CLIENT MAINT_NOTIFICATIONS"))))),
trace ->
trace.hasSpansSatisfyingExactly(
span ->
Expand Down
26 changes: 22 additions & 4 deletions ...ain/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceSyncClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,8 @@ void testListCommand() {
RedisCommands<String, String> commands = containerConnection.connection.sync();

if (Boolean.getBoolean("testLatestDeps")) {
// ignore CLIENT SETINFO traces
testing().waitForTraces(2);
// ignore CLIENT SETINFO and MAINT_NOTIFICATIONS traces
testing().waitForTraces(3);
testing().clearData();
}

Expand Down Expand Up @@ -417,6 +417,24 @@ void testDebugSegfaultCommandWithNoArgumentProducesNoSpan() {
maybeStable(DB_STATEMENT),
stringAssert ->
stringAssert.startsWith("CLIENT SETINFO lib-ver"))))),
trace ->
trace.hasSpansSatisfyingExactly(
span ->
span.hasName("CLIENT")
.hasKind(SpanKind.CLIENT)
.hasAttributesSatisfyingExactly(
addExtraAttributes(
equalTo(NETWORK_TYPE, "ipv4"),
equalTo(NETWORK_PEER_ADDRESS, ip),
equalTo(NETWORK_PEER_PORT, containerConnection.port),
equalTo(SERVER_ADDRESS, host),
equalTo(SERVER_PORT, containerConnection.port),
equalTo(maybeStable(DB_SYSTEM), "redis"),
satisfies(
maybeStable(DB_STATEMENT),
stringAssert ->
stringAssert.startsWith(
"CLIENT MAINT_NOTIFICATIONS"))))),
trace ->
trace.hasSpansSatisfyingExactly(
span ->
Expand Down Expand Up @@ -459,8 +477,8 @@ void testShutdownCommandProducesNoSpan() {
RedisCommands<String, String> commands = containerConnection.connection.sync();

if (Boolean.getBoolean("testLatestDeps")) {
// ignore CLIENT SETINFO traces
testing().waitForTraces(2);
// ignore CLIENT SETINFO and MAINT_NOTIFICATIONS traces
testing().waitForTraces(3);
testing().clearData();
}

Expand Down
Loading