Sender shorter version of host (#2680)

Author: heyams

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/statsbeat/NetworkStatsbeat.java

@@ -241,7 +241,7 @@ private static void addCommonProperties(
       StatsbeatTelemetryBuilder telemetryBuilder, IntervalMetricsKey key) {
     telemetryBuilder.addProperty("endpoint", BREEZE_ENDPOINT);
     telemetryBuilder.addProperty("cikey", key.getIkey());
-    telemetryBuilder.addProperty("host", key.getHost());
+    telemetryBuilder.addProperty("host", shorten(key.getHost()));
     String causeFieldName = key.getCauseFieldName();
     Object cause = key.getCauseValue();
     if (causeFieldName != null && cause != null) {
@@ -300,7 +300,7 @@ private double getRequestDurationAvg() {
    * e.g. endpointUrl 'https://westus-0.in.applicationinsights.azure.com/v2.1/track' host will
    * return 'westus-0'
    */
-  static String getHost(String endpointUrl) {
+  static String shorten(String endpointUrl) {
     Matcher matcher = hostPattern.matcher(endpointUrl);
 
     if (matcher.find()) {

agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/statsbeat/NetworkStatsbeatTest.java

@@ -111,27 +111,27 @@ public void run() {
   @Test
   public void testGetHost() {
     String url = "https://fakehost-1.example.com/";
-    assertThat(NetworkStatsbeat.getHost(url)).isEqualTo("fakehost-1");
+    assertThat(NetworkStatsbeat.shorten(url)).isEqualTo("fakehost-1");
 
     url = "https://fakehost-2.example.com/";
-    assertThat(NetworkStatsbeat.getHost(url)).isEqualTo("fakehost-2");
+    assertThat(NetworkStatsbeat.shorten(url)).isEqualTo("fakehost-2");
 
     url = "http://www.fakehost-3.example.com/";
-    assertThat(NetworkStatsbeat.getHost(url)).isEqualTo("fakehost-3");
+    assertThat(NetworkStatsbeat.shorten(url)).isEqualTo("fakehost-3");
 
     url = "http://www.fakehost.com/v2/track";
-    assertThat(NetworkStatsbeat.getHost(url)).isEqualTo("fakehost");
+    assertThat(NetworkStatsbeat.shorten(url)).isEqualTo("fakehost");
 
     url = "https://www.fakehost0-4.com/";
-    assertThat(NetworkStatsbeat.getHost(url)).isEqualTo("fakehost0-4");
+    assertThat(NetworkStatsbeat.shorten(url)).isEqualTo("fakehost0-4");
 
     url = "https://www.fakehost-5.com";
-    assertThat(NetworkStatsbeat.getHost(url)).isEqualTo("fakehost-5");
+    assertThat(NetworkStatsbeat.shorten(url)).isEqualTo("fakehost-5");
 
     url = "https://fakehost.com";
-    assertThat(NetworkStatsbeat.getHost(url)).isEqualTo("fakehost");
+    assertThat(NetworkStatsbeat.shorten(url)).isEqualTo("fakehost");
 
     url = "http://fakehost-5/";
-    assertThat(NetworkStatsbeat.getHost(url)).isEqualTo("fakehost-5");
+    assertThat(NetworkStatsbeat.shorten(url)).isEqualTo("fakehost-5");
   }
 }