post-review cleanup

Author: SylvainJuge

instrumentation/apache-httpclient/apache-httpclient-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/apachehttpclient/v5_0/ApacheHttpClientHelper.java

@@ -28,6 +28,7 @@
 import net.bytebuddy.matcher.ElementMatcher;
 import org.apache.hc.core5.http.ClassicHttpRequest;
 import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.io.HttpClientResponseHandler;
 
 class ApacheHttpClientInstrumentation implements TypeInstrumentation {
@@ -151,7 +152,13 @@ public static AdviceScope start(ClassicHttpRequest request) {
 
     public void end(@Nullable Object result, @Nullable Throwable throwable) {
       scope.close();
-      ApacheHttpClientHelper.doMethodExit(context, request, result, throwable);
+      if (throwable != null) {
+        instrumenter().end(context, request, null, throwable);
+      } else if (result instanceof HttpResponse) {
+        instrumenter().end(context, request, (HttpResponse) result, null);
+      } else {
+        // ended in WrappingStatusSettingResponseHandler
+      }
     }
 
     public WrappingStatusSettingResponseHandler<?> wrapResponseHandler(