Return all durations as milliseconds

Author: erichaagdev

components/fetch-build-scan-data-cmdline-tool/src/main/java/com/gradle/enterprise/cli/Fields.java

@@ -5,7 +5,6 @@
 
 import java.time.Duration;
 import java.util.Arrays;
-import java.util.Locale;
 import java.util.function.Function;
 import java.util.stream.Stream;
 
@@ -30,7 +29,7 @@ public enum Fields {
     EXECUTED_CACHEABLE_DURATION("Executed cacheable duration", d -> totalDuration(d, "executed_cacheable")),
     EXECUTED_NOT_CACHEABLE("Executed not cacheable", d -> totalTasks(d, "executed_not_cacheable")),
     EXECUTED_NOT_CACHEABLE_DURATION("Executed not cacheable duration", d -> totalDuration(d, "executed_not_cacheable")),
-    EFFECTIVE_TASK_EXECUTION_DURATION("Effective task execution duration", d -> String.valueOf(d.getEffectiveTaskExecutionDuration().toMillis())),
+    EFFECTIVE_TASK_EXECUTION_DURATION("Effective task execution duration", d -> formatDuration(d.getEffectiveTaskExecutionDuration())),
     ;
 
     public final String label;
@@ -76,19 +75,6 @@ private static String totalDuration(BuildValidationData data, String avoidanceOu
     }
 
     private static String formatDuration(Duration duration) {
-        long hours = duration.toHours();
-        long minutes = duration.minusHours(hours).toMinutes();
-        double seconds = duration.minusHours(hours).minusMinutes(minutes).toMillis() / 1000d;
-
-        StringBuilder s = new StringBuilder();
-        if (hours != 0) {
-            s.append(hours + "h ");
-        }
-        if (minutes != 0) {
-            s.append(minutes + "m ");
-        }
-        s.append(String.format(Locale.ROOT, "%.3fs", seconds));
-
-        return s.toString().trim();
+        return String.valueOf(duration.toMillis());
     }
 }