🔀 Merge next

[Sone.git] / src / main / kotlin / net / pterodactylus / sone / web / pages / MetricsPage.kt

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/MetricsPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/MetricsPage.kt
index 236848d..837e2c8 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/MetricsPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/MetricsPage.kt
@@ -13,25 +13,7 @@ import javax.inject.*
 class MetricsPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer, private val metricsRegistry: MetricRegistry) : SoneTemplatePage(webInterface, loaders, templateRenderer, "Page.Metrics.Title") {
 
        override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
-               addHistogram(templateContext, "sone.parsing.duration", "soneParsingDuration")
-               addHistogram(templateContext, "sone.insert.duration", "soneInsertDuration")
-       }
-
-       private fun addHistogram(templateContext: TemplateContext, metricName: String, variablePrefix: String) {
-               metricsRegistry.histogram(metricName).also { histogram ->
-                       templateContext["${variablePrefix}Count"] = histogram.count
-                       histogram.snapshot.also { snapshot ->
-                               templateContext["${variablePrefix}Min"] = snapshot.min
-                               templateContext["${variablePrefix}Max"] = snapshot.max
-                               templateContext["${variablePrefix}Median"] = snapshot.median
-                               templateContext["${variablePrefix}Mean"] = snapshot.mean
-                               templateContext["${variablePrefix}Percentile75"] = snapshot.get75thPercentile()
-                               templateContext["${variablePrefix}Percentile95"] = snapshot.get95thPercentile()
-                               templateContext["${variablePrefix}Percentile98"] = snapshot.get98thPercentile()
-                               templateContext["${variablePrefix}Percentile99"] = snapshot.get99thPercentile()
-                               templateContext["${variablePrefix}Percentile999"] = snapshot.get999thPercentile()
-                       }
-               }
+               templateContext["histograms"] = metricsRegistry.histograms
        }
 
 }