Deprecate HttpComponents 4.x client instrumentation

Because HttpComponents 4.x is in maintenance mode and the existing
instrumentation in Micrometer has known issues that cannot be fixed
because we lack the required infrastructure in HttpComponents, this
commit deprecates the 4.x instrumentation in favor of an upgrade to
HttpComponents 5.x and the instrumentation provided here.

Closes gh-3932

micrometer-core/src/main/java/io/micrometer/core/instrument/binder/httpcomponents/ApacheHttpClientContext.java

@@ -31,7 +31,10 @@
  * for Apache HTTP client 5 support.
  *
  * @since 1.10.0
+ * @deprecated as of 1.12.0 in favor of HttpComponents 5.x and
+ * {@link io.micrometer.core.instrument.binder.httpcomponents.hc5.ApacheHttpClientContext}.
  */
+@Deprecated
 public class ApacheHttpClientContext extends RequestReplySenderContext<HttpRequest, HttpResponse> {
 
     private final HttpContext apacheHttpContext;

micrometer-core/src/main/java/io/micrometer/core/instrument/binder/httpcomponents/ApacheHttpClientObservationConvention.java

@@ -27,7 +27,10 @@
  *
  * @since 1.10.0
  * @see DefaultApacheHttpClientObservationConvention
+ * @deprecated as of 1.12.0 in favor of HttpComponents 5.x and
+ * {@link io.micrometer.core.instrument.binder.httpcomponents.hc5.ApacheHttpClientObservationConvention}.
  */
+@Deprecated
 public interface ApacheHttpClientObservationConvention extends ObservationConvention<ApacheHttpClientContext> {
 
     @Override

micrometer-core/src/main/java/io/micrometer/core/instrument/binder/httpcomponents/ApacheHttpClientObservationDocumentation.java

@@ -29,7 +29,10 @@
  *
  * @since 1.10.0
  * @see MicrometerHttpRequestExecutor
+ * @deprecated as of 1.12.0 in favor of HttpComponents 5.x and
+ * {@link io.micrometer.core.instrument.binder.httpcomponents.hc5.ApacheHttpClientObservationDocumentation}.
  */
+@Deprecated
 public enum ApacheHttpClientObservationDocumentation implements ObservationDocumentation {
 
     DEFAULT {

micrometer-core/src/main/java/io/micrometer/core/instrument/binder/httpcomponents/DefaultApacheHttpClientObservationConvention.java

@@ -33,7 +33,10 @@
  *
  * @since 1.10.0
  * @see ApacheHttpClientObservationDocumentation
+ * @deprecated as of 1.12.0 in favor of HttpComponents 5.x and
+ * {@link io.micrometer.core.instrument.binder.httpcomponents.hc5.ApacheHttpClientObservationConvention}.
  */
+@Deprecated
 public class DefaultApacheHttpClientObservationConvention implements ApacheHttpClientObservationConvention {
 
     /**

micrometer-core/src/main/java/io/micrometer/core/instrument/binder/httpcomponents/HttpContextUtils.java

@@ -20,6 +20,7 @@
 import org.apache.http.conn.routing.HttpRoute;
 import org.apache.http.protocol.HttpContext;
 
+@Deprecated
 class HttpContextUtils {
 
     static Tags generateTagsForRoute(HttpContext context) {

micrometer-core/src/main/java/io/micrometer/core/instrument/binder/httpcomponents/MicrometerHttpClientInterceptor.java

@@ -50,8 +50,11 @@
  *
  * @author Jon Schneider
  * @since 1.4.0
+ * @deprecated as of 1.12.0 in favor of HttpComponents 5.x and
+ * {@link ObservationExecChainHandler}.
  */
 @Incubating(since = "1.4.0")
+@Deprecated
 public class MicrometerHttpClientInterceptor {
 
     private static final String METER_NAME = "httpcomponents.httpclient.request";

micrometer-core/src/main/java/io/micrometer/core/instrument/binder/httpcomponents/MicrometerHttpRequestExecutor.java

@@ -56,8 +56,11 @@
  * @author Benjamin Hubert (benjamin.hubert@willhaben.at)
  * @author Tommy Ludwig
  * @since 1.2.0
+ * @deprecated as of 1.12.0 in favor of HttpComponents 5.x and
+ * {@link ObservationExecChainHandler}.
  */
 @Incubating(since = "1.2.0")
+@Deprecated
 public class MicrometerHttpRequestExecutor extends HttpRequestExecutor {
 
     /**

micrometer-core/src/test/java/io/micrometer/core/instrument/binder/httpcomponents/MicrometerHttpClientInterceptorTest.java

@@ -43,6 +43,7 @@
  * @author Johnny Lim
  */
 @ExtendWith(WiremockResolver.class)
+@Deprecated
 class MicrometerHttpClientInterceptorTest {
 
     private MeterRegistry registry;

micrometer-core/src/test/java/io/micrometer/core/instrument/binder/httpcomponents/MicrometerHttpRequestExecutorTest.java

@@ -55,6 +55,7 @@
  * @author Benjamin Hubert (benjamin.hubert@willhaben.at)
  */
 @ExtendWith(WiremockResolver.class)
+@Deprecated
 class MicrometerHttpRequestExecutorTest {
 
     private static final String EXPECTED_METER_NAME = "httpcomponents.httpclient.request";

micrometer-test/src/test/java/io/micrometer/core/instrument/ApacheAsyncHttpClientTimingInstrumentationVerificationTests.java

@@ -30,6 +30,7 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
+@SuppressWarnings("deprecation")
 class ApacheAsyncHttpClientTimingInstrumentationVerificationTests
         extends HttpClientTimingInstrumentationVerificationTests<CloseableHttpAsyncClient> {
 

micrometer-test/src/test/java/io/micrometer/core/instrument/ApacheHttpClientTimingInstrumentationVerificationTests.java

@@ -31,6 +31,7 @@
 import java.io.IOException;
 import java.net.URI;
 
+@Deprecated
 class ApacheHttpClientTimingInstrumentationVerificationTests
         extends HttpClientTimingInstrumentationVerificationTests<HttpClient> {