Merge pull request #1069 from microsoft/trask/fix-apache-http-client-instrumentation

Fix apache http client instrumentation

Author: trask

agent/build.gradle

@@ -26,7 +26,7 @@ plugins {
 apply from: "$buildScriptsDir/common-java.gradle"
 apply from: "$buildScriptsDir/publishing.gradle"
 
-def instrumentationVersion = '0.14.5'
+def instrumentationVersion = '0.14.6'
 
 def shadowPrefix = 'com.microsoft.applicationinsights.agent.shadow'
 

agent/src/main/java/com/microsoft/applicationinsights/agent/internal/model/OutgoingSpanImpl.java

@@ -150,6 +150,10 @@ private void endInternal() {
             telemetry.getProperties().put("Method", method);
         }
         if (uri != null) {
+            String host = (String) detail.get("Host");
+            if (host != null) {
+                uri = host + uri;
+            }
             try {
                 URI uriObject = new URI(uri);
                 String target;

test/smoke/testApps/HttpClients/src/main/java/com/microsoft/applicationinsights/smoketestapp/HttpClientTestServlet.java

@@ -16,6 +16,8 @@
 import org.apache.commons.httpclient.cookie.CookiePolicy;
 import org.apache.commons.httpclient.cookie.CookieSpecBase;
 import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.ResponseHandler;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.CloseableHttpClient;
@@ -44,6 +46,8 @@ private int doGetInternal(HttpServletRequest req) throws Exception {
             return 200;
         } else if (pathInfo.equals("/apacheHttpClient4")) {
             return apacheHttpClient4();
+        } else if (pathInfo.equals("/apacheHttpClient4WithResponseHandler")) {
+            return apacheHttpClient4WithResponseHandler();
         } else if (pathInfo.equals("/apacheHttpClient3")) {
             return apacheHttpClient3();
         } else if (pathInfo.equals("/okHttp3")) {
@@ -65,6 +69,17 @@ private int apacheHttpClient4() throws IOException {
         }
     }
 
+    private int apacheHttpClient4WithResponseHandler() throws IOException {
+        String url = "https://www.bing.com";
+        HttpGet get = new HttpGet(url);
+        return httpClient.execute(get, new ResponseHandler<Integer>() {
+            @Override
+            public Integer handleResponse(HttpResponse response) {
+                return response.getStatusLine().getStatusCode();
+            }
+        });
+    }
+
     private int apacheHttpClient3() throws IOException {
         HttpClient httpClient3 = new org.apache.commons.httpclient.HttpClient();
         CookiePolicy.registerCookieSpec("PermitAllCookiesSpec", PermitAllCookiesSpec.class);

test/smoke/testApps/HttpClients/src/smokeTest/java/com/microsoft/applicationinsights/smoketestapp/HttpClientSmokeTest.java

@@ -32,6 +32,21 @@ public void testAsyncDependencyCallWithApacheHttpClient4() throws Exception {
         assertTrue(rdd.getId().contains(rd.getId()));
     }
 
+    @Test
+    @TargetUri("/apacheHttpClient4WithResponseHandler")
+    public void testAsyncDependencyCallWithApacheHttpClient4WithResponseHandler() throws Exception {
+        List<Envelope> rdList = mockedIngestion.waitForItems("RequestData", 1);
+        List<Envelope> rddList = mockedIngestion.waitForItems("RemoteDependencyData", 1);
+
+        RequestData rd = (RequestData) ((Data) rdList.get(0).getData()).getBaseData();
+        RemoteDependencyData rdd = (RemoteDependencyData) ((Data) rddList.get(0).getData()).getBaseData();
+
+        assertTrue(rd.getSuccess());
+        assertEquals("GET /", rdd.getName());
+        assertEquals("www.bing.com:-1 | www.bing.com", rdd.getTarget());
+        assertTrue(rdd.getId().contains(rd.getId()));
+    }
+
     @Test
     @TargetUri("/apacheHttpClient3")
     public void testAsyncDependencyCallWithApacheHttpClient3() throws Exception {