Skip to content

Commit ca57a9e

Browse files
committed
Revert "update micrometer libraries to 1.13.0"
This reverts commit 281cf5b.
1 parent 1dc5993 commit ca57a9e

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
package com.avast.sst.micrometer.prometheus
22

3+
import io.micrometer.prometheus.HistogramFlavor
4+
35
import java.util.concurrent.TimeUnit
46
import scala.concurrent.duration.Duration
57

68
final case class MicrometerPrometheusConfig(
79
step: Duration = Duration(1, TimeUnit.MINUTES),
810
prefix: String = "",
911
descriptions: Boolean = true,
12+
histogramFlavor: HistogramFlavor = HistogramFlavor.Prometheus,
1013
commonTags: Map[String, String] = Map.empty
1114
)

micrometer-prometheus/src/main/scala/com/avast/sst/micrometer/prometheus/MicrometerPrometheusModule.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package com.avast.sst.micrometer.prometheus
33
import cats.effect.{Blocker, ContextShift, Resource, Sync}
44
import com.avast.sst.micrometer.PrefixMeterFilter
55
import io.micrometer.core.instrument.config.{MeterFilter, NamingConvention}
6-
import io.micrometer.prometheusmetrics.{PrometheusConfig, PrometheusMeterRegistry}
6+
import io.micrometer.prometheus.{HistogramFlavor, PrometheusConfig, PrometheusMeterRegistry}
77

88
import java.time.Duration
99

@@ -44,6 +44,7 @@ object MicrometerPrometheusModule {
4444
override val step: Duration = java.time.Duration.ofMillis(c.step.toMillis)
4545
override val prefix: String = c.prefix
4646
override val descriptions: Boolean = c.descriptions
47+
override val histogramFlavor: HistogramFlavor = c.histogramFlavor
4748

4849
// the method is @Nullable and we don't need to implement it here
4950
@SuppressWarnings(Array("scalafix:DisableSyntax.null"))

project/Dependencies.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ object Dependencies {
5151
val doobie = "0.13.4"
5252
val grpc = "1.64.0"
5353
val http4s = "0.22.15"
54-
val micrometerCore = "1.13.1"
55-
val micrometerJmx = "1.13.1"
56-
val micrometerStatsD = "1.13.1"
57-
val micrometerPrometheus = "1.13.1"
54+
val micrometerCore = "1.10.13"
55+
val micrometerJmx = "1.10.13"
56+
val micrometerStatsD = "1.10.13"
57+
val micrometerPrometheus = "1.10.13"
5858
val monix = "3.4.1"
5959
val pureConfig = "0.17.1"
6060

0 commit comments

Comments
 (0)