Fix DependencyResolver coverage

ygree · ygree · commit 65a8d9fe3671 · 2023-10-18T09:01:37.000-07:00
diff --git a/telemetry/src/main/java/datadog/telemetry/dependency/DependencyResolver.java b/telemetry/src/main/java/datadog/telemetry/dependency/DependencyResolver.java
@@ -117,7 +117,7 @@ static Dependency getNestedDependency(URI uri) {
       fileName = lastPart.substring(lastPart.lastIndexOf("/") + 1);
 
       return Dependency.guessFallbackNoPom(manifest, fileName, jarConnection.getInputStream());
-    } catch (IOException e) {
+    } catch (Exception e) {
       log.debug("unable to open nested jar manifest for {}", uri, e);
     }
     log.debug(
diff --git a/telemetry/src/test/groovy/datadog/telemetry/dependency/DependencyResolverSpecification.groovy b/telemetry/src/test/groovy/datadog/telemetry/dependency/DependencyResolverSpecification.groovy
@@ -152,6 +152,33 @@ class DependencyResolverSpecification extends DepSpecification {
     temp.delete()
   }
 
+  void 'try to determine non existing lib name'() throws IOException {
+    setup:
+    File temp = File.createTempFile('temp', '.zip')
+    temp.delete()
+
+    expect:
+    DependencyResolver.extractDependenciesFromJar(temp).isEmpty()
+  }
+
+  void 'try to determine invalid jar lib'() throws IOException {
+    setup:
+    File temp = File.createTempFile('temp', '.jar')
+    temp.write("just a text file")
+
+    expect:
+    DependencyResolver.extractDependenciesFromJar(temp).isEmpty()
+  }
+
+  void 'try to determine invalid jar lib'() throws IOException {
+    setup:
+    File temp = File.createTempFile('temp', '.jar')
+    temp.write("just a text file")
+
+    expect:
+    DependencyResolver.getNestedDependency(temp.toURI()) == null
+  }
+
   void 'spring boot dependency'() throws IOException {
     setup:
     org.springframework.boot.loader.jar.JarFile.registerUrlProtocolHandler()

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ static Dependency getNestedDependency(URI uri) {`
`117`	`117`	`fileName = lastPart.substring(lastPart.lastIndexOf("/") + 1);`
`118`	`118`
`119`	`119`	`return Dependency.guessFallbackNoPom(manifest, fileName, jarConnection.getInputStream());`
`120`		`- } catch (IOException e) {`
	`120`	`+ } catch (Exception e) {`
`121`	`121`	`log.debug("unable to open nested jar manifest for {}", uri, e);`
`122`	`122`	`}`
`123`	`123`	`log.debug(`