Skip to content

Commit 1624ee2

Browse files
amarzialiamarziali
authored
Use real docker IP on lettuce tests (#7785)
1 parent 6ec3446 commit 1624ee2

File tree

3 files changed

+45
-48
lines changed

3 files changed

+45
-48
lines changed

‎dd-java-agent/instrumentation/lettuce-5/src/test/groovy/Lettuce5AsyncClientTest.groovy‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import java.util.function.Consumer
3030
import java.util.function.Function
3131

3232
abstract class Lettuce5AsyncClientTest extends VersionedNamingTestBase {
33-
public static final String HOST = "127.0.0.1"
3433
public static final int DB_INDEX = 0
3534
// Disable autoreconnect so we do not get stray traces popping up on server shutdown
3635
public static final ClientOptions CLIENT_OPTIONS = ClientOptions.builder().autoReconnect(false).build()
@@ -69,8 +68,8 @@ abstract class Lettuce5AsyncClientTest extends VersionedNamingTestBase {
6968
println "Using redis: $redisServer.redisURI"
7069
port = redisServer.firstMappedPort
7170
incorrectPort = PortUtils.randomOpenPort()
72-
dbAddr = HOST + ":" + port + "/" + DB_INDEX
73-
dbAddrNonExistent = HOST + ":" + incorrectPort + "/" + DB_INDEX
71+
dbAddr = redisServer.getHost() + ":" + port + "/" + DB_INDEX
72+
dbAddrNonExistent = redisServer.getHost() + ":" + incorrectPort + "/" + DB_INDEX
7473
dbUriNonExistent = "redis://" + dbAddrNonExistent
7574
embeddedDbUri = "redis://" + dbAddr
7675
}
@@ -105,7 +104,7 @@ abstract class Lettuce5AsyncClientTest extends VersionedNamingTestBase {
105104

106105
when:
107106
ConnectionFuture connectionFuture = testConnectionClient.connectAsync(StringCodec.UTF8,
108-
new RedisURI(HOST, port, 3, TimeUnit.SECONDS))
107+
new RedisURI(redisServer.getHost(), port, 3, TimeUnit.SECONDS))
109108
StatefulConnection connection = connectionFuture.get()
110109
TEST_WRITER.waitForTraces(1)
111110

@@ -123,7 +122,7 @@ abstract class Lettuce5AsyncClientTest extends VersionedNamingTestBase {
123122
tags {
124123
"$Tags.COMPONENT" "redis-client"
125124
"$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
126-
"$Tags.PEER_HOSTNAME" HOST
125+
"$Tags.PEER_HOSTNAME" redisServer.getHost()
127126
"$Tags.PEER_PORT" port
128127
"$Tags.DB_TYPE" "redis"
129128
"db.redis.dbIndex" 0
@@ -145,7 +144,7 @@ abstract class Lettuce5AsyncClientTest extends VersionedNamingTestBase {
145144

146145
when:
147146
ConnectionFuture connectionFuture = testConnectionClient.connectAsync(StringCodec.UTF8,
148-
new RedisURI(HOST, incorrectPort, 3, TimeUnit.SECONDS))
147+
new RedisURI(redisServer.getHost(), incorrectPort, 3, TimeUnit.SECONDS))
149148
StatefulConnection connection = connectionFuture.get()
150149

151150
then:
@@ -163,7 +162,7 @@ abstract class Lettuce5AsyncClientTest extends VersionedNamingTestBase {
163162
tags {
164163
"$Tags.COMPONENT" "redis-client"
165164
"$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
166-
"$Tags.PEER_HOSTNAME" HOST
165+
"$Tags.PEER_HOSTNAME" redisServer.getHost()
167166
"$Tags.PEER_PORT" incorrectPort
168167
"$Tags.DB_TYPE" "redis"
169168
"db.redis.dbIndex" 0
@@ -195,7 +194,7 @@ abstract class Lettuce5AsyncClientTest extends VersionedNamingTestBase {
195194
tags {
196195
"$Tags.COMPONENT" "redis-client"
197196
"$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
198-
"$Tags.PEER_HOSTNAME" HOST
197+
"$Tags.PEER_HOSTNAME" redisServer.getHost()
199198
"$Tags.PEER_PORT" port
200199
"$Tags.DB_TYPE" "redis"
201200
"db.redis.dbIndex" 0
@@ -237,7 +236,7 @@ abstract class Lettuce5AsyncClientTest extends VersionedNamingTestBase {
237236
tags {
238237
"$Tags.COMPONENT" "redis-client"
239238
"$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
240-
"$Tags.PEER_HOSTNAME" HOST
239+
"$Tags.PEER_HOSTNAME" redisServer.getHost()
241240
"$Tags.PEER_PORT" port
242241
"$Tags.DB_TYPE" "redis"
243242
"db.redis.dbIndex" 0
@@ -293,7 +292,7 @@ abstract class Lettuce5AsyncClientTest extends VersionedNamingTestBase {
293292
tags {
294293
"$Tags.COMPONENT" "redis-client"
295294
"$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
296-
"$Tags.PEER_HOSTNAME" HOST
295+
"$Tags.PEER_HOSTNAME" redisServer.getHost()
297296
"$Tags.PEER_PORT" port
298297
"$Tags.DB_TYPE" "redis"
299298
"db.redis.dbIndex" 0
@@ -335,7 +334,7 @@ abstract class Lettuce5AsyncClientTest extends VersionedNamingTestBase {
335334
tags {
336335
"$Tags.COMPONENT" "redis-client"
337336
"$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
338-
"$Tags.PEER_HOSTNAME" HOST
337+
"$Tags.PEER_HOSTNAME" redisServer.getHost()
339338
"$Tags.PEER_PORT" port
340339
"$Tags.DB_TYPE" "redis"
341340
"db.redis.dbIndex" 0
@@ -396,7 +395,7 @@ abstract class Lettuce5AsyncClientTest extends VersionedNamingTestBase {
396395
tags {
397396
"$Tags.COMPONENT" "redis-client"
398397
"$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
399-
"$Tags.PEER_HOSTNAME" HOST
398+
"$Tags.PEER_HOSTNAME" redisServer.getHost()
400399
"$Tags.PEER_PORT" port
401400
"$Tags.DB_TYPE" "redis"
402401
"db.redis.dbIndex" 0
@@ -416,7 +415,7 @@ abstract class Lettuce5AsyncClientTest extends VersionedNamingTestBase {
416415
tags {
417416
"$Tags.COMPONENT" "redis-client"
418417
"$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
419-
"$Tags.PEER_HOSTNAME" HOST
418+
"$Tags.PEER_HOSTNAME" redisServer.getHost()
420419
"$Tags.PEER_PORT" port
421420
"$Tags.DB_TYPE" "redis"
422421
"db.redis.dbIndex" 0
@@ -465,7 +464,7 @@ abstract class Lettuce5AsyncClientTest extends VersionedNamingTestBase {
465464
tags {
466465
"$Tags.COMPONENT" "redis-client"
467466
"$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
468-
"$Tags.PEER_HOSTNAME" HOST
467+
"$Tags.PEER_HOSTNAME" redisServer.getHost()
469468
"$Tags.PEER_PORT" port
470469
"$Tags.DB_TYPE" "redis"
471470
"db.redis.dbIndex" 0
@@ -509,7 +508,7 @@ abstract class Lettuce5AsyncClientTest extends VersionedNamingTestBase {
509508
tags {
510509
"$Tags.COMPONENT" "redis-client"
511510
"$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
512-
"$Tags.PEER_HOSTNAME" HOST
511+
"$Tags.PEER_HOSTNAME" redisServer.getHost()
513512
"$Tags.PEER_PORT" port
514513
"$Tags.DB_TYPE" "redis"
515514
"db.redis.dbIndex" 0
@@ -539,7 +538,7 @@ abstract class Lettuce5AsyncClientTest extends VersionedNamingTestBase {
539538
tags {
540539
"$Tags.COMPONENT" "redis-client"
541540
"$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
542-
"$Tags.PEER_HOSTNAME" HOST
541+
"$Tags.PEER_HOSTNAME" redisServer.getHost()
543542
"$Tags.PEER_PORT" port
544543
"$Tags.DB_TYPE" "redis"
545544
"db.redis.dbIndex" 0
@@ -569,7 +568,7 @@ abstract class Lettuce5AsyncClientTest extends VersionedNamingTestBase {
569568
tags {
570569
"$Tags.COMPONENT" "redis-client"
571570
"$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
572-
"$Tags.PEER_HOSTNAME" HOST
571+
"$Tags.PEER_HOSTNAME" redisServer.getHost()
573572
"$Tags.PEER_PORT" port
574573
"$Tags.DB_TYPE" "redis"
575574
"db.redis.dbIndex" 0

‎dd-java-agent/instrumentation/lettuce-5/src/test/groovy/Lettuce5ReactiveClientTest.groovy‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import spock.util.concurrent.AsyncConditions
1919
import java.util.function.Consumer
2020

2121
abstract class Lettuce5ReactiveClientTest extends VersionedNamingTestBase {
22-
public static final String HOST = "127.0.0.1"
2322
public static final int DB_INDEX = 0
2423
// Disable autoreconnect so we do not get stray traces popping up on server shutdown
2524
public static final ClientOptions CLIENT_OPTIONS = ClientOptions.builder().autoReconnect(false).build()
@@ -49,7 +48,7 @@ abstract class Lettuce5ReactiveClientTest extends VersionedNamingTestBase {
4948
redisServer.start()
5049
println "Using redis: $redisServer.redisURI"
5150
port = redisServer.firstMappedPort
52-
String dbAddr = HOST + ":" + port + "/" + DB_INDEX
51+
String dbAddr = redisServer.getHost() + ":" + port + "/" + DB_INDEX
5352
embeddedDbUri = "redis://" + dbAddr
5453
redisClient = RedisClient.create(embeddedDbUri)
5554

@@ -103,7 +102,7 @@ abstract class Lettuce5ReactiveClientTest extends VersionedNamingTestBase {
103102
tags {
104103
"$Tags.COMPONENT" "redis-client"
105104
"$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
106-
"$Tags.PEER_HOSTNAME" HOST
105+
"$Tags.PEER_HOSTNAME" redisServer.getHost()
107106
"$Tags.PEER_PORT" port
108107
"$Tags.DB_TYPE" "redis"
109108
"db.redis.dbIndex" 0
@@ -136,7 +135,7 @@ abstract class Lettuce5ReactiveClientTest extends VersionedNamingTestBase {
136135
tags {
137136
"$Tags.COMPONENT" "redis-client"
138137
"$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
139-
"$Tags.PEER_HOSTNAME" HOST
138+
"$Tags.PEER_HOSTNAME" redisServer.getHost()
140139
"$Tags.PEER_PORT" port
141140
"$Tags.DB_TYPE" "redis"
142141
"db.redis.dbIndex" 0
@@ -176,7 +175,7 @@ abstract class Lettuce5ReactiveClientTest extends VersionedNamingTestBase {
176175
tags {
177176
"$Tags.COMPONENT" "redis-client"
178177
"$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
179-
"$Tags.PEER_HOSTNAME" HOST
178+
"$Tags.PEER_HOSTNAME" redisServer.getHost()
180179
"$Tags.PEER_PORT" port
181180
"$Tags.DB_TYPE" "redis"
182181
"db.redis.dbIndex" 0
@@ -214,7 +213,7 @@ abstract class Lettuce5ReactiveClientTest extends VersionedNamingTestBase {
214213
tags {
215214
"$Tags.COMPONENT" "redis-client"
216215
"$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
217-
"$Tags.PEER_HOSTNAME" HOST
216+
"$Tags.PEER_HOSTNAME" redisServer.getHost()
218217
"$Tags.PEER_PORT" port
219218
"$Tags.DB_TYPE" "redis"
220219
"db.redis.dbIndex" 0
@@ -243,7 +242,7 @@ abstract class Lettuce5ReactiveClientTest extends VersionedNamingTestBase {
243242
tags {
244243
"$Tags.COMPONENT" "redis-client"
245244
"$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
246-
"$Tags.PEER_HOSTNAME" HOST
245+
"$Tags.PEER_HOSTNAME" redisServer.getHost()
247246
"$Tags.PEER_PORT" port
248247
"$Tags.DB_TYPE" "redis"
249248
"db.redis.dbIndex" 0
@@ -273,7 +272,7 @@ abstract class Lettuce5ReactiveClientTest extends VersionedNamingTestBase {
273272
tags {
274273
"$Tags.COMPONENT" "redis-client"
275274
"$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
276-
"$Tags.PEER_HOSTNAME" HOST
275+
"$Tags.PEER_HOSTNAME" redisServer.getHost()
277276
"$Tags.PEER_PORT" port
278277
"$Tags.DB_TYPE" "redis"
279278
"db.redis.dbIndex" 0
@@ -316,7 +315,7 @@ abstract class Lettuce5ReactiveClientTest extends VersionedNamingTestBase {
316315
tags {
317316
"$Tags.COMPONENT" "redis-client"
318317
"$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
319-
"$Tags.PEER_HOSTNAME" HOST
318+
"$Tags.PEER_HOSTNAME" redisServer.getHost()
320319
"$Tags.PEER_PORT" port
321320
"$Tags.DB_TYPE" "redis"
322321
"db.redis.dbIndex" 0
@@ -345,7 +344,7 @@ abstract class Lettuce5ReactiveClientTest extends VersionedNamingTestBase {
345344
tags {
346345
"$Tags.COMPONENT" "redis-client"
347346
"$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
348-
"$Tags.PEER_HOSTNAME" HOST
347+
"$Tags.PEER_HOSTNAME" redisServer.getHost()
349348
"$Tags.PEER_PORT" port
350349
"$Tags.DB_TYPE" "redis"
351350
"db.redis.dbIndex" 0
@@ -392,7 +391,7 @@ abstract class Lettuce5ReactiveClientTest extends VersionedNamingTestBase {
392391
tags {
393392
"$Tags.COMPONENT" "redis-client"
394393
"$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
395-
"$Tags.PEER_HOSTNAME" HOST
394+
"$Tags.PEER_HOSTNAME" redisServer.getHost()
396395
"$Tags.PEER_PORT" port
397396
"$Tags.DB_TYPE" "redis"
398397
"db.redis.dbIndex" 0
@@ -411,7 +410,7 @@ abstract class Lettuce5ReactiveClientTest extends VersionedNamingTestBase {
411410
tags {
412411
"$Tags.COMPONENT" "redis-client"
413412
"$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
414-
"$Tags.PEER_HOSTNAME" HOST
413+
"$Tags.PEER_HOSTNAME" redisServer.getHost()
415414
"$Tags.PEER_PORT" port
416415
"$Tags.DB_TYPE" "redis"
417416
"db.redis.dbIndex" 0
@@ -454,7 +453,7 @@ abstract class Lettuce5ReactiveClientTest extends VersionedNamingTestBase {
454453
tags {
455454
"$Tags.COMPONENT" "redis-client"
456455
"$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
457-
"$Tags.PEER_HOSTNAME" HOST
456+
"$Tags.PEER_HOSTNAME" redisServer.getHost()
458457
"$Tags.PEER_PORT" port
459458
"$Tags.DB_TYPE" "redis"
460459
"db.redis.dbIndex" 0
@@ -474,7 +473,7 @@ abstract class Lettuce5ReactiveClientTest extends VersionedNamingTestBase {
474473
tags {
475474
"$Tags.COMPONENT" "redis-client"
476475
"$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
477-
"$Tags.PEER_HOSTNAME" HOST
476+
"$Tags.PEER_HOSTNAME" redisServer.getHost()
478477
"$Tags.PEER_PORT" port
479478
"$Tags.DB_TYPE" "redis"
480479
"db.redis.dbIndex" 0
@@ -520,7 +519,7 @@ abstract class Lettuce5ReactiveClientTest extends VersionedNamingTestBase {
520519
tags {
521520
"$Tags.COMPONENT" "redis-client"
522521
"$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
523-
"$Tags.PEER_HOSTNAME" HOST
522+
"$Tags.PEER_HOSTNAME" redisServer.getHost()
524523
"$Tags.PEER_PORT" port
525524
"$Tags.DB_TYPE" "redis"
526525
"db.redis.dbIndex" 0
@@ -539,7 +538,7 @@ abstract class Lettuce5ReactiveClientTest extends VersionedNamingTestBase {
539538
tags {
540539
"$Tags.COMPONENT" "redis-client"
541540
"$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
542-
"$Tags.PEER_HOSTNAME" HOST
541+
"$Tags.PEER_HOSTNAME" redisServer.getHost()
543542
"$Tags.PEER_PORT" port
544543
"$Tags.DB_TYPE" "redis"
545544
"db.redis.dbIndex" 0
@@ -586,7 +585,7 @@ abstract class Lettuce5ReactiveClientTest extends VersionedNamingTestBase {
586585
tags {
587586
"$Tags.COMPONENT" "redis-client"
588587
"$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
589-
"$Tags.PEER_HOSTNAME" HOST
588+
"$Tags.PEER_HOSTNAME" redisServer.getHost()
590589
"$Tags.PEER_PORT" port
591590
"$Tags.DB_TYPE" "redis"
592591
"db.redis.dbIndex" 0
@@ -605,7 +604,7 @@ abstract class Lettuce5ReactiveClientTest extends VersionedNamingTestBase {
605604
tags {
606605
"$Tags.COMPONENT" "redis-client"
607606
"$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
608-
"$Tags.PEER_HOSTNAME" HOST
607+
"$Tags.PEER_HOSTNAME" redisServer.getHost()
609608
"$Tags.PEER_PORT" port
610609
"$Tags.DB_TYPE" "redis"
611610
"db.redis.dbIndex" 0

0 commit comments

Comments
 (0)