Merge pull request #1036 from microsoft/trask/add-java-11-to-build-matrix

Add Java 11 to smoke test matrix

Author: trask

agent/build.gradle

@@ -74,7 +74,7 @@ shadowJar() {
     // javax.lang.model.element.Modifier which is no longer in the bootstrap class loader in Java 9, and this causes
     // spring class path scanning to fail when trying to read com.google.errorprone.annotations.ForOverride
     // (java.lang.NoClassDefFoundError: [Ljavax/lang/model/element/Modifier;)
-    exclude shadowPrefix.replace('.', '/') + '/com/google/errorprone/**'
+    exclude 'com/google/errorprone/**'
 }
 
 task shadowJar2(type: com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {

settings.gradle

@@ -74,6 +74,9 @@ include ':test:smoke:testApps:TraceLog4j2UsingAgent'
 include ':test:smoke:testApps:HeartBeat'
 include ':test:smoke:testApps:SpringBootTest'
 include ':test:smoke:testApps:FixedRateSampling'
+include ':test:smoke:testApps:Jdbc'
+include ':test:smoke:testApps:HttpClients'
+include ':test:smoke:testApps:CustomInstrumentation'
 include ':test:smoke:testApps:WebAuto'
 include ':test:smoke:testApps:SpringBoot1_3Auto'
 include ':test:smoke:testApps:SpringBootAuto'

test/smoke/appServers/global-resources/CustomInstrumentation_AI-Agent.xml

@@ -3,7 +3,7 @@
     <Instrumentation>
         <BuiltIn enabled="true">
         </BuiltIn>
-        <Class name="com.springbootstartertest.controller.TargetObject">
+        <Class name="com.microsoft.applicationinsights.smoketestapp.TargetObject">
             <Method name="one"/>
             <Method name="two" signature="(Ljava/lang/String;)Ljava/lang/String;"/>
             <Method name="three"/>
@@ -14,7 +14,7 @@
             <Method name="eight" signature="(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"/>
             <Method name="nine"/>
         </Class>
-        <Class name="com.springbootstartertest.controller.TargetObject$NestedObject">
+        <Class name="com.microsoft.applicationinsights.smoketestapp.TargetObject$NestedObject">
             <Method name="four" signature="(Z[I[[Ljava/lang/String;)V"/>
         </Class>
     </Instrumentation>

test/smoke/appServers/jre.master.txt

@@ -1,2 +1,3 @@
 openjdk:7-jre
-openjdk:8-jre
+openjdk:8-jre
+azul/zulu-openjdk:11

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

@@ -41,6 +41,7 @@
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
+import java.net.URL;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -70,11 +71,18 @@ public static Collection<Object[]> parameterGenerator() throws IOException {
         List<String> appServers = Resources.readLines(Resources.getResource("appServers.txt"), Charsets.UTF_8);
         System.out.println("Target appservers="+Arrays.toString(appServers.toArray()));
         String os = System.getProperty("applicationinsights.smoketest.os", "linux");
+        URL jreExcludesURL = Thread.currentThread().getContextClassLoader().getResource("jre.excludes.txt");
+        List<String> jreExcludes;
+        if (jreExcludesURL == null) {
+            jreExcludes = new ArrayList<>();
+        } else {
+            jreExcludes = Resources.readLines(jreExcludesURL, Charsets.UTF_8);
+        }
         Multimap<String, String> appServers2jres = HashMultimap.create();
         for (String appServer : appServers) {
             List<String> serverJres;
             try {
-                serverJres = getAppServerJres(appServer);
+                serverJres = getAppServerJres(appServer, jreExcludes);
             } catch (Exception e) {
                 System.err.printf("SKIPPING '%s'. Could not configure jres: %s%n", appServer, e);
                 continue;
@@ -93,14 +101,14 @@ public static Collection<Object[]> parameterGenerator() throws IOException {
         return rval;
     }
 
-    private static List<String> getAppServerJres(String appServer) throws IOException {
-        List<String> rval = Resources.readLines(Resources.getResource(appServer+".jre.txt"), Charsets.UTF_8);
-        return Lists.transform(rval, new Function<String, String>() {
-            @Override
-            public String apply(String input) {
-                return input.replaceAll("[:/]", "_");
+    private static List<String> getAppServerJres(String appServer, List<String> jreExcludes) throws IOException {
+        List<String> jres = new ArrayList<>();
+        for (String jre : Resources.readLines(Resources.getResource(appServer+".jre.txt"), Charsets.UTF_8)) {
+            if (!jreExcludes.contains(jre)) {
+                jres.add(jre.replaceAll("[:/]", "_"));
             }
-        });
+        }
+        return jres;
     }
 
     @Parameter(0) public String appServer;

test/smoke/testApps/CachingCalculator/build.gradle

@@ -11,8 +11,8 @@ dependencies {
     smokeTestCompile 'com.google.guava:guava:23.0'
 }
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = 1.7
+targetCompatibility = 1.7
 compileSmokeTestJava.sourceCompatibility = 1.8
 compileSmokeTestJava.targetCompatibility = 1.8
 

test/smoke/testApps/CustomInstrumentation/build.gradle

@@ -0,0 +1,16 @@
+apply plugin: 'war'
+
+dependencies {
+    compile aiCoreJar
+    compile aiWebJar
+
+    providedCompile 'javax.servlet:javax.servlet-api:3.0.1'
+}
+
+sourceCompatibility = 1.7
+targetCompatibility = 1.7
+compileSmokeTestJava.sourceCompatibility = 1.8
+compileSmokeTestJava.targetCompatibility = 1.8
+
+ext.testAppArtifactDir = war.destinationDirectory
+ext.testAppArtifactFilename = war.archiveFileName.get()

test/smoke/testApps/CustomInstrumentation/src/main/java/com/microsoft/applicationinsights/smoketestapp/CustomInstrumentationController.java

@@ -0,0 +1,86 @@
+package com.microsoft.applicationinsights.smoketestapp;
+
+import java.io.IOException;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@WebServlet("/*")
+public class CustomInstrumentationController extends HttpServlet {
+
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException {
+        try {
+            String response = doGetInternal(req);
+            resp.getWriter().println(response);
+        } catch (ServletException e) {
+            throw e;
+        } catch (Exception e) {
+            throw new ServletException(e);
+        }
+    }
+
+    private String doGetInternal(HttpServletRequest req) throws Exception {
+        String pathInfo = req.getPathInfo();
+        if (pathInfo.equals("/")) {
+            return "ok";
+        } else if (pathInfo.equals("/customInstrumentationOne")) {
+            return customInstrumentationOne();
+        } else if (pathInfo.equals("/customInstrumentationTwo")) {
+            return customInstrumentationTwo();
+        } else if (pathInfo.equals("/customInstrumentationThree")) {
+            return customInstrumentationThree();
+        } else if (pathInfo.equals("/customInstrumentationFour")) {
+            return customInstrumentationFour();
+        } else if (pathInfo.equals("/customInstrumentationFive")) {
+            return customInstrumentationFive();
+        } else if (pathInfo.equals("/customInstrumentationSeven")) {
+            return customInstrumentationSeven();
+        } else if (pathInfo.equals("/customInstrumentationEight")) {
+            return customInstrumentationEight();
+        } else if (pathInfo.equals("/customInstrumentationNine")) {
+            return customInstrumentationNine();
+        } else {
+            throw new ServletException("Unexpected url: " + pathInfo);
+        }
+    }
+
+    public String customInstrumentationOne() {
+        return new TargetObject().one();
+    }
+
+    public String customInstrumentationTwo() {
+        return new TargetObject().two("Two");
+    }
+
+    public String customInstrumentationThree() {
+        try {
+            return new TargetObject().three();
+        } catch (Exception e) {
+            return "Three";
+        }
+    }
+
+    public String customInstrumentationFour() {
+        new TargetObject.NestedObject().four(false, null, null);
+        return "Four";
+    }
+
+    public String customInstrumentationFive() {
+        return new TargetObject().five();
+    }
+
+    public String customInstrumentationSeven() {
+        return new TargetObject().seven("Seven");
+    }
+
+    public String customInstrumentationEight() {
+        return new TargetObject().eight("Eight");
+    }
+
+    public String customInstrumentationNine() throws IOException {
+        return new TargetObject().nine();
+    }
+}

test/smoke/testApps/CustomInstrumentation/src/main/java/com/microsoft/applicationinsights/smoketestapp/TargetObject.java

@@ -0,0 +1,69 @@
+package com.microsoft.applicationinsights.smoketestapp;
+
+import java.io.IOException;
+
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+
+class TargetObject {
+
+    String one() {
+        return "One";
+    }
+
+    String two() {
+        return "Two";
+    }
+
+    String two(String input) {
+        return input;
+    }
+
+    String three() throws Exception {
+        throw new Exception("Three");
+    }
+
+    String five() {
+        return six("Five");
+    }
+
+    String six(String arg) {
+        one();
+        two("two");
+        return arg;
+    }
+
+    String seven(String arg) {
+        return seven("7", "77");
+    }
+
+    String seven(String arg1, String arg2) {
+        return "Seven";
+    }
+
+    String eight(String arg) {
+        return eight("8", "88");
+    }
+
+    String eight(String arg1, String arg2) {
+        return "Eight";
+    }
+
+    String nine() throws IOException {
+        String url = "https://www.bing.com";
+        HttpGet get = new HttpGet(url);
+        try (CloseableHttpClient httpClient = HttpClientBuilder.create().disableAutomaticRetries().build();
+             CloseableHttpResponse response = httpClient.execute(get)) {
+
+            return response.getStatusLine().getReasonPhrase();
+        }
+    }
+
+    static class NestedObject {
+
+        void four(boolean x, int[] y, String[][] z) {
+        }
+    }
+}

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

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ApplicationInsights xmlns="http://schemas.microsoft.com/ApplicationInsights/2013/Settings" schemaVersion="2014-05-30">
+
+    <!-- The key from the portal: -->
+
+    <InstrumentationKey>00000000-0000-0000-0000-0FEEDDADBEEF</InstrumentationKey>
+
+    <SDKLogger type="CONSOLE">
+        <enabled>true</enabled>
+        <UniquePrefix>JavaSDKLog</UniquePrefix>
+    </SDKLogger>
+
+    <QuickPulse enabled="false" />
+
+    <!-- HTTP request component (not required for bare API) -->
+
+    <TelemetryModules>
+        <Add type="com.microsoft.applicationinsights.web.extensibility.modules.WebRequestTrackingTelemetryModule" />
+        <Add type="com.microsoft.applicationinsights.web.extensibility.modules.WebSessionTrackingTelemetryModule" />
+        <Add type="com.microsoft.applicationinsights.web.extensibility.modules.WebUserTrackingTelemetryModule" />
+    </TelemetryModules>
+
+    <!-- Events correlation (not required for bare API) -->
+    <!-- These initializers add context data to each event -->
+
+    <TelemetryInitializers>
+        <Add type="com.microsoft.applicationinsights.web.extensibility.initializers.WebOperationIdTelemetryInitializer" />
+        <Add type="com.microsoft.applicationinsights.web.extensibility.initializers.WebOperationNameTelemetryInitializer" />
+        <Add type="com.microsoft.applicationinsights.web.extensibility.initializers.WebSessionTelemetryInitializer" />
+        <Add type="com.microsoft.applicationinsights.web.extensibility.initializers.WebUserTelemetryInitializer" />
+        <Add type="com.microsoft.applicationinsights.web.extensibility.initializers.WebUserAgentTelemetryInitializer" />
+        <Add type="com.microsoft.applicationinsights.extensibility.initializer.docker.DockerContextInitializer" />
+    </TelemetryInitializers>
+
+    <Channel>
+        <EndpointAddress>http://fakeingestion:60606/v2/track</EndpointAddress>
+        <DeveloperMode>true</DeveloperMode>
+        <FlushIntervalInSeconds>1</FlushIntervalInSeconds>
+    </Channel>
+
+</ApplicationInsights>