Remove deprecated methods from HTTP client and server library instrumentation modules (#15892)

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: trask <218610+trask@users.noreply.github.com>

Author: Copilot

instrumentation/apache-httpclient/apache-httpclient-4.3/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v4_3/ApacheHttpClientTelemetry.java

@@ -40,28 +40,8 @@ public CloseableHttpClient createHttpClient() {
     return createHttpClientBuilder().build();
   }
 
-  /**
-   * Returns an instrumented HTTP client.
-   *
-   * @deprecated Use {@link #createHttpClient()} instead.
-   */
-  @Deprecated
-  public CloseableHttpClient newHttpClient() {
-    return createHttpClient();
-  }
-
   /** Returns a builder for creating an instrumented HTTP client. */
   public HttpClientBuilder createHttpClientBuilder() {
     return new TracingHttpClientBuilder(instrumenter, propagators);
   }
-
-  /**
-   * Returns a builder for creating an instrumented HTTP client.
-   *
-   * @deprecated Use {@link #createHttpClientBuilder()} instead.
-   */
-  @Deprecated
-  public HttpClientBuilder newHttpClientBuilder() {
-    return createHttpClientBuilder();
-  }
 }

instrumentation/apache-httpclient/apache-httpclient-5.2/library/src/main/java/io/opentelemetry/instrumentation/apachehttpclient/v5_2/ApacheHttpClientTelemetry.java

@@ -41,16 +41,6 @@ public CloseableHttpClient createHttpClient() {
     return createHttpClientBuilder().build();
   }
 
-  /**
-   * Returns an instrumented HTTP client.
-   *
-   * @deprecated Use {@link #createHttpClient()} instead.
-   */
-  @Deprecated
-  public CloseableHttpClient newHttpClient() {
-    return createHttpClient();
-  }
-
   /** Returns a builder for creating an instrumented HTTP client. */
   public HttpClientBuilder createHttpClientBuilder() {
     return HttpClientBuilder.create()
@@ -59,14 +49,4 @@ public HttpClientBuilder createHttpClientBuilder() {
             "OtelExecChainHandler",
             new OtelExecChainHandler(instrumenter, propagators));
   }
-
-  /**
-   * Returns a builder for creating an instrumented HTTP client.
-   *
-   * @deprecated Use {@link #createHttpClientBuilder()} instead.
-   */
-  @Deprecated
-  public HttpClientBuilder newHttpClientBuilder() {
-    return createHttpClientBuilder();
-  }
 }

instrumentation/java-http-client/library/src/main/java/io/opentelemetry/instrumentation/javahttpclient/JavaHttpClientTelemetry.java

@@ -35,18 +35,6 @@ public static JavaHttpClientTelemetryBuilder builder(OpenTelemetry openTelemetry
     this.headersSetter = headersSetter;
   }
 
