Fix for URL with spaces

Author: trask

otel

@@ -75,15 +75,15 @@ private int doGetInternal(HttpServletRequest req) throws Exception {
     }
 
     private int apacheHttpClient4() throws IOException {
-        String url = "https://www.bing.com";
+        String url = "https://www.bing.com/search?q=spaces%20test";
         HttpGet get = new HttpGet(url);
         try (CloseableHttpResponse response = httpClient.execute(get)) {
             return response.getStatusLine().getStatusCode();
         }
     }
 
     private int apacheHttpClient4WithResponseHandler() throws IOException {
-        String url = "https://www.bing.com";
+        String url = "https://www.bing.com/search?q=spaces%20test";
         HttpGet get = new HttpGet(url);
         return httpClient.execute(get, new ResponseHandler<Integer>() {
             @Override
@@ -97,15 +97,15 @@ private int apacheHttpClient3() throws IOException {
         HttpClient httpClient3 = new org.apache.commons.httpclient.HttpClient();
         CookiePolicy.registerCookieSpec("PermitAllCookiesSpec", PermitAllCookiesSpec.class);
         httpClient3.getParams().setCookiePolicy("PermitAllCookiesSpec");
-        String url = "https://www.bing.com";
+        String url = "https://www.bing.com/search?q=spaces%20test";
         GetMethod httpGet = new GetMethod(url);
         httpClient3.executeMethod(httpGet);
         httpGet.releaseConnection();
         return httpGet.getStatusCode();
     }
 
     private int apacheHttpAsyncClient() throws ExecutionException, InterruptedException, IOException {
-        HttpGet get = new HttpGet("https://www.bing.com");
+        HttpGet get = new HttpGet("https://www.bing.com/search?q=spaces%20test");
         HttpResponse httpResponse = httpAsyncClient.execute(get, null).get();
         httpResponse.getEntity().getContent().close();
         return httpResponse.getStatusLine().getStatusCode();
@@ -114,7 +114,7 @@ private int apacheHttpAsyncClient() throws ExecutionException, InterruptedExcept
     private int okHttp3() throws IOException {
         okhttp3.OkHttpClient client = new okhttp3.OkHttpClient();
         okhttp3.Request request = new okhttp3.Request.Builder()
-                .url("https://www.bing.com")
+                .url("https://www.bing.com/search?q=spaces%20test")
                 .build();
         okhttp3.Response response = client.newCall(request).execute();
         response.body().close();
@@ -124,7 +124,7 @@ private int okHttp3() throws IOException {
     private int okHttp2() throws IOException {
         com.squareup.okhttp.OkHttpClient client = new com.squareup.okhttp.OkHttpClient();
         com.squareup.okhttp.Request request = new com.squareup.okhttp.Request.Builder()
-                .url("https://www.bing.com")
+                .url("https://www.bing.com/search?q=spaces%20test")
                 .build();
         com.squareup.okhttp.Response response = client.newCall(request).execute();
         response.body().close();
@@ -133,14 +133,14 @@ private int okHttp2() throws IOException {
 
     private int springWebClient() {
         return WebClient.create().get()
-                .uri("https://www.bing.com")
+                .uri("https://www.bing.com/search?q=spaces%20test")
                 .exchange()
                 .map(response -> response.statusCode())
                 .block().value();
     }
 
     private int httpURLConnection() throws IOException {
-        URL obj = new URL("https://www.bing.com");
+        URL obj = new URL("https://www.bing.com/search?q=spaces%20test");
         HttpURLConnection connection = (HttpURLConnection) obj.openConnection();
         // calling getContentType() first, since this triggered a bug previously in the instrumentation previously
         connection.getContentType();

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

@@ -29,7 +29,7 @@ public void testApacheHttpClient4() throws Exception {
         RemoteDependencyData rdd = (RemoteDependencyData) ((Data) rddEnvelope.getData()).getBaseData();
 
         assertTrue(rd.getSuccess());
-        assertEquals("GET /", rdd.getName());
+        assertEquals("GET /search", rdd.getName());
         assertEquals("www.bing.com", rdd.getTarget());
         assertParentChild(rd, rdEnvelope, rddEnvelope);
     }
@@ -47,7 +47,7 @@ public void testApacheHttpClient4WithResponseHandler() throws Exception {
         RemoteDependencyData rdd = (RemoteDependencyData) ((Data) rddEnvelope.getData()).getBaseData();
 
         assertTrue(rd.getSuccess());
-        assertEquals("GET /", rdd.getName());
+        assertEquals("GET /search", rdd.getName());
         assertEquals("www.bing.com", rdd.getTarget());
         assertParentChild(rd, rdEnvelope, rddEnvelope);
     }
@@ -65,7 +65,7 @@ public void testApacheHttpClient3() throws Exception {
         RemoteDependencyData rdd = (RemoteDependencyData) ((Data) rddEnvelope.getData()).getBaseData();
 
         assertTrue(rd.getSuccess());
-        assertEquals("GET /", rdd.getName());
+        assertEquals("GET /search", rdd.getName());
         assertEquals("www.bing.com", rdd.getTarget());
         assertParentChild(rd, rdEnvelope, rddEnvelope);
     }
@@ -83,7 +83,7 @@ public void testApacheHttpAsyncClient() throws Exception {
         RemoteDependencyData rdd = (RemoteDependencyData) ((Data) rddEnvelope.getData()).getBaseData();
 
         assertTrue(rd.getSuccess());
-        assertEquals("GET /", rdd.getName());
+        assertEquals("GET /search", rdd.getName());
         assertEquals("www.bing.com", rdd.getTarget());
         assertParentChild(rd, rdEnvelope, rddEnvelope);
     }
@@ -101,7 +101,7 @@ public void testOkHttp3() throws Exception {
         RemoteDependencyData rdd = (RemoteDependencyData) ((Data) rddEnvelope.getData()).getBaseData();
 
         assertTrue(rd.getSuccess());
-        assertEquals("GET /", rdd.getName());
+        assertEquals("GET /search", rdd.getName());
         assertEquals("www.bing.com", rdd.getTarget());
         assertParentChild(rd, rdEnvelope, rddEnvelope);
     }
@@ -120,7 +120,7 @@ public void testOkHttp2() throws Exception {
         RemoteDependencyData rdd = (RemoteDependencyData) ((Data) rddEnvelope.getData()).getBaseData();
 
         assertTrue(rd.getSuccess());
-        assertEquals("GET /", rdd.getName());
+        assertEquals("GET /search", rdd.getName());
         assertEquals("www.bing.com", rdd.getTarget());
         assertParentChild(rd, rdEnvelope, rddEnvelope);
     }
@@ -138,7 +138,7 @@ public void testHttpURLConnection() throws Exception {
         RemoteDependencyData rdd = (RemoteDependencyData) ((Data) rddEnvelope.getData()).getBaseData();
 
         assertTrue(rd.getSuccess());
-        assertEquals("GET /", rdd.getName());
+        assertEquals("GET /search", rdd.getName());
         assertEquals("www.bing.com", rdd.getTarget());
         assertParentChild(rd, rdEnvelope, rddEnvelope);
     }