remove another copy of ApacheHttpClientHelper

Author: SylvainJuge

instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientHelper.java

@@ -28,6 +28,7 @@
 import net.bytebuddy.matcher.ElementMatcher;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpRequest;
+import org.apache.http.HttpResponse;
 import org.apache.http.client.ResponseHandler;
 import org.apache.http.client.methods.HttpUriRequest;
 
@@ -157,7 +158,12 @@ public <T> ResponseHandler<T> wrapHandler(ResponseHandler<T> handler) {
 
     public void end(@Nullable Object result, @Nullable Throwable throwable) {
       scope.close();
-      ApacheHttpClientHelper.doMethodExit(context, otelRequest, result, throwable);
+      if (throwable != null) {
+        instrumenter().end(context, otelRequest, null, throwable);
+      } else if (result instanceof HttpResponse) {
+        instrumenter().end(context, otelRequest, (HttpResponse) result, null);
+      }
+      // ended in WrappingStatusSettingResponseHandler
     }
   }
 

instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v4_0/ApacheHttpClientInstrumentation.java

@@ -156,9 +156,8 @@ public void end(@Nullable Object result, @Nullable Throwable throwable) {
         instrumenter().end(context, request, null, throwable);
       } else if (result instanceof HttpResponse) {
         instrumenter().end(context, request, (HttpResponse) result, null);
-      } else {
-        // ended in WrappingStatusSettingResponseHandler
       }
+      // ended in WrappingStatusSettingResponseHandler
     }
 
     public WrappingStatusSettingResponseHandler<?> wrapResponseHandler(