From a57a7ddd8a26e00272c24262601e8f13ee74f8a8 Mon Sep 17 00:00:00 2001 From: Jay DeLuca Date: Tue, 17 Oct 2023 08:23:11 -0400 Subject: [PATCH] fix library tests --- .../instrumentation/lettuce/v5_1/LettuceSyncClientTest.java | 4 ++-- .../lettuce/v5_1/AbstractLettuceClientTest.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/instrumentation/lettuce/lettuce-5.1/library/src/test/java/io/opentelemetry/instrumentation/lettuce/v5_1/LettuceSyncClientTest.java b/instrumentation/lettuce/lettuce-5.1/library/src/test/java/io/opentelemetry/instrumentation/lettuce/v5_1/LettuceSyncClientTest.java index 5a790332bb6e..1cb08a07e400 100644 --- a/instrumentation/lettuce/lettuce-5.1/library/src/test/java/io/opentelemetry/instrumentation/lettuce/v5_1/LettuceSyncClientTest.java +++ b/instrumentation/lettuce/lettuce-5.1/library/src/test/java/io/opentelemetry/instrumentation/lettuce/v5_1/LettuceSyncClientTest.java @@ -14,11 +14,11 @@ class LettuceSyncClientTest extends AbstractLettuceSyncClientTest { @RegisterExtension - static InstrumentationExtension testing = LibraryInstrumentationExtension.create(); + static InstrumentationExtension agentTesting = LibraryInstrumentationExtension.create(); @Override public InstrumentationExtension getInstrumentationExtension() { - return testing; + return agentTesting; } @Override diff --git a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceClientTest.java b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceClientTest.java index e72501753546..79119f4c00aa 100644 --- a/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceClientTest.java +++ b/instrumentation/lettuce/lettuce-5.1/testing/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/AbstractLettuceClientTest.java @@ -23,7 +23,7 @@ abstract class AbstractLettuceClientTest { protected static final Logger logger = LoggerFactory.getLogger(AbstractLettuceClientTest.class); @RegisterExtension - static InstrumentationExtension agentTesting = AgentInstrumentationExtension.create(); + public static InstrumentationExtension agentTesting = AgentInstrumentationExtension.create(); public InstrumentationExtension getInstrumentationExtension() { return agentTesting; @@ -49,7 +49,7 @@ public InstrumentationExtension getInstrumentationExtension() { protected static int port; protected static String embeddedDbUri; - protected static ContainerConnection newContainerConnection() { + protected ContainerConnection newContainerConnection() { GenericContainer server = new GenericContainer<>("redis:6.2.3-alpine") .withExposedPorts(6379) @@ -60,7 +60,7 @@ protected static ContainerConnection newContainerConnection() { long serverPort = server.getMappedPort(6379); - RedisClient client = RedisClient.create("redis://" + host + ":" + serverPort + "/" + DB_INDEX); + RedisClient client = createClient("redis://" + host + ":" + serverPort + "/" + DB_INDEX); client.setOptions(LettuceTestUtil.CLIENT_OPTIONS); cleanup.deferCleanup(client::shutdown);