Skip to content

Commit ae3c778

Browse files
authored
Akka/pekko http: set read timeout only for read timeout test (#12938)
1 parent ce2ec18 commit ae3c778

File tree

2 files changed

+32
-30
lines changed

2 files changed

+32
-30
lines changed

instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpClientInstrumentationTest.scala

+16-15
Original file line numberDiff line numberDiff line change
@@ -66,22 +66,23 @@ class AkkaHttpClientInstrumentationTest
6666
uri: URI,
6767
headers: util.Map[String, String]
6868
): Int = {
69-
val settings = ConnectionPoolSettings(system)
70-
.withConnectionSettings(
71-
ClientConnectionSettings(system)
72-
.withConnectingTimeout(
73-
FiniteDuration(
74-
AbstractHttpClientTest.CONNECTION_TIMEOUT.toMillis,
75-
MILLISECONDS
76-
)
77-
)
78-
.withIdleTimeout(
79-
FiniteDuration(
80-
AbstractHttpClientTest.READ_TIMEOUT.toMillis,
81-
MILLISECONDS
82-
)
83-
)
69+
var clientConnectionSettings = ClientConnectionSettings(system)
70+
.withConnectingTimeout(
71+
FiniteDuration(
72+
AbstractHttpClientTest.CONNECTION_TIMEOUT.toMillis,
73+
MILLISECONDS
74+
)
75+
)
76+
if (uri.toString.contains("/read-timeout")) {
77+
clientConnectionSettings = clientConnectionSettings.withIdleTimeout(
78+
FiniteDuration(
79+
AbstractHttpClientTest.READ_TIMEOUT.toMillis,
80+
MILLISECONDS
81+
)
8482
)
83+
}
84+
val settings = ConnectionPoolSettings(system)
85+
.withConnectionSettings(clientConnectionSettings)
8586
val response = Await.result(
8687
Http.get(system).singleRequest(request, settings = settings),
8788
10 seconds

instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpClientInstrumentationTest.scala

+16-15
Original file line numberDiff line numberDiff line change
@@ -65,22 +65,23 @@ class PekkoHttpClientInstrumentationTest
6565
uri: URI,
6666
headers: util.Map[String, String]
6767
): Int = {
68-
val settings = ConnectionPoolSettings(system)
69-
.withConnectionSettings(
70-
ClientConnectionSettings(system)
71-
.withConnectingTimeout(
72-
FiniteDuration(
73-
AbstractHttpClientTest.CONNECTION_TIMEOUT.toMillis,
74-
MILLISECONDS
75-
)
76-
)
77-
.withIdleTimeout(
78-
FiniteDuration(
79-
AbstractHttpClientTest.READ_TIMEOUT.toMillis,
80-
MILLISECONDS
81-
)
82-
)
68+
var clientConnectionSettings = ClientConnectionSettings(system)
69+
.withConnectingTimeout(
70+
FiniteDuration(
71+
AbstractHttpClientTest.CONNECTION_TIMEOUT.toMillis,
72+
MILLISECONDS
73+
)
74+
)
75+
if (uri.toString.contains("/read-timeout")) {
76+
clientConnectionSettings = clientConnectionSettings.withIdleTimeout(
77+
FiniteDuration(
78+
AbstractHttpClientTest.READ_TIMEOUT.toMillis,
79+
MILLISECONDS
80+
)
8381
)
82+
}
83+
val settings = ConnectionPoolSettings(system)
84+
.withConnectionSettings(clientConnectionSettings)
8485
val response = Await.result(
8586
Http.get(system).singleRequest(request, settings = settings),
8687
10 seconds

0 commit comments

Comments
 (0)