add v2.1/track endpoint, add retry policy (#1714)

Author: kryalama

core/src/main/java/com/microsoft/applicationinsights/TelemetryChannel.java

@@ -2,6 +2,7 @@
 
 import com.azure.core.http.*;
 import com.azure.core.http.policy.HttpPipelinePolicy;
+import com.azure.core.http.policy.RetryPolicy;
 import com.azure.core.util.tracing.Tracer;
 import com.azure.monitor.opentelemetry.exporter.implementation.models.TelemetryItem;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -16,6 +17,7 @@
 import java.io.IOException;
 import java.net.URL;
 import java.nio.ByteBuffer;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
@@ -36,15 +38,18 @@ class TelemetryChannel {
     private final URL endpoint;
 
     TelemetryChannel(URL endpoint) {
+        List<HttpPipelinePolicy> policies = new ArrayList<>();
         HttpClient client = HttpClient.createDefault();
         HttpPipelineBuilder pipeline = new HttpPipelineBuilder()
                 .httpClient(client);
+        // Retry policy for failed requests
+        policies.add(new RetryPolicy());
         // TODO handle authentication exceptions
         HttpPipelinePolicy authenticationPolicy = AadAuthentication.getInstance().getAuthenticationPolicy();
         if (authenticationPolicy != null) {
-            pipeline.policies(authenticationPolicy);
+            policies.add(authenticationPolicy);
         }
-        // TODO check existing retry policy, and its configuration
+        pipeline.policies(policies.toArray(new HttpPipelinePolicy[0]));
         this.pipeline = pipeline.build();
         this.endpoint = endpoint;
     }
@@ -88,7 +93,7 @@ List<ByteBuffer> encode(List<TelemetryItem> telemetryItems) throws IOException {
     }
 
     private CompletableResultCode internalSend(List<ByteBuffer> byteBuffers) {
-        HttpRequest request = new HttpRequest(HttpMethod.POST, endpoint + "v2/track");
+        HttpRequest request = new HttpRequest(HttpMethod.POST, endpoint + "v2.1/track");
 
         request.setBody(Flux.fromIterable(byteBuffers));
 

core/src/main/java/com/microsoft/applicationinsights/internal/authentication/AadAuthentication.java

@@ -5,6 +5,7 @@
 import com.azure.core.http.HttpPipelineBuilder;
 import com.azure.core.http.policy.BearerTokenAuthenticationPolicy;
 import com.azure.core.http.policy.HttpPipelinePolicy;
+import com.azure.core.http.policy.RetryPolicy;
 import com.azure.identity.ClientSecretCredentialBuilder;
 import com.azure.identity.IntelliJCredentialBuilder;
 import com.azure.identity.ManagedIdentityCredential;
@@ -15,6 +16,9 @@
 import com.microsoft.applicationinsights.internal.system.SystemInformation;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class AadAuthentication {
     private static final String APPLICATIONINSIGHTS_AUTHENTICATION_SCOPE = "https://monitor.azure.com//.default";
 
@@ -108,13 +112,16 @@ private static HttpPipelinePolicy getAuthenticationPolicyWithSAMI() {
     }
 
     public HttpPipeline newHttpPipeLineWithAuthentication() {
-
+        List<HttpPipelinePolicy> policies = new ArrayList<>();
+        // Retry policy for failed requests
+        policies.add(new RetryPolicy());
         HttpPipelinePolicy authenticationPolicy = getAuthenticationPolicy();
         HttpClient httpClient = LazyAzureHttpClient.getInstance();
         HttpPipelineBuilder pipelineBuilder = new HttpPipelineBuilder().httpClient(httpClient);
         if(authenticationPolicy != null) {
-            pipelineBuilder.policies(authenticationPolicy);
+            policies.add(authenticationPolicy);
         }
+        pipelineBuilder.policies(policies.toArray(new HttpPipelinePolicy[0]));
         return pipelineBuilder.build();
     }
 }

core/src/main/java/com/microsoft/applicationinsights/internal/config/connection/EndpointProvider.java

@@ -7,7 +7,7 @@
 import java.net.URISyntaxException;
 
 public class EndpointProvider {
-    @VisibleForTesting static final String INGESTION_URI_PATH = "v2/track";
+    @VisibleForTesting static final String INGESTION_URI_PATH = "v2.1/track";
     @VisibleForTesting static final String LIVE_URI_PATH = "QuickPulseService.svc";
     @VisibleForTesting static final String API_PROFILES_APP_ID_URI_PREFIX = "api/profiles/"; // <base uri, with host>/api/profiles/<ikey>/appid
     @VisibleForTesting static final String API_PROFILES_APP_ID_URI_SUFFIX = "/appId";

test/fakeIngestion/servlet/src/main/java/com/microsoft/applicationinsights/test/fakeingestion/MockedAppInsightsIngestionServlet.java

@@ -159,6 +159,7 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws I
             // FIXME (trask) this only accept be "/v2/track"
             case "/v2/track":
             case "/v2//track":
+            case "/v2.1/track":
                 StringWriter w = new StringWriter();
                 try {
                     String contentEncoding = req.getHeader("content-encoding");
@@ -173,7 +174,7 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws I
                     CharStreams.copy(reader, w);
                     String body = w.toString();
                     if (PING.equals(body)) {
-                        logit("Ping received for /v2/track");
+                        logit("Ping received for /v2.1/track");
                         resp.getWriter().append(PONG);
                     }
                     else {

test/smoke/framework/testCore/src/main/java/com/microsoft/applicationinsights/smoketest/AiSmokeTest.java

@@ -483,7 +483,7 @@ public boolean apply(@Nullable Envelope input) {
     protected static void checkMockedIngestionHealth() throws Exception {
         String ok = HttpHelper.get("http://localhost:"+mockedIngestion.getPort()+"/");
         assertEquals(MockedAppInsightsIngestionServlet.ENDPOINT_HEALTH_CHECK_RESPONSE, ok);
-        String postResponse = HttpHelper.post("http://localhost:6060/v2/track", MockedAppInsightsIngestionServlet.PING);
+        String postResponse = HttpHelper.post("http://localhost:6060/v2.1/track", MockedAppInsightsIngestionServlet.PING);
         assertEquals(MockedAppInsightsIngestionServlet.PONG, postResponse);
     }
 

test/smoke/testApps/CoreAndFilter/src/main/resources/ApplicationInsights.xml

@@ -35,7 +35,7 @@
     </TelemetryInitializers>
 
     <Channel>
-        <EndpointAddress>http://non-existent-host/v2/track</EndpointAddress>
+        <EndpointAddress>http://non-existent-host/v2.1/track</EndpointAddress>
         <DeveloperMode>true</DeveloperMode>
         <FlushIntervalInSeconds>1</FlushIntervalInSeconds>
     </Channel>