Skip to content

Commit 976ca64

Browse files
authored
Convert lettuce 5.1 SyncClientTest from groovy to java (#9697)
1 parent ff97f6c commit 976ca64

File tree

10 files changed

+647
-559
lines changed

10 files changed

+647
-559
lines changed

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

-17
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
6+
package io.opentelemetry.javaagent.instrumentation.lettuce.v5_1;
7+
8+
import io.lettuce.core.RedisClient;
9+
import io.opentelemetry.instrumentation.lettuce.v5_1.AbstractLettuceSyncClientTest;
10+
import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
11+
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
12+
import org.junit.jupiter.api.extension.RegisterExtension;
13+
14+
class LettuceSyncClientTest extends AbstractLettuceSyncClientTest {
15+
@RegisterExtension
16+
static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
17+
18+
@Override
19+
public InstrumentationExtension getInstrumentationExtension() {
20+
return testing;
21+
}
22+
23+
@Override
24+
protected RedisClient createClient(String uri) {
25+
return RedisClient.create(uri);
26+
}
27+
}

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

-21
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
6+
package io.opentelemetry.instrumentation.lettuce.v5_1;
7+
8+
import io.lettuce.core.RedisClient;
9+
import io.lettuce.core.resource.ClientResources;
10+
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
11+
import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension;
12+
import org.junit.jupiter.api.extension.RegisterExtension;
13+
14+
class LettuceSyncClientTest extends AbstractLettuceSyncClientTest {
15+
@RegisterExtension
16+
static final InstrumentationExtension testing = LibraryInstrumentationExtension.create();
17+
18+
@Override
19+
public InstrumentationExtension getInstrumentationExtension() {
20+
return testing;
21+
}
22+
23+
@Override
24+
protected RedisClient createClient(String uri) {
25+
return RedisClient.create(
26+
ClientResources.builder()
27+
.tracing(
28+
LettuceTelemetry.create(getInstrumentationExtension().getOpenTelemetry())
29+
.newTracing())
30+
.build(),
31+
uri);
32+
}
33+
}

instrumentation/lettuce/lettuce-5.1/testing/build.gradle.kts

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ plugins {
55
dependencies {
66
api(project(":testing-common"))
77

8-
api("io.lettuce:lettuce-core:5.1.0.RELEASE")
8+
// 6.0+ added protocolVersion access which allows forcing RESP2 for consistency in tests
9+
compileOnly("io.lettuce:lettuce-core:6.0.0.RELEASE")
910

1011
implementation("org.testcontainers:testcontainers")
1112
implementation("com.google.guava:guava")

0 commit comments

Comments
 (0)