Trask Stalnaker (trask) · May 29, 2019 · Apr 22, 2019 · Apr 22, 2019 · May 6, 2019 · May 16, 2019
diff --git a/.../java/com/microsoft/applicationinsights/agent/internal/agent/HttpClientMethodVisitor.java b/.../java/com/microsoft/applicationinsights/agent/internal/agent/HttpClientMethodVisitor.java
@@ -236,14 +236,14 @@ protected void byteCodeForMethodExit(int opcode) {
 
                 mv.visitFieldInsn(Opcodes.GETSTATIC, internalName, "INSTANCE", "L" + internalName + ";");
 
-                mv.visitLdcInsn(getMethodName());
-                mv.visitVarInsn(ALOAD, methodLocal);
+                mv.visitLdcInsn(getMethodName()); // identifier
+                mv.visitVarInsn(ALOAD, methodLocal);  // method
                 //Path is populated in CoreAgentNotificationHandler httpMethodFinished() method
-                mv.visitVarInsn(ALOAD, childIdLocal);
-                mv.visitVarInsn(ALOAD, uriLocal);
-                mv.visitVarInsn(ALOAD, targetLocal); //using derived target
-                mv.visitVarInsn(ILOAD, statusCodeLocal);
-                mv.visitVarInsn(LLOAD, deltaInNS);
+                mv.visitVarInsn(ALOAD, childIdLocal); // correlationId
+                mv.visitVarInsn(ALOAD, uriLocal); // uri
+                mv.visitVarInsn(ALOAD, targetLocal); // target; using derived target
+                mv.visitVarInsn(ILOAD, statusCodeLocal); // result
+                mv.visitVarInsn(LLOAD, deltaInNS); // delta
                 mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, internalName, FINISH_DETECT_METHOD_NAME, FINISH_METHOD_RETURN_SIGNATURE, false);
 
                 //skip the following instructions

diff --git a/azure-application-insights-spring-boot-starter/build.gradle b/azure-application-insights-spring-boot-starter/build.gradle
@@ -51,12 +51,16 @@ dependencies {
     compile(project(':web'))
     compile(project(':ApplicationInsightsInternalLogger'))
     compile ([group: 'org.apache.commons', name: 'commons-lang3', version: '3.7'])
-    provided('org.springframework.boot:spring-boot:1.5.9.RELEASE')
-    provided('org.springframework.boot:spring-boot-autoconfigure:1.5.9.RELEASE')
-    provided('org.springframework.boot:spring-boot-starter-web:1.5.9.RELEASE')
-    provided('org.springframework.boot:spring-boot-configuration-processor:1.5.9.RELEASE')
+    compileOnly('org.springframework.boot:spring-boot:1.5.9.RELEASE')
+    compileOnly('org.springframework.boot:spring-boot-autoconfigure:1.5.9.RELEASE')
+    compileOnly('org.springframework.boot:spring-boot-starter-web:1.5.9.RELEASE')
+    compileOnly('org.springframework.boot:spring-boot-configuration-processor:1.5.9.RELEASE')
     testCompile('junit:junit:4.12')
     testCompile('org.springframework.boot:spring-boot-starter-test:1.5.9.RELEASE')
+    testCompile('org.springframework.boot:spring-boot:1.5.9.RELEASE')
+    testCompile('org.springframework.boot:spring-boot-autoconfigure:1.5.9.RELEASE')
+    testCompile('org.springframework.boot:spring-boot-starter-web:1.5.9.RELEASE')
+    testCompile('org.springframework.boot:spring-boot-configuration-processor:1.5.9.RELEASE')
     testCompile('org.assertj:assertj-core:2.6.0')
 }
 

