JS: additional extraction metrics cleanup

Author: Esben Sparre Andreasen

javascript/ql/src/meta/extraction-metrics/FileData.ql

@@ -1,8 +1,9 @@
 /**
- * @name File correlations
- * @description
+ * @name Extraction metrics file data
+ * @description Extraction metrics and related information for profiling the extraction of individual files.
  * @kind table
  * @id js/meta/extraction/file-data
+ * @tags meta
  */
 
 import javascript

javascript/ql/src/meta/extraction-metrics/MissingMetrics.ql

@@ -1,9 +1,11 @@
 /**
  * @name File with missing extraction metrics
  * @description A file missing extraction metrics is indicative of a faulty extractor.
- * @kind table
- * @problem.severity error
+ * @kind problem
+ * @problem.severity warning
+ * @precision low
  * @id js/meta/extraction/missing-metrics
+ * @tags meta
  */
 
 import javascript

javascript/ql/src/meta/extraction-metrics/PhaseTimings.ql

@@ -3,12 +3,10 @@
  * @description An overview of how time was spent during extraction
  * @kind table
  * @id js/meta/extraction/phase-timings
+ * @tags meta
  */
 
 import semmle.javascript.meta.ExtractionMetrics::ExtractionMetrics
 
-from PhaseName phaseName, float cpuTime, int cpuPerc
-where
-  cpuTime = Aggregated::getCpuTime(phaseName) and
-  cpuPerc = ((cpuTime / Aggregated::getCpuTime()) * 100).floor()
-select phaseName, cpuTime as CPU_NANO, cpuPerc as CPU_PERC
+from PhaseName phaseName
+select phaseName, Aggregated::getCpuTime(phaseName) as CPU_NANO, Aggregated::getWallclockTime(phaseName) as WALLCLOCK_NANO

javascript/ql/src/semmle/javascript/meta/ExtractionMetrics.qll

@@ -94,7 +94,6 @@ module ExtractionMetrics {
    * The name of a phase of the extraction.
    */
   class PhaseName extends string {
-    bindingset[this]
     PhaseName() { this = getExtractionPhaseName(_) }
   }
 
@@ -118,24 +117,14 @@ module ExtractionMetrics {
      * Gets the total CPU time spent in phase `phaseName` of the extraction.
      */
     float getCpuTime(PhaseName phaseName) {
-      /* bind */ phaseName = getExtractionPhaseName(_) and
       result = strictsum(any(FileWithExtractionMetrics f).getCpuTime(phaseName))
     }
 
     /**
      * Gets the total wallclock time spent in phase `phaseName` of the extraction.
      */
     float getWallclockTime(PhaseName phaseName) {
-      /* bind */ phaseName = getExtractionPhaseName(_) and
       result = strictsum(any(FileWithExtractionMetrics f).getWallclockTime(phaseName))
     }
   }
-
-  /**
-   * Gets `nanoseconds` formatted as a whole number of milliseconds.
-   */
-  bindingset[nanoSeconds]
-  string formatAsMilliSeconds(float nanoSeconds) {
-    result = (nanoSeconds / (1000 * 1000)).ceil() + ""
-  }
 }

javascript/ql/src/semmlecode.javascript.dbscheme

@@ -1139,7 +1139,7 @@ configLocations(
 
 /**
  * The time taken for the extraction of a file.
- * This table contains non-deternistic content.
+ * This table contains non-deterministic content.
  *
  * The sum of the `time` column for each (`file`, `timerKind`) pair
  * is the total time taken for extraction of `file`.  The `extractionPhase`
@@ -1149,14 +1149,14 @@ extraction_time(
    int file : @file ref,
    // see `com.semmle.js.extractor.ExtractionMetrics.ExtractionPhase`.
    int extractionPhase: int ref,
-   // 0 for the elapsed CPU time in nanoseconds, 1 for the wall elapsed wallclock time in nanoseconds
+   // 0 for the elapsed CPU time in nanoseconds, 1 for the elapsed wallclock time in nanoseconds
    int timerKind: int ref,
    float time: float ref
 )
 
 /**
  * Non-timing related data for the extraction of a single file.
- * This table contains non-deternistic content.
+ * This table contains non-deterministic content.
  */
 extraction_data(
    int file : @file ref,