Merge pull request #1059 from microsoft/arlittle/connection_strings/smoketests

trask · web-flow · commit 481e34c916d2 · 2019-09-24T22:23:37.000-07:00
smoketest updates for connection strings
diff --git a/core/src/main/java/com/microsoft/applicationinsights/internal/channel/ConfiguredTransmissionOutput.java b/core/src/main/java/com/microsoft/applicationinsights/internal/channel/ConfiguredTransmissionOutput.java
diff --git a/core/src/main/java/com/microsoft/applicationinsights/internal/channel/common/TransmissionNetworkOutput.java b/core/src/main/java/com/microsoft/applicationinsights/internal/channel/common/TransmissionNetworkOutput.java
@@ -23,9 +23,9 @@
 
 import com.google.common.base.Preconditions;
 import com.microsoft.applicationinsights.TelemetryConfiguration;
-import com.microsoft.applicationinsights.internal.channel.ConfiguredTransmissionOutput;
 import com.microsoft.applicationinsights.internal.channel.TransmissionDispatcher;
 import com.microsoft.applicationinsights.internal.channel.TransmissionHandlerArgs;
+import com.microsoft.applicationinsights.internal.channel.TransmissionOutput;
 import com.microsoft.applicationinsights.internal.logger.InternalLogger;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.Header;
@@ -52,7 +52,7 @@
  *
  * Created by gupele on 12/18/2014.
  */
