kamon-prometheus: Add default buckets for Dimension.Percentage (#1266)

* kamon-prometheus: Add default buckets for Dimension.Percentage * fix compile error
kamon-io · Apr 4, 2023 · 4f18bba · 4f18bba
1 parent f464db1
commit 4f18bba
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 0 deletions.
diff --git a/reporters/kamon-prometheus/src/main/resources/reference.conf b/reporters/kamon-prometheus/src/main/resources/reference.conf
@@ -52,6 +52,16 @@ kamon.prometheus {
       1048576
     ]
 
+    percentage-buckets = [
+      20,
+      40,
+      60,
+      70,
+      80,
+      90,
+      95
+    ]
+
     # Per metric overrides are possible by specifying the metric name and the histogram buckets here
     custom {
       // example:

diff --git a/reporters/kamon-prometheus/src/main/scala/kamon/prometheus/PrometheusSettings.scala b/reporters/kamon-prometheus/src/main/scala/kamon/prometheus/PrometheusSettings.scala
@@ -29,6 +29,7 @@ object PrometheusSettings {
     defaultBuckets: Seq[java.lang.Double],
     timeBuckets: Seq[java.lang.Double],
     informationBuckets: Seq[java.lang.Double],
+    percentageBuckets: Seq[java.lang.Double],
     customBuckets: Map[String, Seq[java.lang.Double]],
     includeEnvironmentTags: Boolean,
     summarySettings: SummarySettings,
@@ -47,6 +48,7 @@ object PrometheusSettings {
       defaultBuckets = prometheusConfig.getDoubleList("buckets.default-buckets").asScala.toSeq,
       timeBuckets = prometheusConfig.getDoubleList("buckets.time-buckets").asScala.toSeq,
       informationBuckets = prometheusConfig.getDoubleList("buckets.information-buckets").asScala.toSeq,
+      percentageBuckets = prometheusConfig.getDoubleList("buckets.percentage-buckets").asScala.toSeq,
       customBuckets = readCustomBuckets(prometheusConfig.getConfig("buckets.custom")),
       includeEnvironmentTags = prometheusConfig.getBoolean("include-environment-tags"),
       summarySettings = SummarySettings(

diff --git a/reporters/kamon-prometheus/src/main/scala/kamon/prometheus/ScrapeDataBuilder.scala b/reporters/kamon-prometheus/src/main/scala/kamon/prometheus/ScrapeDataBuilder.scala
@@ -189,6 +189,7 @@ class ScrapeDataBuilder(prometheusConfig: PrometheusSettings.Generic, environmen
       unit.dimension match {
         case Time         => prometheusConfig.timeBuckets
         case Information  => prometheusConfig.informationBuckets
+        case Percentage   => prometheusConfig.percentageBuckets
         case _            => prometheusConfig.defaultBuckets
       }
     )

diff --git a/reporters/kamon-prometheus/src/test/scala/kamon/prometheus/ScrapeDataBuilderSpec.scala b/reporters/kamon-prometheus/src/test/scala/kamon/prometheus/ScrapeDataBuilderSpec.scala
@@ -419,6 +419,7 @@ class ScrapeDataBuilderSpec extends AnyWordSpec with Matchers {
         buckets,
         buckets,
         buckets,
+        buckets,
         customBuckets,
         false,
         SummarySettings(Seq(0.5, 0.75, 0.95, 0.99), withSummary.map(Glob)),