Metrics printer cleanup (diff. between count and duration)

milosmns · milosmns · commit d00dfe081809 · 2023-08-20T00:04:26.000+02:00
diff --git a/src/commonMain/kotlin/Main.kt b/src/commonMain/kotlin/Main.kt
@@ -1,4 +1,4 @@
-import calculator.di.provideCycleTimeCalculator
+import calculator.di.provideGenericLongMetricCalculators
 import components.data.TeamHistoryConfig
 import history.TeamHistory
 import history.github.di.provideGitHubHistory
@@ -65,11 +65,12 @@ fun main(): Unit = runBlocking {
     }
 
     // OTHER EXPERIMENTS
-    val cycleTimeCalculator = provideCycleTimeCalculator()
-    val cycleTime = cycleTimeCalculator.calculate(stored)
-    println("\n== Cycle Time ==")
-    println(cycleTime.simpleFormat)
-    println("-- CYCLE TIME --\n")
+    provideGenericLongMetricCalculators().forEach {
+      val metric = it.calculate(stored)
+      println("\n== ${metric.name} ==")
+      println(metric.simpleFormat)
+      println("-- ${metric.name} --\n")
+    }
   } catch (e: Throwable) {
     println("CRITICAL FAILURE! \n\n * ${e.message} * \n\n")
     e.printStackTrace()
diff --git a/src/commonMain/kotlin/calculator/GenericLongMetricCalculator.kt b/src/commonMain/kotlin/calculator/GenericLongMetricCalculator.kt
@@ -1,9 +1,9 @@
 package calculator
 
 import components.data.Repository
-import components.metrics.GenericLongMetric
+import components.metrics.GenericCountMetric
 
-interface GenericLongMetricCalculator<out T : GenericLongMetric> {
+interface GenericLongMetricCalculator<out T : GenericCountMetric> {
 
   fun calculate(repositories: List<Repository>): T
 
diff --git a/src/commonMain/kotlin/calculator/di/ManualModule.kt b/src/commonMain/kotlin/calculator/di/ManualModule.kt
@@ -1,7 +1,67 @@
 package calculator.di
 
+import calculator.CodeReviewChangeLinesAddedCalculator
+import calculator.CodeReviewChangeLinesDeletedCalculator
+import calculator.CodeReviewChangeLinesTotalCalculator
+import calculator.CodeReviewChangesAddedCalculator
+import calculator.CodeReviewChangesModifiedCalculator
+import calculator.CodeReviewChangesRemovedCalculator
+import calculator.CodeReviewChangesTotalCalculator
+import calculator.CodeReviewCommentsAuthoredCalculator
+import calculator.CodeReviewCommentsReceivedCalculator
+import calculator.CodeReviewFeedbacksApprovedCalculator
+import calculator.CodeReviewFeedbacksPostponedCalculator
+import calculator.CodeReviewFeedbacksRejectedCalculator
+import calculator.CodeReviewFeedbacksTotalCalculator
+import calculator.CodeReviewsCalculator
 import calculator.CycleTimeCalculator
 import kotlinx.datetime.Clock
 import kotlinx.datetime.Instant
 
+fun provideCodeReviewChangeLinesAddedCalculator() = CodeReviewChangeLinesAddedCalculator()
+
+fun provideCodeReviewChangeLinesDeletedCalculator() = CodeReviewChangeLinesDeletedCalculator()
+
+fun provideCodeReviewChangeLinesTotalCalculator() = CodeReviewChangeLinesTotalCalculator()
+
+fun provideCodeReviewChangesAddedCalculator() = CodeReviewChangesAddedCalculator()
+
+fun provideCodeReviewChangesModifiedCalculator() = CodeReviewChangesModifiedCalculator()
+
+fun provideCodeReviewChangesRemovedCalculator() = CodeReviewChangesRemovedCalculator()
+
+fun provideCodeReviewChangesTotalCalculator() = CodeReviewChangesTotalCalculator()
+
+fun provideCodeReviewCommentsAuthoredCalculator() = CodeReviewCommentsAuthoredCalculator()
+
+fun provideCodeReviewCommentsReceivedCalculator() = CodeReviewCommentsReceivedCalculator()
+
+fun provideCodeReviewFeedbacksApprovedCalculator() = CodeReviewFeedbacksApprovedCalculator()
+
+fun provideCodeReviewFeedbacksPostponedCalculator() = CodeReviewFeedbacksPostponedCalculator()
+
+fun provideCodeReviewFeedbacksRejectedCalculator() = CodeReviewFeedbacksRejectedCalculator()
+
+fun provideCodeReviewFeedbacksTotalCalculator() = CodeReviewFeedbacksTotalCalculator()
+
+fun provideCodeReviewsCalculator() = CodeReviewsCalculator()
+
 fun provideCycleTimeCalculator(now: Instant = Clock.System.now()) = CycleTimeCalculator(now)
+
+fun provideGenericLongMetricCalculators() = listOf(
+  provideCodeReviewChangeLinesAddedCalculator(),
+  provideCodeReviewChangeLinesDeletedCalculator(),
+  provideCodeReviewChangeLinesTotalCalculator(),
+  provideCodeReviewChangesAddedCalculator(),
+  provideCodeReviewChangesModifiedCalculator(),
+  provideCodeReviewChangesRemovedCalculator(),
+  provideCodeReviewChangesTotalCalculator(),
+  provideCodeReviewCommentsAuthoredCalculator(),
+  provideCodeReviewCommentsReceivedCalculator(),
+  provideCodeReviewFeedbacksApprovedCalculator(),
+  provideCodeReviewFeedbacksPostponedCalculator(),
+  provideCodeReviewFeedbacksRejectedCalculator(),
+  provideCodeReviewFeedbacksTotalCalculator(),
+  provideCodeReviewsCalculator(),
+  provideCycleTimeCalculator(),
+)
diff --git a/src/commonMain/kotlin/components/metrics/CodeReviewChangeLinesAdded.kt b/src/commonMain/kotlin/components/metrics/CodeReviewChangeLinesAdded.kt
@@ -11,8 +11,8 @@ data class CodeReviewChangeLinesAdded(
   override val perCodeReview: Map<CodeReview, Long>,
   override val perRepository: Map<Repository, Long>,
   override val perDiscussion: Map<Discussion, Long> = emptyMap(),
-) : GenericLongMetric {
+) : GenericCountMetric {
 
-  override val metricName = CodeReviewChangeLinesAdded::class.simpleName!!
+  override val name = CodeReviewChangeLinesAdded::class.simpleName!!
 
 }
diff --git a/src/commonMain/kotlin/components/metrics/CodeReviewChangeLinesDeleted.kt b/src/commonMain/kotlin/components/metrics/CodeReviewChangeLinesDeleted.kt
@@ -11,8 +11,8 @@ data class CodeReviewChangeLinesDeleted(
   override val perCodeReview: Map<CodeReview, Long>,
   override val perRepository: Map<Repository, Long>,
   override val perDiscussion: Map<Discussion, Long> = emptyMap(),
-) : GenericLongMetric {
+) : GenericCountMetric {
 
-  override val metricName = CodeReviewChangeLinesDeleted::class.simpleName!!
+  override val name = CodeReviewChangeLinesDeleted::class.simpleName!!
 
 }
diff --git a/src/commonMain/kotlin/components/metrics/CodeReviewChangeLinesTotal.kt b/src/commonMain/kotlin/components/metrics/CodeReviewChangeLinesTotal.kt
@@ -11,8 +11,8 @@ data class CodeReviewChangeLinesTotal(
   override val perCodeReview: Map<CodeReview, Long>,
   override val perRepository: Map<Repository, Long>,
   override val perDiscussion: Map<Discussion, Long> = emptyMap(),
-) : GenericLongMetric {
+) : GenericCountMetric {
 
-  override val metricName = CodeReviewChangeLinesTotal::class.simpleName!!
+  override val name = CodeReviewChangeLinesTotal::class.simpleName!!
 
 }
diff --git a/src/commonMain/kotlin/components/metrics/CodeReviewChangesAdded.kt b/src/commonMain/kotlin/components/metrics/CodeReviewChangesAdded.kt
@@ -11,8 +11,8 @@ data class CodeReviewChangesAdded(
   override val perCodeReview: Map<CodeReview, Long>,
   override val perRepository: Map<Repository, Long>,
   override val perDiscussion: Map<Discussion, Long> = emptyMap(),
-) : GenericLongMetric {
+) : GenericCountMetric {
 
-  override val metricName = CodeReviewChangesAdded::class.simpleName!!
+  override val name = CodeReviewChangesAdded::class.simpleName!!
 
 }
diff --git a/src/commonMain/kotlin/components/metrics/CodeReviewChangesModified.kt b/src/commonMain/kotlin/components/metrics/CodeReviewChangesModified.kt
@@ -11,8 +11,8 @@ data class CodeReviewChangesModified(
   override val perCodeReview: Map<CodeReview, Long>,
   override val perRepository: Map<Repository, Long>,
   override val perDiscussion: Map<Discussion, Long> = emptyMap(),
-) : GenericLongMetric {
+) : GenericCountMetric {
 
-  override val metricName = CodeReviewChangesModified::class.simpleName!!
+  override val name = CodeReviewChangesModified::class.simpleName!!
 
 }
diff --git a/src/commonMain/kotlin/components/metrics/CodeReviewChangesRemoved.kt b/src/commonMain/kotlin/components/metrics/CodeReviewChangesRemoved.kt
@@ -11,8 +11,8 @@ data class CodeReviewChangesRemoved(
   override val perCodeReview: Map<CodeReview, Long>,
   override val perRepository: Map<Repository, Long>,
   override val perDiscussion: Map<Discussion, Long> = emptyMap(),
-) : GenericLongMetric {
+) : GenericCountMetric {
 
-  override val metricName = CodeReviewChangesRemoved::class.simpleName!!
+  override val name = CodeReviewChangesRemoved::class.simpleName!!
 
 }
diff --git a/src/commonMain/kotlin/components/metrics/CodeReviewChangesTotal.kt b/src/commonMain/kotlin/components/metrics/CodeReviewChangesTotal.kt
@@ -11,8 +11,8 @@ data class CodeReviewChangesTotal(
   override val perCodeReview: Map<CodeReview, Long>,
   override val perRepository: Map<Repository, Long>,
   override val perDiscussion: Map<Discussion, Long> = emptyMap(),
-) : GenericLongMetric {
+) : GenericCountMetric {
 
-  override val metricName = CodeReviewChangesTotal::class.simpleName!!
+  override val name = CodeReviewChangesTotal::class.simpleName!!
 
 }
diff --git a/src/commonMain/kotlin/components/metrics/CodeReviewCommentsAuthored.kt b/src/commonMain/kotlin/components/metrics/CodeReviewCommentsAuthored.kt
@@ -11,8 +11,8 @@ data class CodeReviewCommentsAuthored(
   override val perCodeReview: Map<CodeReview, Long>,
   override val perRepository: Map<Repository, Long>,
   override val perDiscussion: Map<Discussion, Long> = emptyMap(),
-) : GenericLongMetric {
+) : GenericCountMetric {
 
-  override val metricName = CodeReviewCommentsAuthored::class.simpleName!!
+  override val name = CodeReviewCommentsAuthored::class.simpleName!!
 
 }
diff --git a/src/commonMain/kotlin/components/metrics/CodeReviewCommentsReceived.kt b/src/commonMain/kotlin/components/metrics/CodeReviewCommentsReceived.kt
@@ -11,8 +11,8 @@ data class CodeReviewCommentsReceived(
   override val perCodeReview: Map<CodeReview, Long> = emptyMap(),
   override val perRepository: Map<Repository, Long> = emptyMap(),
   override val perDiscussion: Map<Discussion, Long> = emptyMap(),
-) : GenericLongMetric {
+) : GenericCountMetric {
 
-  override val metricName = CodeReviewCommentsReceived::class.simpleName!!
+  override val name = CodeReviewCommentsReceived::class.simpleName!!
 
 }
diff --git a/src/commonMain/kotlin/components/metrics/CodeReviewFeedbacksApproved.kt b/src/commonMain/kotlin/components/metrics/CodeReviewFeedbacksApproved.kt
@@ -11,8 +11,8 @@ data class CodeReviewFeedbacksApproved(
   override val perCodeReview: Map<CodeReview, Long>,
   override val perRepository: Map<Repository, Long>,
   override val perDiscussion: Map<Discussion, Long> = emptyMap(),
-) : GenericLongMetric {
+) : GenericCountMetric {
 
-  override val metricName = CodeReviewFeedbacksApproved::class.simpleName!!
+  override val name = CodeReviewFeedbacksApproved::class.simpleName!!
 
 }
diff --git a/src/commonMain/kotlin/components/metrics/CodeReviewFeedbacksPostponed.kt b/src/commonMain/kotlin/components/metrics/CodeReviewFeedbacksPostponed.kt
@@ -11,8 +11,8 @@ data class CodeReviewFeedbacksPostponed(
   override val perCodeReview: Map<CodeReview, Long>,
   override val perRepository: Map<Repository, Long>,
   override val perDiscussion: Map<Discussion, Long> = emptyMap(),
-) : GenericLongMetric {
+) : GenericCountMetric {
 
-  override val metricName = CodeReviewFeedbacksPostponed::class.simpleName!!
+  override val name = CodeReviewFeedbacksPostponed::class.simpleName!!
 
 }
diff --git a/src/commonMain/kotlin/components/metrics/CodeReviewFeedbacksRejected.kt b/src/commonMain/kotlin/components/metrics/CodeReviewFeedbacksRejected.kt
@@ -11,8 +11,8 @@ data class CodeReviewFeedbacksRejected(
   override val perCodeReview: Map<CodeReview, Long>,
   override val perRepository: Map<Repository, Long>,
   override val perDiscussion: Map<Discussion, Long> = emptyMap(),
-) : GenericLongMetric {
+) : GenericCountMetric {
 
-  override val metricName = CodeReviewFeedbacksRejected::class.simpleName!!
+  override val name = CodeReviewFeedbacksRejected::class.simpleName!!
 
 }
diff --git a/src/commonMain/kotlin/components/metrics/CodeReviewFeedbacksTotal.kt b/src/commonMain/kotlin/components/metrics/CodeReviewFeedbacksTotal.kt
@@ -11,8 +11,8 @@ data class CodeReviewFeedbacksTotal(
   override val perCodeReview: Map<CodeReview, Long>,
   override val perRepository: Map<Repository, Long>,
   override val perDiscussion: Map<Discussion, Long> = emptyMap(),
-) : GenericLongMetric {
+) : GenericCountMetric {
 
-  override val metricName = CodeReviewFeedbacksTotal::class.simpleName!!
+  override val name = CodeReviewFeedbacksTotal::class.simpleName!!
 
 }
diff --git a/src/commonMain/kotlin/components/metrics/CodeReviews.kt b/src/commonMain/kotlin/components/metrics/CodeReviews.kt
@@ -11,8 +11,8 @@ data class CodeReviews(
   override val perRepository: Map<Repository, Long>,
   override val perCodeReview: Map<CodeReview, Long> = emptyMap(),
   override val perDiscussion: Map<Discussion, Long> = emptyMap(),
-) : GenericLongMetric {
+) : GenericCountMetric {
 
-  override val metricName = CodeReviews::class.simpleName!!
+  override val name = CodeReviews::class.simpleName!!
 
 }
diff --git a/src/commonMain/kotlin/components/metrics/CycleTime.kt b/src/commonMain/kotlin/components/metrics/CycleTime.kt
@@ -11,8 +11,8 @@ data class CycleTime(
   override val perCodeReview: Map<CodeReview, Long>,
   override val perRepository: Map<Repository, Long>,
   override val perDiscussion: Map<Discussion, Long> = emptyMap(),
-) : GenericLongMetric {
+) : GenericDurationMetric {
 
-  override val metricName = "Cycle Time"
+  override val name = "Cycle Time"
 
 }
diff --git a/src/commonMain/kotlin/components/metrics/GenericCountMetric.kt b/src/commonMain/kotlin/components/metrics/GenericCountMetric.kt
@@ -5,11 +5,11 @@ import components.data.Discussion
 import components.data.Repository
 import components.data.User
 import utils.HasSimpleFormat
-import utils.durationString
+import utils.twoDecimals
 
-interface GenericLongMetric : HasSimpleFormat {
+interface GenericCountMetric : HasSimpleFormat {
 
-  val metricName: String
+  val name: String
 
   val perAuthor: Map<User, Long>
   val perReviewer: Map<User, Long>
@@ -45,41 +45,41 @@ interface GenericLongMetric : HasSimpleFormat {
 
   override val simpleFormat
     get() = buildString {
-      appendLine(metricName)
+      appendLine(name)
       if (perAuthor.isNotEmpty()) {
         appendLine("  · ${perAuthor.size} authors")
-        appendLine("    · Total: ${totalForAllAuthors.durationString}")
-        appendLine("    · Average: ${averagePerAuthor.toLong().durationString}")
+        appendLine("    · Total: $totalForAllAuthors")
+        appendLine("    · Average: ${averagePerAuthor.twoDecimals}")
         appendLine("    · Outliers:")
-        appendLine(perAuthor.formatOutliers())
+        appendLine(perAuthor.formatOutliersAsCount())
       }
       if (perReviewer.isNotEmpty()) {
         appendLine("  · ${perReviewer.size} reviewers")
-        appendLine("    · Total: ${totalForAllReviewers.durationString}")
-        appendLine("    · Average: ${averagePerReviewer.toLong().durationString}")
+        appendLine("    · Total: $totalForAllReviewers")
+        appendLine("    · Average: ${averagePerReviewer.twoDecimals}")
         appendLine("    · Outliers:")
-        appendLine(perReviewer.formatOutliers())
+        appendLine(perReviewer.formatOutliersAsCount())
       }
       if (perCodeReview.isNotEmpty()) {
         appendLine("  · ${perCodeReview.size} code reviews")
-        appendLine("    · Total: ${totalForAllCodeReviews.durationString}")
-        appendLine("    · Average: ${averagePerCodeReview.toLong().durationString}")
+        appendLine("    · Total: $totalForAllCodeReviews")
+        appendLine("    · Average: ${averagePerCodeReview.twoDecimals}")
         appendLine("    · Outliers:")
-        appendLine(perCodeReview.formatOutliers())
+        appendLine(perCodeReview.formatOutliersAsCount())
       }
       if (perDiscussion.isNotEmpty()) {
         appendLine("  · ${perDiscussion.size} discussions")
-        appendLine("    · Total: ${totalForAllDiscussions.durationString}")
-        appendLine("    · Average: ${averagePerDiscussion.toLong().durationString}")
+        appendLine("    · Total: $totalForAllDiscussions")
+        appendLine("    · Average: ${averagePerDiscussion.twoDecimals}")
         appendLine("    · Outliers:")
-        appendLine(perDiscussion.formatOutliers())
+        appendLine(perDiscussion.formatOutliersAsCount())
       }
       if (perRepository.isNotEmpty()) {
         appendLine("  · ${perRepository.size} repositories")
-        appendLine("    · Total: ${totalForAllRepositories.durationString}")
-        appendLine("    · Average: ${averagePerRepository.toLong().durationString}")
+        appendLine("    · Total: $totalForAllRepositories")
+        appendLine("    · Average: ${averagePerRepository.twoDecimals}")
         appendLine("    · Outliers:")
-        appendLine(perRepository.formatOutliers())
+        appendLine(perRepository.formatOutliersAsCount())
       }
     }
 
diff --git a/src/commonMain/kotlin/components/metrics/GenericDurationMetric.kt b/src/commonMain/kotlin/components/metrics/GenericDurationMetric.kt
@@ -0,0 +1,47 @@
+package components.metrics
+
+import utils.durationString
+
+interface GenericDurationMetric : GenericCountMetric {
+
+  override val simpleFormat
+    get() = buildString {
+      appendLine(name)
+      if (perAuthor.isNotEmpty()) {
+        appendLine("  · ${perAuthor.size} authors")
+        appendLine("    · Total: ${totalForAllAuthors.durationString}")
+        appendLine("    · Average: ${averagePerAuthor.toLong().durationString}")
+        appendLine("    · Outliers:")
+        appendLine(perAuthor.formatOutliersAsDuration())
+      }
+      if (perReviewer.isNotEmpty()) {
+        appendLine("  · ${perReviewer.size} reviewers")
+        appendLine("    · Total: ${totalForAllReviewers.durationString}")
+        appendLine("    · Average: ${averagePerReviewer.toLong().durationString}")
+        appendLine("    · Outliers:")
+        appendLine(perReviewer.formatOutliersAsDuration())
+      }
+      if (perCodeReview.isNotEmpty()) {
+        appendLine("  · ${perCodeReview.size} code reviews")
+        appendLine("    · Total: ${totalForAllCodeReviews.durationString}")
+        appendLine("    · Average: ${averagePerCodeReview.toLong().durationString}")
+        appendLine("    · Outliers:")
+        appendLine(perCodeReview.formatOutliersAsDuration())
+      }
+      if (perDiscussion.isNotEmpty()) {
+        appendLine("  · ${perDiscussion.size} discussions")
+        appendLine("    · Total: ${totalForAllDiscussions.durationString}")
+        appendLine("    · Average: ${averagePerDiscussion.toLong().durationString}")
+        appendLine("    · Outliers:")
+        appendLine(perDiscussion.formatOutliersAsDuration())
+      }
+      if (perRepository.isNotEmpty()) {
+        appendLine("  · ${perRepository.size} repositories")
+        appendLine("    · Total: ${totalForAllRepositories.durationString}")
+        appendLine("    · Average: ${averagePerRepository.toLong().durationString}")
+        appendLine("    · Outliers:")
+        appendLine(perRepository.formatOutliersAsDuration())
+      }
+    }
+
+}
diff --git a/src/commonMain/kotlin/components/metrics/PrintingUtils.kt b/src/commonMain/kotlin/components/metrics/PrintingUtils.kt
diff --git a/src/commonMain/kotlin/utils/Debugging.kt b/src/commonMain/kotlin/utils/Debugging.kt
diff --git a/src/commonTest/kotlin/stubs/MetricsStubs.kt b/src/commonTest/kotlin/stubs/MetricsStubs.kt

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ data class CodeReviewChangeLinesAdded(`
`11`	`11`	`override val perCodeReview: Map<CodeReview, Long>,`
`12`	`12`	`override val perRepository: Map<Repository, Long>,`
`13`	`13`	`override val perDiscussion: Map<Discussion, Long> = emptyMap(),`
`14`		`-) : GenericLongMetric {`
	`14`	`+) : GenericCountMetric {`
`15`	`15`
`16`		`- override val metricName = CodeReviewChangeLinesAdded::class.simpleName!!`
	`16`	`+ override val name = CodeReviewChangeLinesAdded::class.simpleName!!`
`17`	`17`
`18`	`18`	`}`