-public final class TransmissionNetworkOutput implements ConfiguredTransmissionOutput {
+public final class TransmissionNetworkOutput implements TransmissionOutput {
     private static final String CONTENT_TYPE_HEADER = "Content-Type";
     private static final String CONTENT_ENCODING_HEADER = "Content-Encoding";
     private static final String RESPONSE_THROTTLING_HEADER = "Retry-After";
@@ -263,11 +263,6 @@ private HttpPost createTransmissionPostRequest(Transmission transmission) {
         return request;
     }
 
-    @Override
-    public void setConfiguration(TelemetryConfiguration configuration) {
-        this.configuration = configuration;
-    }
-
     private String getIngestionEndpoint() {
         if (serverUri != null) {
             return serverUri;
diff --git a/test/smoke/framework/testCore/src/main/java/com/microsoft/applicationinsights/smoketest/AiSmokeTest.java b/test/smoke/framework/testCore/src/main/java/com/microsoft/applicationinsights/smoketest/AiSmokeTest.java
@@ -53,6 +53,7 @@
 import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.Random;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -363,27 +364,38 @@ protected static void waitForApplicationToStart() throws Exception {
                     String.format("%s on %s", getAppContext(), containerInfo.getImageName()),
                     HEALTH_CHECK_RETRIES);
             System.out.println("Test app health check complete.");
-            if (requestCaptureEnabled) {
-                Stopwatch sw = Stopwatch.createStarted();
-                mockedIngestion.waitForItem(new Predicate<Envelope>() {
-                    @Override
-                    public boolean apply(Envelope input) {
-                        if (!"RequestData".equals(input.getData().getBaseType())) {
-                            return false;
-                        }
-                        RequestData data = (RequestData) ((Data) input.getData()).getBaseData();
-                        return contextRootUrl.equals(data.getUrl()) && "200".equals(data.getResponseCode());
-                    }
-                }, TELEMETRY_RECEIVE_TIMEOUT_SECONDS, TimeUnit.SECONDS);
-                System.out.printf("Received request telemetry after %.3f seconds...%n",
-                        sw.elapsed(TimeUnit.MILLISECONDS) / 1000.0);
-                System.out.println("Clearing any RequestData from health check.");
-            }
+            waitForHealthCheckTelemetryIfNeeded(contextRootUrl);
         } catch (Exception e) {
             docker.printContainerLogs(containerInfo.getContainerId());
             throw e;
+        } finally {
+            mockedIngestion.resetData();
+        }
+    }
+
+    private static void waitForHealthCheckTelemetryIfNeeded(final String contextRootUrl) throws InterruptedException, ExecutionException {
+        if (!requestCaptureEnabled) {
+            return;
+        }
+
+        Stopwatch receivedTelemetryTimer = Stopwatch.createStarted();
+        final int requestTelemetryFromHealthCheckTimeout = TELEMETRY_RECEIVE_TIMEOUT_SECONDS;
+        try {
+            mockedIngestion.waitForItem(new Predicate<Envelope>() {
+                @Override
+                public boolean apply(Envelope input) {
+                    if (!"RequestData".equals(input.getData().getBaseType())) {
+                        return false;
+                    }
+                    RequestData data = (RequestData) ((Data) input.getData()).getBaseData();
+                    return contextRootUrl.equals(data.getUrl()) && "200".equals(data.getResponseCode());
+                }
+            }, requestTelemetryFromHealthCheckTimeout, TimeUnit.SECONDS);
+            System.out.printf("Received request telemetry after %.3f seconds...%n", receivedTelemetryTimer.elapsed(TimeUnit.MILLISECONDS) / 1000.0);
+            System.out.println("Clearing any RequestData from health check.");
+        } catch (java.util.concurrent.TimeoutException e) {
+            throw new TimeoutException("request telemetry from application health check", requestTelemetryFromHealthCheckTimeout, TimeUnit.SECONDS, e);
         }
-        mockedIngestion.resetData();
     }
 
     protected void callTargetUriAndWaitForTelemetry() throws Exception {
@@ -710,8 +722,7 @@ protected static void waitForUrl(String url, long timeout, TimeUnit timeoutUnit,
         assertFalse(String.format("Empty response from '%s'. Health check urls should return something non-empty", url), rval.isEmpty());
     }
 
-    protected static void waitForUrlWithRetries(String url, long timeout, TimeUnit timeoutUnit, String appName, int numberOfRetries)
-            throws IOException {
+    protected static void waitForUrlWithRetries(String url, long timeout, TimeUnit timeoutUnit, String appName, int numberOfRetries) throws IOException {
         Preconditions.checkArgument(numberOfRetries >= 0, "numberOfRetries must be non-negative");
         int triedCount = 0;
         boolean success = false;
diff --git a/test/smoke/testApps/AutoPerfCounters/src/main/resources/ApplicationInsights.xml b/test/smoke/testApps/AutoPerfCounters/src/main/resources/ApplicationInsights.xml
@@ -4,7 +4,7 @@
 
     <!-- The key from the portal: -->
 
-    <InstrumentationKey>00000000-0000-0000-0000-0FEEDDADBEEF</InstrumentationKey>
+    <ConnectionString>InstrumentationKey=00000000-0000-0000-0000-0FEEDDADBEEF;IngestionEndpoint=http://fakeingestion:60606</ConnectionString>
 
     <SDKLogger type="CONSOLE">
         <enabled>true</enabled>
@@ -32,7 +32,6 @@
     </TelemetryInitializers>
 
     <Channel>
-        <EndpointAddress>http://fakeingestion:60606/v2/track</EndpointAddress>
         <DeveloperMode>true</DeveloperMode>
         <FlushIntervalInSeconds>1</FlushIntervalInSeconds>
     </Channel>
diff --git a/test/smoke/testApps/CachingCalculator/src/main/resources/ApplicationInsights.xml b/test/smoke/testApps/CachingCalculator/src/main/resources/ApplicationInsights.xml
@@ -4,7 +4,7 @@
 
     <!-- The key from the portal: -->
 
-    <InstrumentationKey>00000000-0000-0000-0000-0FEEDDADBEEF</InstrumentationKey>
+    <ConnectionString>InstrumentationKey=00000000-0000-0000-0000-0FEEDDADBEEF;IngestionEndpoint=http://fakeingestion:60606</ConnectionString>
 
     <SDKLogger type="CONSOLE">
         <enabled>true</enabled>
@@ -33,7 +33,7 @@
     </TelemetryInitializers>
 
     <Channel>
-        <EndpointAddress>http://fakeingestion:60606/v2/track</EndpointAddress>
+
         <DeveloperMode>true</DeveloperMode>
         <FlushIntervalInSeconds>1</FlushIntervalInSeconds>
     </Channel>
diff --git a/test/smoke/testApps/CoreAndFilter/src/main/resources/ApplicationInsights.xml b/test/smoke/testApps/CoreAndFilter/src/main/resources/ApplicationInsights.xml
@@ -4,7 +4,7 @@
 
     <!-- The key from the portal: -->
 
-    <InstrumentationKey>00000000-0000-0000-0000-0FEEDDADBEEF</InstrumentationKey>
+    <ConnectionString>InstrumentationKey=00000000-0000-0000-0000-0FEEDDADBEEF;IngestionEndpoint=http://fakeingestion:60606</ConnectionString>
 
     <SDKLogger type="CONSOLE">
         <enabled>true</enabled>
@@ -33,7 +33,6 @@
     </TelemetryInitializers>
 
     <Channel>
-        <EndpointAddress>http://fakeingestion:60606/v2/track</EndpointAddress>
         <DeveloperMode>true</DeveloperMode>
         <FlushIntervalInSeconds>1</FlushIntervalInSeconds>
     </Channel>
diff --git a/test/smoke/testApps/CustomInstrumentation/src/main/resources/ApplicationInsights.xml b/test/smoke/testApps/CustomInstrumentation/src/main/resources/ApplicationInsights.xml
@@ -3,7 +3,7 @@
 
     <!-- The key from the portal: -->
 
-    <InstrumentationKey>00000000-0000-0000-0000-0FEEDDADBEEF</InstrumentationKey>
+    <ConnectionString>InstrumentationKey=00000000-0000-0000-0000-0FEEDDADBEEF;IngestionEndpoint=http://fakeingestion:60606</ConnectionString>
 
     <SDKLogger type="CONSOLE">
         <enabled>true</enabled>
@@ -33,7 +33,6 @@
     </TelemetryInitializers>
 
     <Channel>
-        <EndpointAddress>http://fakeingestion:60606/v2/track</EndpointAddress>
         <DeveloperMode>true</DeveloperMode>
         <FlushIntervalInSeconds>1</FlushIntervalInSeconds>
     </Channel>
diff --git a/test/smoke/testApps/FixedRateSampling/src/main/resources/ApplicationInsights.xml b/test/smoke/testApps/FixedRateSampling/src/main/resources/ApplicationInsights.xml
@@ -4,7 +4,7 @@
 
     <!-- The key from the portal: -->
 
-    <InstrumentationKey>00000000-0000-0000-0000-0FEEDDADBEEF</InstrumentationKey>
+    <ConnectionString>InstrumentationKey=00000000-0000-0000-0000-0FEEDDADBEEF;IngestionEndpoint=http://fakeingestion:60606</ConnectionString>
 
     <SDKLogger type="CONSOLE">
         <enabled>true</enabled>
@@ -32,7 +32,7 @@
     </TelemetryInitializers>
 
     <Channel>
-        <EndpointAddress>http://fakeingestion:60606/v2/track</EndpointAddress>
+
         <DeveloperMode>true</DeveloperMode>
         <FlushIntervalInSeconds>1</FlushIntervalInSeconds>
     </Channel>
diff --git a/test/smoke/testApps/HeartBeat/src/main/resources/ApplicationInsights.xml b/test/smoke/testApps/HeartBeat/src/main/resources/ApplicationInsights.xml
@@ -4,7 +4,7 @@
 
     <!-- The key from the portal: -->
 
-    <InstrumentationKey>00000000-0000-0000-0000-0FEEDDADBEEF</InstrumentationKey>
+    <ConnectionString>InstrumentationKey=00000000-0000-0000-0000-0FEEDDADBEEF;IngestionEndpoint=http://fakeingestion:60606</ConnectionString>
 
     <QuickPulse enabled="false" />
     <!-- HTTP request component (not required for bare API) -->
@@ -31,7 +31,7 @@
     </TelemetryInitializers>
 
     <Channel>
-        <EndpointAddress>http://fakeingestion:60606/v2/track</EndpointAddress>
+
         <DeveloperMode>true</DeveloperMode>
         <FlushIntervalInSeconds>1</FlushIntervalInSeconds>
     </Channel>
diff --git a/test/smoke/testApps/HttpClients/src/main/resources/ApplicationInsights.xml b/test/smoke/testApps/HttpClients/src/main/resources/ApplicationInsights.xml
@@ -3,7 +3,7 @@
 
     <!-- The key from the portal: -->
 
-    <InstrumentationKey>00000000-0000-0000-0000-0FEEDDADBEEF</InstrumentationKey>
+    <ConnectionString>InstrumentationKey=00000000-0000-0000-0000-0FEEDDADBEEF;IngestionEndpoint=http://fakeingestion:60606</ConnectionString>
 
     <SDKLogger type="CONSOLE">
         <enabled>true</enabled>
@@ -33,7 +33,7 @@
     </TelemetryInitializers>
 
     <Channel>
-        <EndpointAddress>http://fakeingestion:60606/v2/track</EndpointAddress>
+
         <DeveloperMode>true</DeveloperMode>
         <FlushIntervalInSeconds>1</FlushIntervalInSeconds>
     </Channel>
diff --git a/test/smoke/testApps/Jdbc/src/main/resources/ApplicationInsights.xml b/test/smoke/testApps/Jdbc/src/main/resources/ApplicationInsights.xml
@@ -3,7 +3,7 @@
 
     <!-- The key from the portal: -->
 
-    <InstrumentationKey>00000000-0000-0000-0000-0FEEDDADBEEF</InstrumentationKey>
+    <ConnectionString>InstrumentationKey=00000000-0000-0000-0000-0FEEDDADBEEF;IngestionEndpoint=http://fakeingestion:60606</ConnectionString>
 
     <SDKLogger type="CONSOLE">
         <enabled>true</enabled>
@@ -33,7 +33,7 @@
     </TelemetryInitializers>
 
     <Channel>
-        <EndpointAddress>http://fakeingestion:60606/v2/track</EndpointAddress>
+
         <DeveloperMode>true</DeveloperMode>
         <FlushIntervalInSeconds>1</FlushIntervalInSeconds>
     </Channel>
diff --git a/test/smoke/testApps/SpringBoot1_3Auto/src/main/resources/ApplicationInsights.xml b/test/smoke/testApps/SpringBoot1_3Auto/src/main/resources/ApplicationInsights.xml
@@ -3,7 +3,7 @@
 
     <!-- The key from the portal: -->
 
-    <InstrumentationKey>00000000-0000-0000-0000-0FEEDDADBEEF</InstrumentationKey>
+    <ConnectionString>InstrumentationKey=00000000-0000-0000-0000-0FEEDDADBEEF;IngestionEndpoint=http://fakeingestion:60606</ConnectionString>
 
     <SDKLogger type="CONSOLE">
         <enabled>true</enabled>
@@ -32,6 +32,7 @@
     </TelemetryInitializers>
 
     <Channel>
-        <EndpointAddress>http://fakeingestion:60606/v2/track</EndpointAddress>
+        <DeveloperMode>true</DeveloperMode>
+        <FlushIntervalInSeconds>1</FlushIntervalInSeconds>
     </Channel>
 </ApplicationInsights>
diff --git a/test/smoke/testApps/SpringBootAuto/src/main/resources/ApplicationInsights.xml b/test/smoke/testApps/SpringBootAuto/src/main/resources/ApplicationInsights.xml
@@ -3,7 +3,7 @@
 
     <!-- The key from the portal: -->
 
-    <InstrumentationKey>00000000-0000-0000-0000-0FEEDDADBEEF</InstrumentationKey>
+    <ConnectionString>InstrumentationKey=00000000-0000-0000-0000-0FEEDDADBEEF;IngestionEndpoint=http://fakeingestion:60606</ConnectionString>
 
     <SDKLogger type="CONSOLE">
         <enabled>true</enabled>
@@ -32,6 +32,7 @@
     </TelemetryInitializers>
 
     <Channel>
-        <EndpointAddress>http://fakeingestion:60606/v2/track</EndpointAddress>
+        <DeveloperMode>true</DeveloperMode>
+        <FlushIntervalInSeconds>1</FlushIntervalInSeconds>
     </Channel>
 </ApplicationInsights>
diff --git a/test/smoke/testApps/SpringBootTest/src/main/resources/application.properties b/test/smoke/testApps/SpringBootTest/src/main/resources/application.properties
@@ -1,6 +1,5 @@
 spring.application.name=SpringBootTest
-azure.application-insights.channel.in-process.endpoint-address=http://fakeingestion:60606/v2/track
-azure.application-insights.instrumentation-key=00000000-0000-0000-0000-cba987654321
+azure.application-insights.connection-string=InstrumentationKey=00000000-0000-0000-0000-cba987654321;IngestionEndpoint=http://fakeingestion:60606
 azure.application-insights.logger.level=TRACE
 azure.application-insights.default-modules.ProcessPerformanceCountersModule.enabled=false
 azure.application-insights.default-modules.JvmPerformanceCountersModule.enabled=false
diff --git a/test/smoke/testApps/TraceLog4j1_2/src/main/resources/ApplicationInsights.xml b/test/smoke/testApps/TraceLog4j1_2/src/main/resources/ApplicationInsights.xml
@@ -4,7 +4,7 @@
 
     <!-- The key from the portal: -->
 
-    <InstrumentationKey>00000000-0000-0000-0000-0FEEDDADBEEF</InstrumentationKey>
+    <ConnectionString>InstrumentationKey=00000000-0000-0000-0000-0FEEDDADBEEF;IngestionEndpoint=http://fakeingestion:60606</ConnectionString>
 
     <!-- HTTP request component (not required for bare API) -->
 
@@ -28,7 +28,7 @@
     </TelemetryInitializers>
 
     <Channel>
-        <EndpointAddress>http://fakeingestion:60606/v2/track</EndpointAddress>
+
         <DeveloperMode>true</DeveloperMode>
         <FlushIntervalInSeconds>1</FlushIntervalInSeconds>
     </Channel>
diff --git a/test/smoke/testApps/TraceLog4j1_2UsingAgent/src/main/resources/ApplicationInsights.xml b/test/smoke/testApps/TraceLog4j1_2UsingAgent/src/main/resources/ApplicationInsights.xml
@@ -4,7 +4,7 @@
 
     <!-- The key from the portal: -->
 
-    <InstrumentationKey>00000000-0000-0000-0000-0FEEDDADBEEF</InstrumentationKey>
+    <ConnectionString>InstrumentationKey=00000000-0000-0000-0000-0FEEDDADBEEF;IngestionEndpoint=http://fakeingestion:60606</ConnectionString>
 
     <!-- HTTP request component (not required for bare API) -->
 
@@ -28,7 +28,8 @@
     </TelemetryInitializers>
 
     <Channel>
-        <EndpointAddress>http://fakeingestion:60606/v2/track</EndpointAddress>
+        <DeveloperMode>true</DeveloperMode>
+        <FlushIntervalInSeconds>1</FlushIntervalInSeconds>
     </Channel>
     <PerformanceCounters>
         <UseBuiltIn>False</UseBuiltIn>
diff --git a/test/smoke/testApps/TraceLog4j2/src/main/resources/ApplicationInsights.xml b/test/smoke/testApps/TraceLog4j2/src/main/resources/ApplicationInsights.xml
@@ -4,7 +4,7 @@
 
     <!-- The key from the portal: -->
 
-    <InstrumentationKey>00000000-0000-0000-0000-0FEEDDADBEEF</InstrumentationKey>
+    <ConnectionString>InstrumentationKey=00000000-0000-0000-0000-0FEEDDADBEEF;IngestionEndpoint=http://fakeingestion:60606</ConnectionString>
 
     <!-- HTTP request component (not required for bare API) -->
     <QuickPulse enabled="false" />
@@ -27,7 +27,7 @@
     </TelemetryInitializers>
 
     <Channel>
-        <EndpointAddress>http://fakeingestion:60606/v2/track</EndpointAddress>
+
         <DeveloperMode>true</DeveloperMode>
         <FlushIntervalInSeconds>1</FlushIntervalInSeconds>
     </Channel>
diff --git a/test/smoke/testApps/TraceLog4j2UsingAgent/src/main/resources/ApplicationInsights.xml b/test/smoke/testApps/TraceLog4j2UsingAgent/src/main/resources/ApplicationInsights.xml
@@ -4,7 +4,7 @@
 
     <!-- The key from the portal: -->
 
-    <InstrumentationKey>00000000-0000-0000-0000-0FEEDDADBEEF</InstrumentationKey>
+    <ConnectionString>InstrumentationKey=00000000-0000-0000-0000-0FEEDDADBEEF;IngestionEndpoint=http://fakeingestion:60606</ConnectionString>
 
     <!-- HTTP request component (not required for bare API) -->
     <QuickPulse enabled="false" />
@@ -27,7 +27,8 @@
     </TelemetryInitializers>
 
     <Channel>
-        <EndpointAddress>http://fakeingestion:60606/v2/track</EndpointAddress>
+        <DeveloperMode>true</DeveloperMode>
+        <FlushIntervalInSeconds>1</FlushIntervalInSeconds>
     </Channel>
     <PerformanceCounters>
         <UseBuiltIn>False</UseBuiltIn>
diff --git a/test/smoke/testApps/TraceLogBack/src/main/resources/ApplicationInsights.xml b/test/smoke/testApps/TraceLogBack/src/main/resources/ApplicationInsights.xml
@@ -3,7 +3,7 @@
 
     <!-- The key from the portal: -->
 
-    <InstrumentationKey>00000000-0000-0000-0000-0FEEDDADBEEF</InstrumentationKey>
+    <ConnectionString>InstrumentationKey=00000000-0000-0000-0000-0FEEDDADBEEF;IngestionEndpoint=http://fakeingestion:60606</ConnectionString>
 
     <!-- HTTP request component (not required for bare API) -->
 
@@ -27,7 +27,7 @@
     </TelemetryInitializers>
 
     <Channel>
-        <EndpointAddress>http://fakeingestion:60606/v2/track</EndpointAddress>
+
         <DeveloperMode>true</DeveloperMode>
         <FlushIntervalInSeconds>1</FlushIntervalInSeconds>
     </Channel>
diff --git a/test/smoke/testApps/TraceLogBackUsingAgent/src/main/resources/ApplicationInsights.xml b/test/smoke/testApps/TraceLogBackUsingAgent/src/main/resources/ApplicationInsights.xml
diff --git a/test/smoke/testApps/WebAuto/src/main/resources/ApplicationInsights.xml b/test/smoke/testApps/WebAuto/src/main/resources/ApplicationInsights.xml
