Pass measurement unit via JSON to HTML report

lptr · lptr · commit 774e23ae53b0 · 2020-09-18T17:04:06.000+02:00
diff --git a/src/main/java/org/gradle/profiler/report/JsonResultWriter.java b/src/main/java/org/gradle/profiler/report/JsonResultWriter.java
@@ -96,6 +96,7 @@ private <T extends BuildInvocationResult> JsonObject serializeScenarioResult(Bui
     private JsonObject serializeSample(BuildScenarioResult<? extends BuildInvocationResult> scenarioResult, Sample<?> sample) {
         JsonObject json = new JsonObject();
         json.addProperty("name", sample.getName());
+        json.addProperty("unit", sample.getUnit());
         return json;
     }
 
diff --git a/src/main/java/org/gradle/profiler/result/Sample.java b/src/main/java/org/gradle/profiler/result/Sample.java
@@ -3,5 +3,7 @@
 public interface Sample<T extends BuildInvocationResult> {
     String getName();
 
+    String getUnit();
+
     double extractFrom(T result);
 }
diff --git a/src/main/java/org/gradle/profiler/result/TimeSample.java b/src/main/java/org/gradle/profiler/result/TimeSample.java
@@ -4,6 +4,11 @@
 
 public abstract class TimeSample<T extends BuildInvocationResult> implements Sample<T> {
 
+    @Override
+    public String getUnit() {
+        return "ms";
+    }
+
     @Override
     public double extractFrom(T result) {
         return getDuration(result).toNanos() / 1000000d;
diff --git a/src/main/js/org/gradle/profiler/report/report.js b/src/main/js/org/gradle/profiler/report/report.js
@@ -156,7 +156,6 @@ new Vue({
                 sample.color = `hsl(${scenarioIndex * 360 / scenarios.length}, ${100 - 80 * sampleIndex / samples.length}%, ${30 + 40 * sampleIndex / samples.length}%)`;
                 sample.thickness = sampleIndex === 0 ? 3 : 2;
                 sample.selected = sampleIndex === 0;
-                sample.unit = "ms";
                 const data = measuredIterations(scenario).map(iteration => iteration.values[sample.name]);
                 OPERATIONS.forEach(operation => sample[operation.name] = operation.apply(data));
             });
diff --git a/src/test/groovy/org/gradle/profiler/report/JsonResultWriterTest.groovy b/src/test/groovy/org/gradle/profiler/report/JsonResultWriterTest.groovy
@@ -138,10 +138,12 @@ class JsonResultWriterTest extends Specification {
       },
       "samples": [
         {
-          "name": "execution"
+          "name": "execution",
+          "unit": "ms"
         },
         {
-          "name": "Test sample"
+          "name": "Test sample",
+          "unit": "ms"
         }
       ],
       "iterations": [
@@ -236,10 +238,12 @@ class JsonResultWriterTest extends Specification {
       },
       "samples": [
         {
-          "name": "execution"
+          "name": "execution",
+          "unit": "ms"
         },
         {
-          "name": "Test sample"
+          "name": "Test sample",
+          "unit": "ms"
         }
       ],
       "iterations": [
diff --git a/src/test/resources/org/gradle/profiler/report/example-regression.json b/src/test/resources/org/gradle/profiler/report/example-regression.json
@@ -45,7 +45,7 @@
         "samples": [
           {
             "name": "execution",
-            "confidence": 0.0
+            "unit": "ms"
           }
         ],
         "iterations": [
@@ -289,7 +289,7 @@
         "samples": [
           {
             "name": "execution",
-            "confidence": 0.9991642831782728
+            "unit": "ms"
           }
         ],
         "iterations": [
diff --git a/src/test/resources/org/gradle/profiler/report/example-single.json b/src/test/resources/org/gradle/profiler/report/example-single.json
@@ -45,7 +45,7 @@
       "samples": [
         {
           "name": "execution",
-          "confidence": 0.0
+          "unit": "ms"
         }
       ],
       "iterations": [
diff --git a/src/test/resources/org/gradle/profiler/report/example-with-build-operations.json b/src/test/resources/org/gradle/profiler/report/example-with-build-operations.json
@@ -45,39 +45,39 @@
       "samples": [
         {
           "name": "execution",
-          "confidence": 0.0
+          "unit": "ms"
         },
         {
           "name": "ResolveConfigurationDependenciesBuildOperationType",
-          "confidence": 0.0
+          "unit": "ms"
         },
         {
           "name": "DefaultTransformer$FingerprintTransformInputsOperation",
-          "confidence": 0.0
+          "unit": "ms"
         },
         {
           "name": "CaptureStateBeforeExecutionStep$Operation",
-          "confidence": 0.0
+          "unit": "ms"
         },
         {
           "name": "BuildCacheArchivePackBuildOperationType",
-          "confidence": 0.0
+          "unit": "ms"
         },
         {
           "name": "BuildCacheArchiveUnpackBuildOperationType",
-          "confidence": 0.0
+          "unit": "ms"
         },
         {
           "name": "SnapshotOutputsStep$Operation",
-          "confidence": 0.0
+          "unit": "ms"
         },
         {
           "name": "ExecuteTaskActionBuildOperationType",
-          "confidence": 0.0
+          "unit": "ms"
         },
         {
           "name": "ExecuteTaskBuildOperationType",
-          "confidence": 0.0
+          "unit": "ms"
         }
       ],
       "iterations": [
@@ -497,39 +497,39 @@
       "samples": [
         {
           "name": "execution",
-          "confidence": 0.9991642831782728
+          "unit": "ms"
         },
         {
           "name": "ResolveConfigurationDependenciesBuildOperationType",
-          "confidence": 0.7023232455278197
+          "unit": "ms"
         },
         {
           "name": "DefaultTransformer$FingerprintTransformInputsOperation",
-          "confidence": 0.13956902626472267
+          "unit": "ms"
         },
         {
           "name": "CaptureStateBeforeExecutionStep$Operation",
-          "confidence": 0.9999999011729629
+          "unit": "ms"
         },
         {
           "name": "BuildCacheArchivePackBuildOperationType",
-          "confidence": 0.0
+          "unit": "ms"
         },
         {
           "name": "BuildCacheArchiveUnpackBuildOperationType",
-          "confidence": 0.0
+          "unit": "ms"
         },
         {
           "name": "SnapshotOutputsStep$Operation",
-          "confidence": 0.10758613603151901
+          "unit": "ms"
         },
         {
           "name": "ExecuteTaskActionBuildOperationType",
-          "confidence": 0.18185053861180012
+          "unit": "ms"
         },
         {
           "name": "ExecuteTaskBuildOperationType",
-          "confidence": 0.9999987143919465
+          "unit": "ms"
         }
       ],
       "iterations": [
diff --git a/src/test/resources/org/gradle/profiler/report/example.json b/src/test/resources/org/gradle/profiler/report/example.json
@@ -45,7 +45,7 @@
       "samples": [
         {
           "name": "execution",
-          "confidence": 0.0
+          "unit": "ms"
         }
       ],
       "iterations": [
@@ -289,7 +289,7 @@
       "samples": [
         {
           "name": "execution",
-          "confidence": 0.9991642831782728
+          "unit": "ms"
         }
       ],
       "iterations": [

Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,7 @@ private <T extends BuildInvocationResult> JsonObject serializeScenarioResult(Bui`
`96`	`96`	`private JsonObject serializeSample(BuildScenarioResult<? extends BuildInvocationResult> scenarioResult, Sample<?> sample) {`
`97`	`97`	`JsonObject json = new JsonObject();`
`98`	`98`	`json.addProperty("name", sample.getName());`
	`99`	`+ json.addProperty("unit", sample.getUnit());`
`99`	`100`	`return json;`
`100`	`101`	`}`
`101`	`102`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,7 @@`
`3`	`3`	`public interface Sample<T extends BuildInvocationResult> {`
`4`	`4`	`String getName();`
`5`	`5`
	`6`	`+ String getUnit();`
	`7`	`+`
`6`	`8`	`double extractFrom(T result);`
`7`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -138,10 +138,12 @@ class JsonResultWriterTest extends Specification {`
`138`	`138`	`},`
`139`	`139`	`"samples": [`
`140`	`140`	`{`
`141`		`- "name": "execution"`
	`141`	`+ "name": "execution",`
	`142`	`+ "unit": "ms"`
`142`	`143`	`},`
`143`	`144`	`{`
`144`		`- "name": "Test sample"`
	`145`	`+ "name": "Test sample",`
	`146`	`+ "unit": "ms"`
`145`	`147`	`}`
`146`	`148`	`],`
`147`	`149`	`"iterations": [`
`@@ -236,10 +238,12 @@ class JsonResultWriterTest extends Specification {`
`236`	`238`	`},`
`237`	`239`	`"samples": [`
`238`	`240`	`{`
`239`		`- "name": "execution"`
	`241`	`+ "name": "execution",`
	`242`	`+ "unit": "ms"`
`240`	`243`	`},`
`241`	`244`	`{`
`242`		`- "name": "Test sample"`
	`245`	`+ "name": "Test sample",`
	`246`	`+ "unit": "ms"`
`243`	`247`	`}`
`244`	`248`	`],`
`245`	`249`	`"iterations": [`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@`
`45`	`45`	`"samples": [`
`46`	`46`	`{`
`47`	`47`	`"name": "execution",`
`48`		`- "confidence": 0.0`
	`48`	`+ "unit": "ms"`
`49`	`49`	`}`
`50`	`50`	`],`
`51`	`51`	`"iterations": [`
`@@ -289,7 +289,7 @@`
`289`	`289`	`"samples": [`
`290`	`290`	`{`
`291`	`291`	`"name": "execution",`
`292`		`- "confidence": 0.9991642831782728`
	`292`	`+ "unit": "ms"`
`293`	`293`	`}`
`294`	`294`	`],`
`295`	`295`	`"iterations": [`
Original file line number	Diff line number	Diff line change
`@@ -45,39 +45,39 @@`
`45`	`45`	`"samples": [`
`46`	`46`	`{`
`47`	`47`	`"name": "execution",`
`48`		`- "confidence": 0.0`
	`48`	`+ "unit": "ms"`
`49`	`49`	`},`
`50`	`50`	`{`
`51`	`51`	`"name": "ResolveConfigurationDependenciesBuildOperationType",`
`52`		`- "confidence": 0.0`
	`52`	`+ "unit": "ms"`
`53`	`53`	`},`
`54`	`54`	`{`
`55`	`55`	`"name": "DefaultTransformer$FingerprintTransformInputsOperation",`
`56`		`- "confidence": 0.0`
	`56`	`+ "unit": "ms"`
`57`	`57`	`},`
`58`	`58`	`{`
`59`	`59`	`"name": "CaptureStateBeforeExecutionStep$Operation",`
`60`		`- "confidence": 0.0`
	`60`	`+ "unit": "ms"`
`61`	`61`	`},`
`62`	`62`	`{`
`63`	`63`	`"name": "BuildCacheArchivePackBuildOperationType",`
`64`		`- "confidence": 0.0`
	`64`	`+ "unit": "ms"`
`65`	`65`	`},`
`66`	`66`	`{`
`67`	`67`	`"name": "BuildCacheArchiveUnpackBuildOperationType",`
`68`		`- "confidence": 0.0`
	`68`	`+ "unit": "ms"`
`69`	`69`	`},`
`70`	`70`	`{`
`71`	`71`	`"name": "SnapshotOutputsStep$Operation",`
`72`		`- "confidence": 0.0`
	`72`	`+ "unit": "ms"`
`73`	`73`	`},`
`74`	`74`	`{`
`75`	`75`	`"name": "ExecuteTaskActionBuildOperationType",`
`76`		`- "confidence": 0.0`
	`76`	`+ "unit": "ms"`
`77`	`77`	`},`
`78`	`78`	`{`
`79`	`79`	`"name": "ExecuteTaskBuildOperationType",`
`80`		`- "confidence": 0.0`
	`80`	`+ "unit": "ms"`
`81`	`81`	`}`
`82`	`82`	`],`
`83`	`83`	`"iterations": [`
`@@ -497,39 +497,39 @@`
`497`	`497`	`"samples": [`
`498`	`498`	`{`
`499`	`499`	`"name": "execution",`
`500`		`- "confidence": 0.9991642831782728`
	`500`	`+ "unit": "ms"`
`501`	`501`	`},`
`502`	`502`	`{`
`503`	`503`	`"name": "ResolveConfigurationDependenciesBuildOperationType",`
`504`		`- "confidence": 0.7023232455278197`
	`504`	`+ "unit": "ms"`
`505`	`505`	`},`
`506`	`506`	`{`
`507`	`507`	`"name": "DefaultTransformer$FingerprintTransformInputsOperation",`
`508`		`- "confidence": 0.13956902626472267`
	`508`	`+ "unit": "ms"`
`509`	`509`	`},`
`510`	`510`	`{`
`511`	`511`	`"name": "CaptureStateBeforeExecutionStep$Operation",`
`512`		`- "confidence": 0.9999999011729629`
	`512`	`+ "unit": "ms"`
`513`	`513`	`},`
`514`	`514`	`{`
`515`	`515`	`"name": "BuildCacheArchivePackBuildOperationType",`
`516`		`- "confidence": 0.0`
	`516`	`+ "unit": "ms"`
`517`	`517`	`},`
`518`	`518`	`{`
`519`	`519`	`"name": "BuildCacheArchiveUnpackBuildOperationType",`
`520`		`- "confidence": 0.0`
	`520`	`+ "unit": "ms"`
`521`	`521`	`},`
`522`	`522`	`{`
`523`	`523`	`"name": "SnapshotOutputsStep$Operation",`
`524`		`- "confidence": 0.10758613603151901`
	`524`	`+ "unit": "ms"`
`525`	`525`	`},`
`526`	`526`	`{`
`527`	`527`	`"name": "ExecuteTaskActionBuildOperationType",`
`528`		`- "confidence": 0.18185053861180012`
	`528`	`+ "unit": "ms"`
`529`	`529`	`},`
`530`	`530`	`{`
`531`	`531`	`"name": "ExecuteTaskBuildOperationType",`
`532`		`- "confidence": 0.9999987143919465`
	`532`	`+ "unit": "ms"`
`533`	`533`	`}`
`534`	`534`	`],`
`535`	`535`	`"iterations": [`