diff --git a/instrumentation/apache-httpclient/apache-httpclient-5.2/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v5_2/ApacheHttpClient5Request.java b/instrumentation/apache-httpclient/apache-httpclient-5.2/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v5_2/ApacheHttpClient5Request.java index b8a0de70b7..d0c96600ec 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-5.2/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v5_2/ApacheHttpClient5Request.java +++ b/instrumentation/apache-httpclient/apache-httpclient-5.2/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v5_2/ApacheHttpClient5Request.java @@ -7,28 +7,19 @@ package io.opentelemetry.instrumentation.apachehttpclient.v5_2; import static java.util.logging.Level.FINE; -import java.net.InetAddress; -import java.net.InetSocketAddress; import java.net.URI; import java.net.URISyntaxException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; import java.util.logging.Logger; import javax.annotation.Nullable; -import org.apache.hc.core5.http.Header; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.HttpRequest; -import org.apache.hc.core5.http.ProtocolVersion; -final class ApacheHttpClient5Request { +public final class ApacheHttpClient5Request { private static final Logger logger = Logger.getLogger(ApacheHttpClient5Request.class.getName()); @Nullable private final URI uri; - private final HttpRequest delegate; - @Nullable private final HttpHost target; ApacheHttpClient5Request(@Nullable HttpHost httpHost, HttpRequest httpRequest) { URI calculatedUri = getUri(httpRequest); @@ -38,7 +29,6 @@ final class ApacheHttpClient5Request { uri = calculatedUri; } delegate = httpRequest; - target = httpHost; } /** Returns the actual {@link HttpRequest} being executed by the client. */ @@ -46,26 +36,6 @@ final class ApacheHttpClient5Request { return delegate; } - List getHeader(String name) { - return headersToList(delegate.getHeaders(name)); - } - - // minimize memory overhead by not using streams - static List headersToList(Header[] headers) { - if (headers.length == 0) { - return Collections.emptyList(); - } - List headersList = new ArrayList<>(headers.length); - for (Header header : headers) { - headersList.add(header.getValue()); - } - return headersList; - } - - void setHeader(String name, String value) { - delegate.setHeader(name, value); - } - String getMethod() { return delegate.getMethod(); } @@ -75,28 +45,6 @@ final class ApacheHttpClient5Request { return uri != null ? uri.toString() : null; } - String getProtocolName() { - return delegate.getVersion().getProtocol(); - } - - String getProtocolVersion() { - ProtocolVersion protocolVersion = delegate.getVersion(); - if (protocolVersion.getMinor() == 0) { - return Integer.toString(protocolVersion.getMajor()); - } - return protocolVersion.getMajor() + "." + protocolVersion.getMinor(); - } - - @Nullable - public String getServerAddress() { - return uri == null ? null : uri.getHost(); - } - - @Nullable - public Integer getServerPort() { - return uri == null ? null : uri.getPort(); - } - @Nullable private static URI getUri(HttpRequest httpRequest) { try { @@ -124,13 +72,4 @@ final class ApacheHttpClient5Request { return null; } } - - @Nullable - public InetSocketAddress getServerSocketAddress() { - if (target == null) { - return null; - } - InetAddress inetAddress = target.getAddress(); - return inetAddress == null ? null : new InetSocketAddress(inetAddress, target.getPort()); - } }