Skip to content

Commit c7bf848

Browse files
authored
Review fixes for jetty-httpclient-12.0:library (open-telemetry#18074)
1 parent 243a888 commit c7bf848

2 files changed

Lines changed: 7 additions & 1 deletion

File tree

instrumentation/jetty-httpclient/jetty-httpclient-12.0/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v12_0/TracingHttpClient.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ static TracingHttpClient buildNew(
5252
new TracingHttpClient(instrumenter, httpClientTransport, sslContextFactory);
5353
} else if (sslContextFactory != null) {
5454
tracingHttpClient = new TracingHttpClient(instrumenter, sslContextFactory);
55+
} else if (httpClientTransport != null) {
56+
tracingHttpClient = new TracingHttpClient(instrumenter, httpClientTransport);
5557
} else {
5658
tracingHttpClient = new TracingHttpClient(instrumenter);
5759
}

instrumentation/jetty-httpclient/jetty-httpclient-12.0/library/src/test/java/io/opentelemetry/instrumentation/jetty/httpclient/v12_0/JettyHttpClient12LibraryTest.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpClientTest;
1212
import io.opentelemetry.instrumentation.testing.junit.http.HttpClientInstrumentationExtension;
1313
import org.eclipse.jetty.client.HttpClient;
14+
import org.eclipse.jetty.client.transport.HttpClientTransportOverHTTP;
1415
import org.eclipse.jetty.util.ssl.SslContextFactory;
1516
import org.junit.jupiter.api.extension.RegisterExtension;
1617

@@ -28,10 +29,13 @@ protected HttpClient createStandardClient() {
2829
.createHttpClient();
2930
}
3031

32+
// exercises the createHttpClient(HttpClientTransport) entry point as well
3133
@Override
3234
protected HttpClient createHttpsClient(SslContextFactory.Client sslContextFactory) {
3335
HttpClient client =
34-
JettyClientTelemetry.builder(testing.getOpenTelemetry()).build().createHttpClient();
36+
JettyClientTelemetry.builder(testing.getOpenTelemetry())
37+
.build()
38+
.createHttpClient(new HttpClientTransportOverHTTP());
3539
client.setSslContextFactory(sslContextFactory);
3640
return client;
3741
}

0 commit comments

Comments
 (0)