Fix dependency collection for new Spring Boot nested jars

Author: smola

telemetry/src/main/java/datadog/telemetry/dependency/DependencyResolver.java

@@ -35,8 +35,14 @@ static List<Dependency> internalResolve(final URI uri) throws IOException {
       }
       path = f.getAbsolutePath();
       metadata = JarReader.readJarFile(path);
-    } else if ("jar".equals(scheme) && uri.getSchemeSpecificPart().startsWith("file:")) {
-      path = uri.getSchemeSpecificPart().substring("file:".length());
+    } else if ("jar".equals(scheme)) {
+      final String schemeSpecificPart = uri.getSchemeSpecificPart();
+      if (!schemeSpecificPart.startsWith("file:") && !schemeSpecificPart.startsWith("nested:")) {
+        log.debug("unsupported dependency type: {}", uri);
+        return Collections.emptyList();
+      }
+      final int idx = schemeSpecificPart.indexOf(":");
+      path = schemeSpecificPart.substring(idx + 1);
       metadata = JarReader.readNestedJarFile(path);
     } else {
       log.debug("unsupported dependency type: {}", uri);

telemetry/src/test/groovy/datadog/telemetry/dependency/DependencyResolverSpecification.groovy

@@ -159,6 +159,48 @@ class DependencyResolverSpecification extends DepSpecification {
     dep.source == 'opentracing-util-0.33.0.jar'
   }
 
+  void 'spring boot dependency new style'() throws IOException {
+    when:
+    String zipPath = Classloader.classLoader.getResource('datadog/telemetry/dependencies/spring-boot-app.jar').path
+    URI uri = new URI("jar:nested:$zipPath!/BOOT-INF/lib/opentracing-util-0.33.0.jar!/")
+
+    Dependency dep = DependencyResolver.resolve(uri).get(0)
+
+    then:
+    dep != null
+    dep.name == 'io.opentracing:opentracing-util'
+    dep.version == '0.33.0'
+    dep.hash == null
+    dep.source == 'opentracing-util-0.33.0.jar'
+  }
+
+  void 'spring boot dependency new style empty path'() throws IOException {
+    when:
+    URI uri = new URI("jar:nested:")
+    List<Dependency> deps = DependencyResolver.resolve(uri)
+
+    then:
+    deps.isEmpty()
+  }
+
+  void 'spring boot dependency old style empty path'() throws IOException {
+    when:
+    URI uri = new URI("jar:file:")
+    List<Dependency> deps = DependencyResolver.resolve(uri)
+
+    then:
+    deps.isEmpty()
+  }
+
+  void 'jar unknown'() throws IOException {
+    when:
+    URI uri = new URI("jar:unknown")
+    List<Dependency> deps = DependencyResolver.resolve(uri)
+
+    then:
+    deps.isEmpty()
+  }
+
   void 'spring boot dependency without maven metadata'() throws IOException {
     given:
     def innerJarData = new ByteArrayOutputStream()