C#: Remove filename from telemetry output.

Author: michaelnebel

csharp/ql/src/Telemetry/ExternalApi.qll

@@ -42,22 +42,12 @@ class ExternalApi extends DotNet::Callable {
   /**
    * Gets the namespace of this API.
    */
-  private string getNamespace() { this.getDeclaringType().hasQualifiedName(result, _) }
+  string getNamespace() { this.getDeclaringType().hasQualifiedName(result, _) }
 
   /**
-   * Gets the assembly file name containing this API.
+   * Gets the namespace and signature of this API.
    */
-  private string getAssembly() { result = this.getFile().getBaseName() }
-
-  /**
-   * Gets the assembly file name and namespace of this API.
-   */
-  string getInfoPrefix() { result = this.getAssembly() + "#" + this.getNamespace() }
-
-  /**
-   * Gets the assembly file name, namespace and signature of this API.
-   */
-  string getInfo() { result = this.getInfoPrefix() + "#" + this.getSignature() }
+  string getApiName() { result = this.getNamespace() + "#" + this.getSignature() }
 
   /** Gets a call to this API callable. */
   DispatchCall getACall() {
@@ -125,30 +115,30 @@ signature predicate relevantApi(ExternalApi api);
  * for restricting the number or returned results based on a certain limit.
  */
 module Results<relevantApi/1 getRelevantUsages> {
-  private int getUsages(string apiInfo) {
+  private int getUsages(string apiName) {
     result =
       strictcount(DispatchCall c, ExternalApi api |
         c = api.getACall() and
-        apiInfo = api.getInfo() and
+        apiName = api.getApiName() and
         getRelevantUsages(api)
       )
   }
 
-  private int getOrder(string apiInfo) {
-    apiInfo =
-      rank[result](string info, int usages |
-        usages = getUsages(info)
+  private int getOrder(string apiName) {
+    apiName =
+      rank[result](string name, int usages |
+        usages = getUsages(name)
       |
-        info order by usages desc, info
+        name order by usages desc, name
       )
   }
 
   /**
-   * Holds if there exists an API with `apiInfo` that is being used `usages` times
+   * Holds if there exists an API with `apiName` that is being used `usages` times
    * and if it is in the top results (guarded by resultLimit).
    */
-  predicate restrict(string apiInfo, int usages) {
-    usages = getUsages(apiInfo) and
-    getOrder(apiInfo) <= resultLimit()
+  predicate restrict(string apiName, int usages) {
+    usages = getUsages(apiName) and
+    getOrder(apiName) <= resultLimit()
   }
 }

csharp/ql/src/Telemetry/ExternalLibraryUsage.ql

@@ -1,6 +1,6 @@
 /**
  * @name External libraries
- * @description A list of external libraries used in the code
+ * @description A list of external libraries used in the code given by their namespace.
  * @kind metric
  * @tags summary telemetry
  * @id csharp/telemetry/external-libs
@@ -10,23 +10,23 @@ private import csharp
 private import semmle.code.csharp.dispatch.Dispatch
 private import ExternalApi
 
-private predicate getRelevantUsages(string info, int usages) {
+private predicate getRelevantUsages(string namespace, int usages) {
   usages =
     strictcount(DispatchCall c, ExternalApi api |
       c = api.getACall() and
-      api.getInfoPrefix() = info and
+      api.getNamespace() = namespace and
       not api.isUninteresting()
     )
 }
 
-private int getOrder(string info) {
-  info =
+private int getOrder(string namespace) {
+  namespace =
     rank[result](string i, int usages | getRelevantUsages(i, usages) | i order by usages desc, i)
 }
 
-from ExternalApi api, string info, int usages
+from ExternalApi api, string namespace, int usages
 where
-  info = api.getInfoPrefix() and
-  getRelevantUsages(info, usages) and
-  getOrder(info) <= resultLimit()
-select info, usages order by usages desc
+  namespace = api.getNamespace() and
+  getRelevantUsages(namespace, usages) and
+  getOrder(namespace) <= resultLimit()
+select namespace, usages order by usages desc