-  /**
-   * Returns an instrumented {@link HttpClient} wrapping the provided client.
-   *
-   * @param client An instance of HttpClient configured as desired.
-   * @return a tracing-enabled {@link HttpClient}.
-   * @deprecated Use {@link #wrap(HttpClient)} instead.
-   */
-  @Deprecated
-  public HttpClient newHttpClient(HttpClient client) {
-    return wrap(client);
-  }
-
   /** Returns a new instrumented {@link HttpClient} that wraps the provided client. */
   public HttpClient wrap(HttpClient client) {
     return new OpenTelemetryHttpClient(client, instrumenter, headersSetter);

instrumentation/java-http-server/library/src/main/java/io/opentelemetry/instrumentation/javahttpserver/JavaHttpServerTelemetry.java

@@ -35,16 +35,6 @@ public Filter createFilter() {
     return new OpenTelemetryFilter(instrumenter);
   }
 
-  /**
-   * Returns a {@link Filter} that instruments HTTP requests.
-   *
-   * @deprecated Use {@link #createFilter()} instead.
-   */
-  @Deprecated
-  public Filter newFilter() {
-    return createFilter();
-  }
-
   /** Configures the {@link HttpContext} to produce telemetry. */
   public void configure(HttpContext httpContext) {
     httpContext.getFilters().add(0, createFilter());

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

@@ -26,23 +26,12 @@ public static JettyClientTelemetryBuilder builder(OpenTelemetry openTelemetry) {
     return new JettyClientTelemetryBuilder(openTelemetry);
   }
 
-  private final HttpClient httpClient;
   private final Instrumenter<Request, Response> instrumenter;
 
-  JettyClientTelemetry(HttpClient httpClient, Instrumenter<Request, Response> instrumenter) {
-    this.httpClient = httpClient;
+  JettyClientTelemetry(Instrumenter<Request, Response> instrumenter) {
     this.instrumenter = instrumenter;
   }
 
-  /**
-   * @deprecated Use {@link #newHttpClient()} or {@link #newHttpClient(HttpClientTransport)}
-   *     instead.
-   */
-  @Deprecated
-  public HttpClient getHttpClient() {
-    return httpClient;
-  }
-
   /** Returns an instrumented HTTP client. */
   public HttpClient newHttpClient() {
     return new TracingHttpClient(instrumenter);

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

@@ -15,17 +15,13 @@
 import io.opentelemetry.instrumentation.jetty.httpclient.v12_0.internal.JettyHttpClientInstrumenterBuilderFactory;
 import java.util.Collection;
 import java.util.function.UnaryOperator;
-import org.eclipse.jetty.client.HttpClientTransport;
 import org.eclipse.jetty.client.Request;
 import org.eclipse.jetty.client.Response;
-import org.eclipse.jetty.util.ssl.SslContextFactory;
 
 /** Builder for {@link JettyClientTelemetry}. */
 public final class JettyClientTelemetryBuilder {
 
   private final DefaultHttpClientInstrumenterBuilder<Request, Response> builder;
-  private HttpClientTransport httpClientTransport;
-  private SslContextFactory.Client sslContextFactory;
 
   static {
     Experimental.internalSetEmitExperimentalTelemetry(
@@ -36,31 +32,6 @@ public final class JettyClientTelemetryBuilder {
     builder = JettyHttpClientInstrumenterBuilderFactory.create(openTelemetry);
   }
 
-  /**
-   * @deprecated Use {@link JettyClientTelemetry#newHttpClient(HttpClientTransport)} instead.
-   */
-  @Deprecated
-  @CanIgnoreReturnValue
-  public JettyClientTelemetryBuilder setHttpClientTransport(
-      HttpClientTransport httpClientTransport) {
-    this.httpClientTransport = httpClientTransport;
-    return this;
-  }
-
-  /**
-   * @deprecated Use {@link
-   *     org.eclipse.jetty.client.HttpClient#setSslContextFactory(SslContextFactory.Client)} on the
-   *     HttpClient returned by {@link JettyClientTelemetry#newHttpClient()} or {@link
-   *     JettyClientTelemetry#newHttpClient(HttpClientTransport)} instead.
-   */
-  @Deprecated
-  @CanIgnoreReturnValue
-  public JettyClientTelemetryBuilder setSslContextFactory(
-      SslContextFactory.Client sslContextFactory) {
-    this.sslContextFactory = sslContextFactory;
-    return this;
-  }
-
   /**
    * Adds an {@link AttributesExtractor} to extract attributes from requests and responses. Executed
    * after all default extractors.
@@ -124,9 +95,6 @@ public JettyClientTelemetryBuilder setSpanNameExtractorCustomizer(
   /** Returns a new instance with the configured settings. */
   public JettyClientTelemetry build() {
     var instrumenter = builder.build();
-    TracingHttpClient tracingHttpClient =
-        TracingHttpClient.buildNew(instrumenter, sslContextFactory, httpClientTransport);
-
-    return new JettyClientTelemetry(tracingHttpClient, instrumenter);
+    return new JettyClientTelemetry(instrumenter);
   }
 }

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

@@ -27,23 +27,12 @@ public static JettyClientTelemetryBuilder builder(OpenTelemetry openTelemetry) {
     return new JettyClientTelemetryBuilder(openTelemetry);
   }
 
-  private final HttpClient httpClient;
   private final Instrumenter<Request, Response> instrumenter;
 
-  JettyClientTelemetry(HttpClient httpClient, Instrumenter<Request, Response> instrumenter) {
-    this.httpClient = httpClient;
+  JettyClientTelemetry(Instrumenter<Request, Response> instrumenter) {
     this.instrumenter = instrumenter;
   }
 
-  /**
-   * @deprecated Use {@link #newHttpClient()}, {@link #newHttpClient(SslContextFactory)}, or {@link
-   *     #newHttpClient(HttpClientTransport, SslContextFactory)} instead.
-   */
-  @Deprecated
-  public HttpClient getHttpClient() {
-    return httpClient;
-  }
-
   /** Returns an instrumented HTTP client. */
   public HttpClient newHttpClient() {
     return new TracingHttpClient(instrumenter);

instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/JettyClientTelemetry.java

@@ -16,17 +16,13 @@
 import io.opentelemetry.instrumentation.jetty.httpclient.v9_2.internal.JettyHttpClientInstrumenterBuilderFactory;
 import java.util.Collection;
 import java.util.function.UnaryOperator;
-import org.eclipse.jetty.client.HttpClientTransport;
 import org.eclipse.jetty.client.api.Request;
 import org.eclipse.jetty.client.api.Response;
-import org.eclipse.jetty.util.ssl.SslContextFactory;
 
 /** Builder for {@link JettyClientTelemetry}. */
 public final class JettyClientTelemetryBuilder {
 
   private final DefaultHttpClientInstrumenterBuilder<Request, Response> builder;
-  private HttpClientTransport httpClientTransport;
-  private SslContextFactory sslContextFactory;
 
   static {
     Experimental.internalSetEmitExperimentalTelemetry(
@@ -37,28 +33,6 @@ public final class JettyClientTelemetryBuilder {
     builder = JettyHttpClientInstrumenterBuilderFactory.create(openTelemetry);
   }
 
-  /**
-   * @deprecated Use {@link JettyClientTelemetry#newHttpClient(HttpClientTransport,
-   *     SslContextFactory)} instead.
-   */
-  @Deprecated
-  @CanIgnoreReturnValue
-  public JettyClientTelemetryBuilder setHttpClientTransport(
-      HttpClientTransport httpClientTransport) {
-    this.httpClientTransport = httpClientTransport;
-    return this;
-  }
-
-  /**
-   * @deprecated Use {@link JettyClientTelemetry#newHttpClient(SslContextFactory)} instead.
-   */
-  @Deprecated
-  @CanIgnoreReturnValue
-  public JettyClientTelemetryBuilder setSslContextFactory(SslContextFactory sslContextFactory) {
-    this.sslContextFactory = sslContextFactory;
-    return this;
-  }
-
   /**
    * Adds an {@link AttributesExtractor} to extract attributes from requests and responses. Executed
    * after all default extractors.
@@ -122,9 +96,6 @@ public JettyClientTelemetryBuilder setSpanNameExtractorCustomizer(
   /** Returns a new instance with the configured settings. */
   public JettyClientTelemetry build() {
     Instrumenter<Request, Response> instrumenter = builder.build();
-    TracingHttpClient tracingHttpClient =
-        TracingHttpClient.buildNew(instrumenter, sslContextFactory, httpClientTransport);
-
-    return new JettyClientTelemetry(tracingHttpClient, instrumenter);
+    return new JettyClientTelemetry(instrumenter);
   }
 }