Skip to content

update micrometer libraries to 1.13.0 #1151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 14, 2024
Merged

update micrometer libraries to 1.13.0 #1151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
281cf5b
update micrometer libraries to 1.13.0
Karry May 28, 2024
9b5accf
Merge branch 'master' into update/micrometer-1.13.0
Karry May 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions ...theus/src/main/scala/com/avast/sst/micrometer/prometheus/MicrometerPrometheusConfig.scala
View file
Open in desktop
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
)
3 changes: 1 addition & 2 deletions ...theus/src/main/scala/com/avast/sst/micrometer/prometheus/MicrometerPrometheusModule.scala
View file
Open in desktop
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
View file
Open in desktop
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
Loading