From a30ce8776bc2a7384c23d671ea8433fc3b6f0d0f Mon Sep 17 00:00:00 2001 From: Mikhail Sokolov Date: Tue, 3 Sep 2024 13:00:52 +0300 Subject: [PATCH] Update prometheus-tools from 1.0.8 to 1.1.0 Source and binary compatibility preserved, but the version has to be bumped to 1.2.0 because of the dependency update. --- build.sbt | 9 ++++++--- .../evolutiongaming/concurrent/SequentiallyMetrics.scala | 2 +- version.sbt | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/build.sbt b/build.sbt index 5e90e07..a9ad7af 100644 --- a/build.sbt +++ b/build.sbt @@ -22,7 +22,10 @@ lazy val commonSettings = Seq( // Your next release will be binary compatible with the previous one, // but it may not be source compatible (ie, it will be a minor release). -ThisBuild / versionPolicyIntention := Compatibility.BinaryAndSourceCompatible +// +// It is not set to BinaryAndSourceCompatible because prometheus-tools was bumped from 1.0.8 to 1.1.0. +// Otherwise, 1.2.0 is both source and binary compatible with 1.1.5. +ThisBuild / versionPolicyIntention := Compatibility.BinaryCompatible lazy val root = (project in file(".") @@ -39,7 +42,7 @@ lazy val sequentially = (project "com.typesafe.akka" %% "akka-stream" % "2.6.21", "com.typesafe.akka" %% "akka-testkit" % "2.6.21" % Test, "com.evolutiongaming" %% "future-helper" % "1.0.7", - "org.scalatest" %% "scalatest" % "3.2.10" % Test, + "org.scalatest" %% "scalatest" % "3.2.19" % Test, ))) lazy val benchmark = (project @@ -55,7 +58,7 @@ lazy val `sequentially-metrics` = (project settings commonSettings dependsOn sequentially settings (libraryDependencies ++= Seq( - "com.evolutiongaming" %% "prometheus-tools" % "1.0.8" + "com.evolutiongaming" %% "prometheus-tools" % "1.1.0" ))) //used by evolution-gaming/scala-github-actions diff --git a/sequentially-metrics/src/main/scala/com/evolutiongaming/concurrent/SequentiallyMetrics.scala b/sequentially-metrics/src/main/scala/com/evolutiongaming/concurrent/SequentiallyMetrics.scala index 39a0abc..df359c7 100644 --- a/sequentially-metrics/src/main/scala/com/evolutiongaming/concurrent/SequentiallyMetrics.scala +++ b/sequentially-metrics/src/main/scala/com/evolutiongaming/concurrent/SequentiallyMetrics.scala @@ -46,7 +46,7 @@ object SequentiallyMetrics { } def run[T](future: => Future[T]): Future[T] = { - time.labels(name, "run").timeFutureNanos(future) + time.labels(name, "run").timeFuture(future) } } } diff --git a/version.sbt b/version.sbt index 40dd015..a9dab4a 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -ThisBuild / version := "1.1.6-SNAPSHOT" +ThisBuild / version := "1.2.0-SNAPSHOT"