Merge branch 'master' into dougqh/interceptor-bypass

Author: dougqh

dd-java-agent/build.gradle

@@ -29,7 +29,6 @@ compileMain_java6Java.configure {
   setJavaVersion(it, 8)
   sourceCompatibility = JavaVersion.VERSION_1_6
   targetCompatibility = JavaVersion.VERSION_1_6
-  destinationDirectory = layout.buildDirectory.dir("classes/java/main")
 }
 
 tasks.compileJava.dependsOn compileMain_java6Java
@@ -52,6 +51,9 @@ ext.generalShadowJarConfig = {
 
   duplicatesStrategy = DuplicatesStrategy.FAIL
 
+  // Include AgentPreCheck compiled with Java 6.
+  from sourceSets.main_java6.output
+
   // Remove some cruft from the final jar.
   // These patterns should NOT include **/META-INF/maven/**/pom.properties, which is
   // used to report our own dependencies, but we should remove the top-level metadata

internal-api/src/main/java/datadog/trace/bootstrap/config/provider/stableconfig/Selector.java

@@ -21,7 +21,9 @@ public Selector(Object yaml) {
     Map map = (Map) yaml;
     origin = (String) map.get("origin");
     key = (String) map.get("key");
-    matches = Collections.unmodifiableList((List<String>) map.get("matches"));
+    List<String> rawMatches = (List<String>) map.get("matches");
+    matches =
+        rawMatches != null ? Collections.unmodifiableList(rawMatches) : Collections.emptyList();
     operator = (String) map.get("operator");
   }
 

internal-api/src/test/groovy/datadog/trace/bootstrap/config/provider/StableConfigParserTest.groovy

@@ -42,6 +42,12 @@ apm_configuration_rules:
       matches: ["mysvc"]
     configuration:
       KEY_FOUR: "ignored"
+  - selectors:
+    - origin: process_arguments
+      key: "-Darg1"
+      operator: exists
+    configuration:
+      KEY_FIVE: "ignored"
 """
     Files.write(filePath, yaml.getBytes())
     StableConfigSource.StableConfig cfg = StableConfigParser.parse(filePath.toString())