Skip to content

Commit

Permalink
Merge pull request #1151 from Karry/update/micrometer-1.13.0
Browse files Browse the repository at this point in the history
update micrometer libraries to 1.13.0
  • Loading branch information
Karry authored Jun 14, 2024
2 parents eda446e + 9b5accf commit f5357d6
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 9 deletions.
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
package com.avast.sst.micrometer.prometheus

import io.micrometer.prometheus.HistogramFlavor

import java.util.concurrent.TimeUnit
import scala.concurrent.duration.Duration

final case class MicrometerPrometheusConfig(
step: Duration = Duration(1, TimeUnit.MINUTES),
prefix: String = "",
descriptions: Boolean = true,
histogramFlavor: HistogramFlavor = HistogramFlavor.Prometheus,
commonTags: Map[String, String] = Map.empty
)
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package com.avast.sst.micrometer.prometheus
import cats.effect.{Blocker, ContextShift, Resource, Sync}
import com.avast.sst.micrometer.PrefixMeterFilter
import io.micrometer.core.instrument.config.{MeterFilter, NamingConvention}
import io.micrometer.prometheus.{HistogramFlavor, PrometheusConfig, PrometheusMeterRegistry}
import io.micrometer.prometheusmetrics.{PrometheusConfig, PrometheusMeterRegistry}

import java.time.Duration

Expand Down Expand Up @@ -44,7 +44,6 @@ object MicrometerPrometheusModule {
override val step: Duration = java.time.Duration.ofMillis(c.step.toMillis)
override val prefix: String = c.prefix
override val descriptions: Boolean = c.descriptions
override val histogramFlavor: HistogramFlavor = c.histogramFlavor

// the method is @Nullable and we don't need to implement it here
@SuppressWarnings(Array("scalafix:DisableSyntax.null"))
Expand Down
8 changes: 4 additions & 4 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ object Dependencies {
val doobie = "0.13.4"
val grpc = "1.64.0"
val http4s = "0.22.15"
val micrometerCore = "1.10.13"
val micrometerJmx = "1.10.13"
val micrometerStatsD = "1.10.13"
val micrometerPrometheus = "1.10.13"
val micrometerCore = "1.13.0"
val micrometerJmx = "1.13.0"
val micrometerStatsD = "1.13.0"
val micrometerPrometheus = "1.13.0"
val monix = "3.4.1"
val pureConfig = "0.17.1"

Expand Down

0 comments on commit f5357d6

Please sign in to comment.