add trask's changes back after merge from main

Author: harsimar

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/httpclient/LazyHttpClient.java

@@ -8,6 +8,10 @@
 import com.azure.core.http.HttpClient;
 import com.azure.core.http.HttpPipeline;
 import com.azure.core.http.HttpPipelineBuilder;
+import com.azure.core.http.HttpPipelineCallContext;
+import com.azure.core.http.HttpPipelineNextPolicy;
+import com.azure.core.http.HttpPipelineNextSyncPolicy;
+import com.azure.core.http.HttpPipelinePosition;
 import com.azure.core.http.HttpRequest;
 import com.azure.core.http.HttpResponse;
 import com.azure.core.http.ProxyOptions;
@@ -31,6 +35,7 @@
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
 import javax.annotation.Nullable;
 import reactor.core.publisher.Mono;
 import reactor.netty.resources.LoopResources;
@@ -110,18 +115,20 @@ private static HttpClient init() {
   }
 
   public static HttpPipeline newHttpPipeLineWithDefaultRedirect(
-      @Nullable Configuration.AadAuthentication aadConfiguration, String aadAudienceWithScope) {
+      @Nullable Configuration.AadAuthentication aadConfiguration, Supplier<String> aadAudienceWithScope) {
     return newHttpPipeLine(
         aadConfiguration, aadAudienceWithScope, new RedirectPolicy(new DefaultRedirectStrategy()));
   }
 
   public static HttpPipeline newHttpPipeLine(
       @Nullable Configuration.AadAuthentication aadConfiguration,
-      String aadAudienceWithScope,
+      Supplier<String> aadAudienceWithScope,
       HttpPipelinePolicy... additionalPolicies) {
     List<HttpPipelinePolicy> policies = new ArrayList<>();
     if (aadConfiguration != null && aadConfiguration.enabled) {
-      policies.add(getAuthenticationPolicy(aadConfiguration, aadAudienceWithScope));
+      policies.add(
+          new LazyHttpPipelinePolicy(
+              () -> getAuthenticationPolicy(aadConfiguration, aadAudienceWithScope.get())));
     }
     policies.addAll(asList(additionalPolicies));
     // Add Logging Policy. Can be enabled using AZURE_LOG_LEVEL.
@@ -190,4 +197,41 @@ private static HttpPipelinePolicy getAuthenticationPolicyWithSami(String aadAudi
         new ManagedIdentityCredentialBuilder().build();
     return new BearerTokenAuthenticationPolicy(managedIdentityCredential, aadAudienceWithScope);
   }
+
+  private static class LazyHttpPipelinePolicy implements HttpPipelinePolicy {
+
+    private final Supplier<HttpPipelinePolicy> supplier;
+    private volatile HttpPipelinePolicy delegate;
+
+    LazyHttpPipelinePolicy(Supplier<HttpPipelinePolicy> supplier) {
+      this.supplier = supplier;
+    }
+
+    @Override
+    public Mono<HttpResponse> process(
+        HttpPipelineCallContext context, HttpPipelineNextPolicy next) {
+      createDelegateFirstTime();
+      return delegate.process(context, next);
+    }
+
+    @Override
+    public HttpResponse processSync(
+        HttpPipelineCallContext context, HttpPipelineNextSyncPolicy next) {
+      createDelegateFirstTime();
+      return delegate.processSync(context, next);
+    }
+
+    @Override
+    public HttpPipelinePosition getPipelinePosition() {
+      createDelegateFirstTime();
+      return delegate.getPipelinePosition();
+    }
+
+    private void createDelegateFirstTime() {
+      if (delegate == null) {
+        delegate = supplier.get();
+      }
+    }
+  }
+
 }

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/SecondEntryPoint.java

@@ -201,7 +201,7 @@ public void customize(AutoConfigurationCustomizer autoConfiguration) {
     if (telemetryClient.getConnectionString() != null) {
       statsbeatModule.start(
           AzureMonitorHelper.createStatsbeatTelemetryItemExporter(
-              LazyHttpClient.newHttpPipeLine(null, telemetryClient.getAadAudienceWithScope()),
+              LazyHttpClient.newHttpPipeLine(null, telemetryClient::getAadAudienceWithScope),
               statsbeatModule,
               tempDir),
           telemetryClient::getStatsbeatConnectionString,
@@ -227,7 +227,7 @@ public void customize(AutoConfigurationCustomizer autoConfiguration) {
       quickPulse =
           QuickPulse.create(
               LazyHttpClient.newHttpPipeLineWithDefaultRedirect(
-                  configuration.authentication, telemetryClient.getAadAudienceWithScope()),
+                  configuration.authentication, telemetryClient::getAadAudienceWithScope),
               () -> {
                 ConnectionString connectionString = telemetryClient.getConnectionString();
                 return connectionString == null ? null : connectionString.getLiveEndpoint();

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/profiler/ProfilingInitializer.java

@@ -121,7 +121,7 @@ private synchronized void performInit() {
     httpPipeline =
         LazyHttpClient.newHttpPipeLine(
             telemetryClient.getAadAuthentication(),
-            telemetryClient.getAadAudienceWithScope(),
+            telemetryClient::getAadAudienceWithScope,
             new RedirectPolicy(
                 new DefaultRedirectStrategy(
                     3,

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/telemetry/TelemetryClient.java

@@ -85,9 +85,6 @@ public class TelemetryClient {
   @Nullable private volatile BatchItemProcessor metricsBatchItemProcessor;
   @Nullable private volatile BatchItemProcessor statsbeatBatchItemProcessor;
 
-  private static final String APPLICATIONINSIGHTS_AUTHENTICATION_SCOPE =
-      "https://monitor.azure.com//.default";
-
   public static TelemetryClient.Builder builder() {
     return new TelemetryClient.Builder();
   }
@@ -229,7 +226,7 @@ private BatchItemProcessor initBatchItemProcessor(
     HttpPipeline httpPipeline =
         LazyHttpClient.newHttpPipeLine(
             aadAuthentication,
-            getAadAudienceWithScope(),
+            this::getAadAudienceWithScope,
             new NetworkStatsbeatHttpPipelinePolicy(statsbeatModule.getNetworkStatsbeat()));
     // TODO (heya) refactor the following by using AzureMonitorHelper.createTelemetryItemExporter by
     // passing in getNonessentialStatsbeat
@@ -357,9 +354,6 @@ public ConnectionString getConnectionString() {
   }
 
   public String getAadAudienceWithScope() {
-    if (connectionString == null) {
-      return APPLICATIONINSIGHTS_AUTHENTICATION_SCOPE;
-    }
     return connectionString.getAadAudienceWithScope();
   }