Avoid duplicates and support modular runtime

Benjamin Muskalla · Benjamin Muskalla · commit ec7f4d18e187 · 2021-08-11T15:31:33.000+02:00
diff --git a/java/ql/src/Telemetry/ExternalAPI.qll b/java/ql/src/Telemetry/ExternalAPI.qll
@@ -23,6 +23,14 @@ class ExternalAPI extends Callable {
   }
 
   predicate isSupported() { not supportKind(this) = "?" }
+
+  string jarContainer() {
+    result = containerAsJar(any(ExternalAPI api).getCompilationUnit().getParentContainer*())
+  }
+
+  private string containerAsJar(Container container) {
+    if container instanceof JarFile then result = container.getBaseName() else result = "rt.jar"
+  }
 }
 
 private class TestLibrary extends RefType {
diff --git a/java/ql/src/Telemetry/ExternalLibraryUsage.ql b/java/ql/src/Telemetry/ExternalLibraryUsage.ql
@@ -1,21 +1,22 @@
 /**
  * @name External libraries
  * @description A list of external libraries used in the code
- * @kind diagnostic
+ * @kind metric
+ * @metricType callable
  * @id java/telemetry/external-libs
  */
 
 import java
 import ExternalAPI
 
-from int Usages, JarFile jar
+from int Usages, string jarname
 where
-  jar = any(ExternalAPI api).getCompilationUnit().getParentContainer*() and
+  jarname = any(ExternalAPI api).jarContainer() and
   Usages =
     strictcount(Call c, ExternalAPI a |
       c.getCallee() = a and
       not c.getFile() instanceof GeneratedFile and
-      a.getCompilationUnit().getParentContainer*() = jar and
+      a.jarContainer() = jarname and
       not a.isTestLibrary()
     )
-select jar.getFile().getBaseName(), Usages order by Usages desc
+select jarname, Usages order by Usages desc

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,14 @@ class ExternalAPI extends Callable {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`predicate isSupported() { not supportKind(this) = "?" }`
	`26`	`+`
	`27`	`+ string jarContainer() {`
	`28`	`+ result = containerAsJar(any(ExternalAPI api).getCompilationUnit().getParentContainer*())`
	`29`	`+ }`
	`30`	`+`
	`31`	`+ private string containerAsJar(Container container) {`
	`32`	`+ if container instanceof JarFile then result = container.getBaseName() else result = "rt.jar"`
	`33`	`+ }`
`26`	`34`	`}`
`27`	`35`
`28`	`36`	`private class TestLibrary extends RefType {`