From 085a4d9d5e4dab031b849958cb19d7bd792de736 Mon Sep 17 00:00:00 2001
From: Lauri Tulmin <ltulmin@splunk.com>
Date: Fri, 20 Dec 2024 16:23:50 +0200
Subject: [PATCH] Akka/pekko http: set read timeout only for read timeout test

---
 .../AkkaHttpClientInstrumentationTest.scala   | 31 ++++++++++---------
 .../PekkoHttpClientInstrumentationTest.scala  | 31 ++++++++++---------
 2 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpClientInstrumentationTest.scala b/instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpClientInstrumentationTest.scala
index 23e17e17c450..8e1bc2074688 100644
--- a/instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpClientInstrumentationTest.scala
+++ b/instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpClientInstrumentationTest.scala
@@ -66,22 +66,23 @@ class AkkaHttpClientInstrumentationTest
       uri: URI,
       headers: util.Map[String, String]
   ): Int = {
-    val settings = ConnectionPoolSettings(system)
-      .withConnectionSettings(
-        ClientConnectionSettings(system)
-          .withConnectingTimeout(
-            FiniteDuration(
-              AbstractHttpClientTest.CONNECTION_TIMEOUT.toMillis,
-              MILLISECONDS
-            )
-          )
-          .withIdleTimeout(
-            FiniteDuration(
-              AbstractHttpClientTest.READ_TIMEOUT.toMillis,
-              MILLISECONDS
-            )
-          )
+    var clientConnectionSettings = ClientConnectionSettings(system)
+      .withConnectingTimeout(
+        FiniteDuration(
+          AbstractHttpClientTest.CONNECTION_TIMEOUT.toMillis,
+          MILLISECONDS
+        )
+      )
+    if (uri.toString.contains("/read-timeout")) {
+      clientConnectionSettings = clientConnectionSettings.withIdleTimeout(
+        FiniteDuration(
+          AbstractHttpClientTest.READ_TIMEOUT.toMillis,
+          MILLISECONDS
+        )
       )
+    }
+    val settings = ConnectionPoolSettings(system)
+      .withConnectionSettings(clientConnectionSettings)
     val response = Await.result(
       Http.get(system).singleRequest(request, settings = settings),
       10 seconds
diff --git a/instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpClientInstrumentationTest.scala b/instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpClientInstrumentationTest.scala
index c686d00b6aa6..bbc367284925 100644
--- a/instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpClientInstrumentationTest.scala
+++ b/instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpClientInstrumentationTest.scala
@@ -65,22 +65,23 @@ class PekkoHttpClientInstrumentationTest
       uri: URI,
       headers: util.Map[String, String]
   ): Int = {
-    val settings = ConnectionPoolSettings(system)
-      .withConnectionSettings(
-        ClientConnectionSettings(system)
-          .withConnectingTimeout(
-            FiniteDuration(
-              AbstractHttpClientTest.CONNECTION_TIMEOUT.toMillis,
-              MILLISECONDS
-            )
-          )
-          .withIdleTimeout(
-            FiniteDuration(
-              AbstractHttpClientTest.READ_TIMEOUT.toMillis,
-              MILLISECONDS
-            )
-          )
+    var clientConnectionSettings = ClientConnectionSettings(system)
+      .withConnectingTimeout(
+        FiniteDuration(
+          AbstractHttpClientTest.CONNECTION_TIMEOUT.toMillis,
+          MILLISECONDS
+        )
+      )
+    if (uri.toString.contains("/read-timeout")) {
+      clientConnectionSettings = clientConnectionSettings.withIdleTimeout(
+        FiniteDuration(
+          AbstractHttpClientTest.READ_TIMEOUT.toMillis,
+          MILLISECONDS
+        )
       )
+    }
+    val settings = ConnectionPoolSettings(system)
+      .withConnectionSettings(clientConnectionSettings)
     val response = Await.result(
       Http.get(system).singleRequest(request, settings = settings),
       10 seconds