diff --git a/collectd/build.gradle b/collectd/build.gradle
@@ -41,28 +41,12 @@ if (!collectDLibPath.exists()) {
 
 archivesBaseName = 'applicationinsights-collectd'
 
-// Defining a local provided configuration WITHOUT having it extending the compile configuration (like done in
-// the provided-configuration.gradle file).
-// This is a work-around so the collectd library (org.collectd.api) will be excluded from the generated jar
-configurations {
-    provided
-}
-sourceSets {
-    main {
-        compileClasspath += configurations.provided
-        runtimeClasspath += configurations.provided
-    }
-    test {
-        compileClasspath += configurations.provided
-        runtimeClasspath += configurations.provided
-    }
-}
-
 dependencies {
     compile project(':core')
-    provided files(collectDLibPath)
+    compileOnly files(collectDLibPath)
     testCompile group: 'org.mockito', name: 'mockito-core', version: '1.10.19'
     testCompile group: 'junit', name: 'junit', version: '4.12'
+    testCompile files(collectDLibPath)
 }
 
 // Building the shadow (fat) jar after compiling sources.

diff --git a/core/build.gradle b/core/build.gradle
@@ -108,7 +108,7 @@ import com.microsoft.applicationinsights.build.tasks.PropsFileGen
 archivesBaseName = 'applicationinsights-core'
 
 dependencies {
-    provided (project(':agent')) { transitive = false }
+    compileOnly (project(':agent')) { transitive = false }
     compile(project(':ApplicationInsightsInternalLogger'))
     compile ([group: 'eu.infomas', name: 'annotation-detector', version: '3.0.5'])
     compile ([group: 'commons-io', name: 'commons-io', version: '2.6' ])
@@ -119,6 +119,7 @@ dependencies {
     compile ([group: 'io.grpc', name: 'grpc-stub', version: '1.16.1'])
     compile ([group: 'io.grpc', name: 'grpc-protobuf', version: '1.16.1'])
     runtime ([group: 'io.grpc', name: 'grpc-netty-shaded', version: '1.16.1'])
+    testCompile (project(':agent')) { transitive = false }
     testCompile group: 'org.hamcrest', name:'hamcrest-core', version:'1.3'
     testCompile group: 'org.hamcrest', name:'hamcrest-library', version:'1.3'
     testCompile group: 'org.mockito', name: 'mockito-core', version: '1.10.19'

diff --git a/...va/com/microsoft/applicationinsights/internal/channel/common/GzipTelemetrySerializer.java b/...va/com/microsoft/applicationinsights/internal/channel/common/GzipTelemetrySerializer.java
@@ -97,8 +97,6 @@ public Optional<Transmission> serialize(Collection<String> telemetries) {
 
     private boolean compress(GZIPOutputStream zipStream, Collection<String> telemetries) throws IOException {
         int counter = 0;
-        StringWriter writer = new StringWriter();
-        JsonTelemetryDataSerializer jsonWriter = new JsonTelemetryDataSerializer(writer);
 
         // The format is:
         // 1. Separate each Telemetry by newline
@@ -115,11 +113,6 @@ private boolean compress(GZIPOutputStream zipStream, Collection<String> telemetr
             } catch (Exception e) {
                 InternalLogger.INSTANCE.error("Failed to serialize , exception: %s", e.toString());
             }
-
-            if (counter < telemetries.size()) {
-                writer.getBuffer().setLength(0);
-                jsonWriter.reset(writer);
-            }
         }
 
         return counter > 0;

diff --git a/.../com/microsoft/applicationinsights/internal/channel/common/TransmissionPolicyManager.java b/.../com/microsoft/applicationinsights/internal/channel/common/TransmissionPolicyManager.java
@@ -129,7 +129,7 @@ public void backoff() {
     public void clearBackoff() {
         policyState.setCurrentState(TransmissionPolicy.UNBLOCKED);
         backoffManager.onDoneSending();
-        InternalLogger.INSTANCE.info("Backoff has been reset.");
+//        InternalLogger.INSTANCE.info("Backoff has been reset.");
     }
 
     /**

diff --git a/.../src/main/java/com/microsoft/applicationinsights/internal/perfcounter/JniPCConnector.java b/.../src/main/java/com/microsoft/applicationinsights/internal/perfcounter/JniPCConnector.java
@@ -193,7 +193,11 @@ private static void loadNativeLibrary() throws IOException {
     }
 
     private static void extractToLocalFolder(File dllOnDisk, String libraryToLoad) throws IOException {
-        InputStream in = JniPCConnector.class.getClassLoader().getResourceAsStream(libraryToLoad);
+        ClassLoader classLoader = JniPCConnector.class.getClassLoader();
+        if (classLoader == null) {
+            classLoader = ClassLoader.getSystemClassLoader();
+        }
+        InputStream in = classLoader.getResourceAsStream(libraryToLoad);
         if (in == null) {
             throw new RuntimeException(String.format("Failed to find '%s' in jar", libraryToLoad));
         }

diff --git a/core/src/main/java/com/microsoft/applicationinsights/internal/util/PropertyHelper.java b/core/src/main/java/com/microsoft/applicationinsights/internal/util/PropertyHelper.java
@@ -50,6 +50,9 @@ public static Properties getProperties(String name) throws IOException
     {
         Properties props = new Properties();
         ClassLoader classLoader = PropertyHelper.class.getClassLoader();
+        if (classLoader == null) {
+            classLoader = ClassLoader.getSystemClassLoader();
+        }
 
         // Look in the class loader's default location.
         InputStream inputStream = classLoader.getResourceAsStream(name);

diff --git a/core/src/main/java/com/microsoft/applicationinsights/telemetry/ExceptionTelemetry.java b/core/src/main/java/com/microsoft/applicationinsights/telemetry/ExceptionTelemetry.java
@@ -51,7 +51,7 @@ public final class ExceptionTelemetry extends BaseSampleSourceTelemetry<Exceptio
     public static final String BASE_TYPE = "ExceptionData";
 
 
-    private ExceptionTelemetry() {
+    public ExceptionTelemetry() {
         super();
         data = new ExceptionData();
         initialize(data.getProperties());

diff --git a/...rc/main/java/com/microsoft/applicationinsights/telemetry/JsonTelemetryDataSerializer.java b/...rc/main/java/com/microsoft/applicationinsights/telemetry/JsonTelemetryDataSerializer.java
@@ -243,26 +243,22 @@ public <T extends JsonSerializable> void write(String name, T value) throws IOEx
 
     public <T> void write(String name, Map<String, T> map) throws IOException {
 
-        if (map == null) {
+        if (map == null || map.isEmpty()) {
             return;
         }
 
         writeName(name);
         try {
-            if (map.size() < 1) {
-                out.write("null");
-            } else {
-                out.write(JSON_START_OBJECT);
-
-                separator = "";
-                for (Map.Entry<String, T> entry : map.entrySet()) {
-                    writeName(sanitizeKey(entry.getKey()));
-                    write(entry.getValue());
-                    separator = JSON_SEPARATOR;
-                }
+            out.write(JSON_START_OBJECT);
 
-                out.write(JSON_CLOSE_OBJECT);
+            separator = "";
+            for (Map.Entry<String, T> entry : map.entrySet()) {
+                writeName(sanitizeKey(entry.getKey()));
+                write(entry.getValue());
+                separator = JSON_SEPARATOR;
             }
+
+            out.write(JSON_CLOSE_OBJECT);
         } finally {
             separator = JSON_SEPARATOR;
         }
@@ -367,9 +363,6 @@ private String sanitizeStringForJSON(String text, int maxLength) {
             else if(curr == '\\'){
                 result.append("\\\\");
             }
-            else if(curr == '/'){
-                result.append("\\/");
-            }
             else if(curr == '\b'){
                 result.append("\\b");
             }

diff --git a/...est/java/com/microsoft/applicationinsights/telemetry/PerformanceCounterTelemetryTest.java b/...est/java/com/microsoft/applicationinsights/telemetry/PerformanceCounterTelemetryTest.java
@@ -119,7 +119,7 @@ private static void verifyJson(
         telemetry.serialize(jsonWriter);
         jsonWriter.close();
         String asJson = writer.toString();
-        String expectedPerformanceDataPartFormat = "\"baseData\":{\"ver\":2,\"categoryName\":\"%s\",\"counterName\":\"%s\",\"instanceName\":\"%s\",\"value\":%.1f,\"properties\":null}}}";
+        String expectedPerformanceDataPartFormat = "\"baseData\":{\"ver\":2,\"categoryName\":\"%s\",\"counterName\":\"%s\",\"instanceName\":\"%s\",\"value\":%.1f}}}";
         String expected = String.format(expectedPerformanceDataPartFormat, expectedCategory, expectedCounter, expectedInstance, expectedValue);
         assertTrue(asJson.indexOf(expected) != -1);
     }

diff --git a/distributions/build.gradle b/distributions/build.gradle
@@ -47,30 +47,5 @@ dependencies {
     compile project(':logging:logback')
 }
 
-gradle.projectsEvaluated {
-    project.configurations.compile.dependencies.each { dep ->
-        ConfigurationContainer cc = dep.dependencyProject.configurations
-
-        def providedConfiguration = cc.findByName("provided")
-        if (providedConfiguration != null) {
-            providedConfiguration.dependencies.each { provDep ->
-                shadowJar {
-                    dependencies {
-                        if (provDep instanceof ProjectDependency) {
-                            def projPath = provDep.dependencyProject.path
-                            logger.info "Excluding provided project dependency for project $projPath"
-                            exclude(project(projPath))
-                        } else if (provDep instanceof ExternalModuleDependency) {
-                            def gav = "$provDep.group:$provDep.name:$provDep.version"
-                            logger.info "Excluding provided external dependency for artifact $gav"
-                            exclude(dependency(gav))
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
 // Building the shadow (fat) jar after compiling sources.
 shadowJar.dependsOn assemble
diff --git a/gradle/provided-configuration.gradle b/gradle/provided-configuration.gradle
diff --git a/gradle/publishing.gradle b/gradle/publishing.gradle
@@ -20,7 +20,6 @@
  */
 
 apply plugin: 'maven'
-apply from: "$buildScriptsDir/provided-configuration.gradle"
 
 ext {
     projectPomName = ""
@@ -131,8 +130,6 @@ def updatePomWithGeneralProjectInformation(pomObject) {
             }
         }
 
-        scopeMappings.addMapping(MavenPlugin.PROVIDED_COMPILE_PRIORITY, configurations.getByName("provided"), Conf2ScopeMappingContainer.PROVIDED)
-
         withXml {
             // Append license text to pom.xml
             def pomText = asString()
@@ -150,7 +147,7 @@ def updatePomWithGeneralProjectInformation(pomObject) {
 
 javadoc {
     source = sourceSets.main.allJava
-    classpath = configurations.compile + configurations.provided
+    classpath = configurations.compile
 }
 
 task prepareSourcesArchive(type: Jar) {

diff --git a/...Core/src/main/java/com/microsoft/applicationinsights/smoketest/docker/AiDockerClient.java b/...Core/src/main/java/com/microsoft/applicationinsights/smoketest/docker/AiDockerClient.java
@@ -155,7 +155,7 @@ public void execOnContainer(String id, String cmd, String... args) throws IOExce
 		}
 	}
 
-	private static void waitAndCheckCodeForProcess(Process p, long timeout, TimeUnit unit, String actionName) throws IOException, InterruptedException {
+	private void waitAndCheckCodeForProcess(Process p, long timeout, TimeUnit unit, String actionName) throws IOException, InterruptedException {
 		waitForProcessToReturn(p, timeout, unit, actionName);
 		if (p.exitValue() != 0) {
 			flushStdout(p);
@@ -164,9 +164,11 @@ private static void waitAndCheckCodeForProcess(Process p, long timeout, TimeUnit
 		}
 	}
 
-	private static void waitForProcessToReturn(Process p, long timeout, TimeUnit unit, String actionName) throws IOException, InterruptedException {
+	private void waitForProcessToReturn(Process p, long timeout, TimeUnit unit, String actionName) throws IOException, InterruptedException {
 		if (!p.waitFor(timeout, unit)) {
-			p.destroyForcibly();
+		    String containerId = getFirstLineOfProcessOutput(p);
+		    printContainerLogs(containerId);
+		    p.destroyForcibly();
 			flushStdout(p);
 			throw new TimeoutException(
 					Strings.isNullOrEmpty(actionName) ? "process" : actionName,

diff --git a/test/smoke/testApps/CoreAndFilter/build.gradle b/test/smoke/testApps/CoreAndFilter/build.gradle
@@ -11,6 +11,8 @@ dependencies {
 
     smokeTestCompile 'com.google.guava:guava:23.0'
     testCompile 'com.google.guava:guava:23.0' // VSCODE intellisense bug workaround
+
+    testCompile group:'org.hamcrest', name:'hamcrest-library', version:'1.3'
 }
 
 compileJava.sourceCompatibility = 1.7

diff --git a/test/smoke/testApps/FixedRateSampling/build.gradle b/test/smoke/testApps/FixedRateSampling/build.gradle
@@ -12,6 +12,8 @@ dependencies {
     smokeTestCompile 'com.google.guava:guava:23.0'
 
     testCompile 'com.google.guava:guava:23.0' // VSCODE intellisense bug workaround
+
+    testCompile group:'org.hamcrest', name:'hamcrest-library', version:'1.3'
 }
 
 compileJava.sourceCompatibility = 1.7

diff --git a/...pps/SpringBootTest/src/main/java/com/springbootstartertest/controller/TestController.java b/...pps/SpringBootTest/src/main/java/com/springbootstartertest/controller/TestController.java
@@ -56,7 +56,6 @@ public void resultCodeTest() throws Exception {
 		throw new ServletException("This is an exception");
 	}
 
-	@Async
 	@GetMapping("/asyncDependencyCall")
 	public AsyncResult<Integer> asyncDependencyCall() throws IOException {
         String url = "https://www.bing.com";

diff --git a/web/build.gradle b/web/build.gradle
@@ -29,16 +29,21 @@ apply from: "$buildScriptsDir/publishing.gradle"
 archivesBaseName = 'applicationinsights-web'
 
 dependencies {
-    provided (project(':agent')) { transitive = false }
+    compileOnly (project(':agent')) { transitive = false }
     compile (project(':core')) { transitive = false }
     compile(project(':ApplicationInsightsInternalLogger'))
     compile ([group: 'org.apache.commons', name: 'commons-lang3', version: '3.7'])
     compile ([group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.3'])
     compile ([group: 'org.apache.httpcomponents', name: 'httpasyncclient', version: '4.1.3'])
-    provided 'com.opensymphony:xwork:2.0.4' // Struts 2
-    provided 'org.springframework:spring-webmvc:3.1.0.RELEASE'
-    provided group: 'javax.servlet', name: 'javax.servlet-api', version: '3.0.1'
-    provided group: 'javax.enterprise', name: 'cdi-api', version: '1.1' // Java EE
+    compileOnly 'com.opensymphony:xwork:2.0.4' // Struts 2
+    compileOnly 'org.springframework:spring-webmvc:3.1.0.RELEASE'
+    compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.0.1'
+    compileOnly group: 'javax.enterprise', name: 'cdi-api', version: '1.1' // Java EE
+    testCompile (project(':agent')) { transitive = false }
+    testCompile 'com.opensymphony:xwork:2.0.4' // Struts 2
+    testCompile 'org.springframework:spring-webmvc:3.1.0.RELEASE'
+    testCompile group: 'javax.servlet', name: 'javax.servlet-api', version: '3.0.1'
+    testCompile group: 'javax.enterprise', name: 'cdi-api', version: '1.1' // Java EE
     testCompile group: 'org.hamcrest', name:'hamcrest-core', version:'1.3'
     testCompile group: 'org.hamcrest', name:'hamcrest-library', version:'1.3'
     testCompile group: 'org.mockito', name: 'mockito-core', version: '1.10.19'

diff --git a/...ft/applicationinsights/web/extensibility/initializers/WebSessionTelemetryInitializer.java b/...ft/applicationinsights/web/extensibility/initializers/WebSessionTelemetryInitializer.java
@@ -54,6 +54,8 @@ protected void onInitializeTelemetry(Telemetry telemetry) {
         session.setId(requestSessionContext.getId());
 
         Boolean isFirst = requestSessionContext.getIsFirst();
-        session.setIsFirst(isFirst != null ? isFirst : false);
+        if (isFirst != null) {
+            session.setIsFirst(isFirst);
+        }
     }
 }
diff --git a/...plicationinsights/web/extensibility/initializers/WebSessionTelemetryInitializerTests.java b/...plicationinsights/web/extensibility/initializers/WebSessionTelemetryInitializerTests.java
@@ -78,6 +78,6 @@ private void testNoSessionCookie(Boolean isFirstValue) {
         sessionTelemetryInitializer.onInitializeTelemetry(telemetry);
 
         Assert.assertNull(telemetry.getContext().getSession().getId());
-        Assert.assertFalse(telemetry.getContext().getSession().getIsFirst());
+        Assert.assertEquals(telemetry.getContext().getSession().getIsFirst(), isFirstValue);
     }
 }