From 1cd634b341cc888be7918c339a5685ad82ed754b Mon Sep 17 00:00:00 2001
From: Lauri Tulmin <ltulmin@splunk.com>
Date: Fri, 7 Apr 2023 00:43:36 +0300
Subject: [PATCH] Replace deprecated method (#8230)

---
 .../javaagent/src/test/groovy/WithRabbitMqTrait.groovy        | 2 +-
 .../src/main/groovy/WithRabbitProducerConsumerTrait.groovy    | 4 ++--
 .../javaagent/src/test/groovy/ContextPropagationTest.groovy   | 4 ++--
 .../javaagent/src/test/groovy/SpymemcachedTest.groovy         | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/instrumentation/rabbitmq-2.7/javaagent/src/test/groovy/WithRabbitMqTrait.groovy b/instrumentation/rabbitmq-2.7/javaagent/src/test/groovy/WithRabbitMqTrait.groovy
index dc98b7809d..0cc23489e8 100644
--- a/instrumentation/rabbitmq-2.7/javaagent/src/test/groovy/WithRabbitMqTrait.groovy
+++ b/instrumentation/rabbitmq-2.7/javaagent/src/test/groovy/WithRabbitMqTrait.groovy
@@ -27,7 +27,7 @@ trait WithRabbitMqTrait {
     rabbitMqContainer.start()
 
     connectionFactory = new ConnectionFactory(
-      host: rabbitMqContainer.containerIpAddress,
+      host: rabbitMqContainer.host,
       port: rabbitMqContainer.getMappedPort(5672)
     )
   }
diff --git a/instrumentation/spring/spring-integration-4.1/testing/src/main/groovy/WithRabbitProducerConsumerTrait.groovy b/instrumentation/spring/spring-integration-4.1/testing/src/main/groovy/WithRabbitProducerConsumerTrait.groovy
index 34f64b4b7d..ef72c579d3 100644
--- a/instrumentation/spring/spring-integration-4.1/testing/src/main/groovy/WithRabbitProducerConsumerTrait.groovy
+++ b/instrumentation/spring/spring-integration-4.1/testing/src/main/groovy/WithRabbitProducerConsumerTrait.groovy
@@ -39,7 +39,7 @@ trait WithRabbitProducerConsumerTrait {
       "spring.application.name"                        : "testProducer",
       "spring.jmx.enabled"                             : false,
       "spring.main.web-application-type"               : "none",
-      "spring.rabbitmq.host"                           : rabbitMqContainer.containerIpAddress,
+      "spring.rabbitmq.host"                           : rabbitMqContainer.host,
       "spring.rabbitmq.port"                           : rabbitMqContainer.getMappedPort(5672),
       "spring.cloud.stream.bindings.output.destination": "testTopic"
     ])
@@ -50,7 +50,7 @@ trait WithRabbitProducerConsumerTrait {
       "spring.application.name"                       : "testConsumer",
       "spring.jmx.enabled"                            : false,
       "spring.main.web-application-type"              : "none",
-      "spring.rabbitmq.host"                          : rabbitMqContainer.containerIpAddress,
+      "spring.rabbitmq.host"                          : rabbitMqContainer.host,
       "spring.rabbitmq.port"                          : rabbitMqContainer.getMappedPort(5672),
       "spring.cloud.stream.bindings.input.destination": "testTopic"
     ])
diff --git a/instrumentation/spring/spring-rabbit-1.0/javaagent/src/test/groovy/ContextPropagationTest.groovy b/instrumentation/spring/spring-rabbit-1.0/javaagent/src/test/groovy/ContextPropagationTest.groovy
index 8e3ecff8e5..57c2b866eb 100644
--- a/instrumentation/spring/spring-rabbit-1.0/javaagent/src/test/groovy/ContextPropagationTest.groovy
+++ b/instrumentation/spring/spring-rabbit-1.0/javaagent/src/test/groovy/ContextPropagationTest.groovy
@@ -49,13 +49,13 @@ class ContextPropagationTest extends AgentInstrumentationSpecification {
     app.setDefaultProperties([
       "spring.jmx.enabled"              : false,
       "spring.main.web-application-type": "none",
-      "spring.rabbitmq.host"            : rabbitMqContainer.containerIpAddress,
+      "spring.rabbitmq.host"            : rabbitMqContainer.host,
       "spring.rabbitmq.port"            : rabbitMqContainer.getMappedPort(5672),
     ])
     applicationContext = app.run()
 
     connectionFactory = new ConnectionFactory(
-      host: rabbitMqContainer.containerIpAddress,
+      host: rabbitMqContainer.host,
       port: rabbitMqContainer.getMappedPort(5672)
     )
   }
diff --git a/instrumentation/spymemcached-2.12/javaagent/src/test/groovy/SpymemcachedTest.groovy b/instrumentation/spymemcached-2.12/javaagent/src/test/groovy/SpymemcachedTest.groovy
index 4930b58932..e2292021c5 100644
--- a/instrumentation/spymemcached-2.12/javaagent/src/test/groovy/SpymemcachedTest.groovy
+++ b/instrumentation/spymemcached-2.12/javaagent/src/test/groovy/SpymemcachedTest.groovy
@@ -51,7 +51,7 @@ class SpymemcachedTest extends AgentInstrumentationSpecification {
       .withStartupTimeout(Duration.ofSeconds(120))
     memcachedContainer.start()
     memcachedAddress = new InetSocketAddress(
-      memcachedContainer.containerIpAddress,
+      memcachedContainer.host,
       memcachedContainer.getMappedPort(11211)
     )
   }