Skip to content

Commit

Permalink
use non-obsolete ctor for RedisURI that also works in v6
Browse files Browse the repository at this point in the history
  • Loading branch information
vandonr committed Nov 12, 2024
1 parent a6c0094 commit e427cad
Showing 1 changed file with 5 additions and 4 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import static datadog.trace.instrumentation.lettuce5.LettuceInstrumentationUtil.AGENT_CRASHING_COMMAND_PREFIX

import com.redis.testcontainers.RedisContainer
import datadog.trace.agent.test.naming.VersionedNamingTestBase
import datadog.trace.agent.test.utils.PortUtils
Expand All @@ -20,6 +18,7 @@ import org.testcontainers.containers.wait.strategy.Wait
import spock.lang.Shared
import spock.util.concurrent.AsyncConditions

import java.time.Duration
import java.util.concurrent.CancellationException
import java.util.concurrent.CompletionException
import java.util.concurrent.ExecutionException
Expand All @@ -29,6 +28,8 @@ import java.util.function.BiFunction
import java.util.function.Consumer
import java.util.function.Function

import static datadog.trace.instrumentation.lettuce5.LettuceInstrumentationUtil.AGENT_CRASHING_COMMAND_PREFIX

abstract class Lettuce5AsyncClientTest extends VersionedNamingTestBase {
public static final int DB_INDEX = 0
// Disable autoreconnect so we do not get stray traces popping up on server shutdown
Expand Down Expand Up @@ -104,7 +105,7 @@ abstract class Lettuce5AsyncClientTest extends VersionedNamingTestBase {

when:
ConnectionFuture connectionFuture = testConnectionClient.connectAsync(StringCodec.UTF8,
new RedisURI(redisServer.getHost(), port, 3, TimeUnit.SECONDS))
new RedisURI(redisServer.getHost(), port, Duration.ofSeconds(3)))
StatefulConnection connection = connectionFuture.get()
TEST_WRITER.waitForTraces(1)

Expand Down Expand Up @@ -144,7 +145,7 @@ abstract class Lettuce5AsyncClientTest extends VersionedNamingTestBase {

when:
ConnectionFuture connectionFuture = testConnectionClient.connectAsync(StringCodec.UTF8,
new RedisURI(redisServer.getHost(), incorrectPort, 3, TimeUnit.SECONDS))
new RedisURI(redisServer.getHost(), incorrectPort, Duration.ofSeconds(3)))
StatefulConnection connection = connectionFuture.get()

then:
Expand Down

0 comments on commit e427cad

Please sign in to comment.