Skip to content

Commit 9f90f9a

Browse files
traskLironKS
authored andcommitted
Add test for null httpcontext (open-telemetry#6823)
follow-up to open-telemetry#6792
1 parent 56d542f commit 9f90f9a

File tree

1 file changed

+16
-2
lines changed
  • instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0

1 file changed

+16
-2
lines changed

instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpAsyncClientTest.java

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import org.apache.hc.client5.http.impl.async.HttpAsyncClients;
2020
import org.apache.hc.core5.concurrent.FutureCallback;
2121
import org.apache.hc.core5.http.HttpResponse;
22+
import org.apache.hc.core5.http.protocol.HttpContext;
2223
import org.apache.hc.core5.http2.HttpVersionPolicy;
2324
import org.apache.hc.core5.io.CloseMode;
2425
import org.junit.jupiter.api.AfterAll;
@@ -72,6 +73,19 @@ SimpleHttpRequest createRequest(String method, URI uri) {
7273
}
7374
}
7475

76+
@Nested
77+
class ApacheClientNullContextTest extends AbstractTest {
78+
@Override
79+
SimpleHttpRequest createRequest(String method, URI uri) {
80+
return new SimpleHttpRequest(method, uri);
81+
}
82+
83+
@Override
84+
protected HttpContext getContext() {
85+
return null;
86+
}
87+
}
88+
7589
abstract class AbstractTest extends AbstractApacheHttpClientTest<SimpleHttpRequest> {
7690
@Override
7791
protected SimpleHttpRequest buildRequest(String method, URI uri, Map<String, String> headers) {
@@ -88,12 +102,12 @@ protected SimpleHttpRequest buildRequest(String method, URI uri, Map<String, Str
88102

89103
@Override
90104
HttpResponse executeRequest(SimpleHttpRequest request, URI uri) throws Exception {
91-
return client.execute(request, null).get();
105+
return client.execute(request, getContext(), null).get();
92106
}
93107

94108
@Override
95109
void executeRequestWithCallback(SimpleHttpRequest request, URI uri, RequestResult result) {
96-
client.execute(request, new ResponseCallback(result));
110+
client.execute(request, getContext(), new ResponseCallback(result));
97111
}
98112

99113
@Override

0 commit comments

Comments
 (0)