From a66fc1b038c6bfde4e1133a2e8ab33c7a1c40303 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Thu, 17 Oct 2024 11:52:13 +0200 Subject: [PATCH 1/5] Update sbt-scoverage to 2.2.1 (#894) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 859ab410..fc471523 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,7 +6,7 @@ addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.2") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.6.1") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.0") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.1") addSbtPlugin("dev.zio" % "zio-sbt-ci" % zioSbtVersion) addSbtPlugin("dev.zio" % "zio-sbt-ecosystem" % zioSbtVersion) addSbtPlugin("dev.zio" % "zio-sbt-website" % zioSbtVersion) From 900b1d5e70f6c4b884de6aae22848bb5a50742ec Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Thu, 17 Oct 2024 12:10:35 +0200 Subject: [PATCH 2/5] Update scala-library to 2.13.15 (#893) * Update scala-library to 2.13.15 * Fix compilation errors in tests --------- Co-authored-by: Michael Nedokushev <grouzen.hexy@gmail.com> --- build.sbt | 2 +- .../zio/telemetry/opentelemetry/tracing/TracingTest.scala | 2 +- .../scala/zio/telemetry/opentracing/OpenTracingTest.scala | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index 2fb9aa20..19488647 100644 --- a/build.sbt +++ b/build.sbt @@ -61,7 +61,7 @@ inThisBuild( ), concurrentRestrictions += Tags.limit(missinglinkConflictsTag, 1), // TODO: remove once it is updated in zio-sbt - scala213 := "2.13.14" + scala213 := "2.13.15" ) ) diff --git a/opentelemetry/src/test/scala/zio/telemetry/opentelemetry/tracing/TracingTest.scala b/opentelemetry/src/test/scala/zio/telemetry/opentelemetry/tracing/TracingTest.scala index 55f107f6..027ef7cb 100644 --- a/opentelemetry/src/test/scala/zio/telemetry/opentelemetry/tracing/TracingTest.scala +++ b/opentelemetry/src/test/scala/zio/telemetry/opentelemetry/tracing/TracingTest.scala @@ -360,7 +360,7 @@ object TracingTest extends ZIOSpecDefault { ref <- Ref.make(false) scope <- Scope.make resource = ZIO.addFinalizer(ref.set(true)) - _ <- scope.extend(tracing.span("Resource")(resource)) + _ <- scope.extend[Any](tracing.span("Resource")(resource)) released <- ref.get } yield assert(released)(isFalse) } diff --git a/opentracing/src/test/scala/zio/telemetry/opentracing/OpenTracingTest.scala b/opentracing/src/test/scala/zio/telemetry/opentracing/OpenTracingTest.scala index 92f7ee71..85b43b05 100644 --- a/opentracing/src/test/scala/zio/telemetry/opentracing/OpenTracingTest.scala +++ b/opentracing/src/test/scala/zio/telemetry/opentracing/OpenTracingTest.scala @@ -189,7 +189,7 @@ object OpenTracingTest extends ZIOSpecDefault { val zio = for { _ <- tracing.log("message") _ <- TestClock.adjust(duration) - _ <- tracing.log(Map("msg" -> "message", "size" -> 1)) + _ <- tracing.log(Map("msg" -> "message", "size" -> "1")) } yield () for { @@ -209,7 +209,7 @@ object OpenTracingTest extends ZIOSpecDefault { val expected = List( 0L -> Map("event" -> "message"), - 1000L -> Map[String, Any]("msg" -> "message", "size" -> 1) + 1000L -> Map("msg" -> "message", "size" -> "1") ) assert(tags)(equalTo(expected)) From f3bdad4a97e5f0a62b26187aa881a8d892f1ad2c Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Thu, 17 Oct 2024 12:18:37 +0200 Subject: [PATCH 3/5] Update zio, zio-stacktracer, zio-test, ... to 2.1.11 (#896) Co-authored-by: Michael Nedokushev <grouzen.hexy@gmail.com> --- build.sbt | 2 +- project/Dependencies.scala | 2 +- scala-cli/opentelemetry-zio-logging/ZioLoggingApp.scala | 2 +- scala-cli/opentelemetry/BaggageApp.scala | 2 +- scala-cli/opentelemetry/LoggingApp.scala | 2 +- scala-cli/opentelemetry/MetricsApp.scala | 2 +- scala-cli/opentelemetry/PropagatingApp.scala | 2 +- scala-cli/opentelemetry/TracingApp.scala | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build.sbt b/build.sbt index 19488647..6c4e248e 100644 --- a/build.sbt +++ b/build.sbt @@ -8,7 +8,7 @@ inThisBuild( List( name := "ZIO Telemetry", organization := "dev.zio", - zioVersion := "2.1.9", + zioVersion := "2.1.11", homepage := Some(url("https://zio.dev/zio-telemetry/")), licenses := List("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")), developers := List( diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 07909173..7a090b5c 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -7,7 +7,7 @@ object Dependencies { val opentelemetry = "1.42.1" val opencensus = "0.31.1" val scalaCollectionCompat = "2.12.0" - val zio = "2.1.9" + val zio = "2.1.11" val zioLogging = "2.3.1" val izumiReflect = "2.3.10" } diff --git a/scala-cli/opentelemetry-zio-logging/ZioLoggingApp.scala b/scala-cli/opentelemetry-zio-logging/ZioLoggingApp.scala index fbc02c69..f112a21c 100644 --- a/scala-cli/opentelemetry-zio-logging/ZioLoggingApp.scala +++ b/scala-cli/opentelemetry-zio-logging/ZioLoggingApp.scala @@ -1,5 +1,5 @@ //> using scala "3.5.1" -//> using dep dev.zio::zio:2.1.9 +//> using dep dev.zio::zio:2.1.11 //> using dep dev.zio::zio-opentelemetry:3.0.0-RC26 //> using dep dev.zio::zio-opentelemetry-zio-logging:3.0.0-RC26 //> using dep io.opentelemetry:opentelemetry-sdk:1.42.1 diff --git a/scala-cli/opentelemetry/BaggageApp.scala b/scala-cli/opentelemetry/BaggageApp.scala index 563f8349..0fd53b58 100644 --- a/scala-cli/opentelemetry/BaggageApp.scala +++ b/scala-cli/opentelemetry/BaggageApp.scala @@ -1,5 +1,5 @@ //> using scala "3.5.1" -//> using dep dev.zio::zio:2.1.9 +//> using dep dev.zio::zio:2.1.11 //> using dep dev.zio::zio-opentelemetry:3.0.0-RC26 import zio.* diff --git a/scala-cli/opentelemetry/LoggingApp.scala b/scala-cli/opentelemetry/LoggingApp.scala index 966f6b19..15954231 100644 --- a/scala-cli/opentelemetry/LoggingApp.scala +++ b/scala-cli/opentelemetry/LoggingApp.scala @@ -1,5 +1,5 @@ //> using scala "3.5.1" -//> using dep dev.zio::zio:2.1.9 +//> using dep dev.zio::zio:2.1.11 //> using dep dev.zio::zio-opentelemetry:3.0.0-RC26 //> using dep io.opentelemetry:opentelemetry-sdk:1.42.1 //> using dep io.opentelemetry:opentelemetry-sdk-trace:1.42.1 diff --git a/scala-cli/opentelemetry/MetricsApp.scala b/scala-cli/opentelemetry/MetricsApp.scala index 088306db..f4278ad0 100644 --- a/scala-cli/opentelemetry/MetricsApp.scala +++ b/scala-cli/opentelemetry/MetricsApp.scala @@ -1,5 +1,5 @@ //> using scala "3.5.1" -//> using dep dev.zio::zio:2.1.9 +//> using dep dev.zio::zio:2.1.11 //> using dep dev.zio::zio-opentelemetry:3.0.0-RC26 //> using dep io.opentelemetry:opentelemetry-sdk:1.42.1 //> using dep io.opentelemetry:opentelemetry-sdk-trace:1.42.1 diff --git a/scala-cli/opentelemetry/PropagatingApp.scala b/scala-cli/opentelemetry/PropagatingApp.scala index a86f0d51..f6aa5308 100644 --- a/scala-cli/opentelemetry/PropagatingApp.scala +++ b/scala-cli/opentelemetry/PropagatingApp.scala @@ -1,5 +1,5 @@ //> using scala "3.5.1" -//> using dep dev.zio::zio:2.1.9 +//> using dep dev.zio::zio:2.1.11 //> using dep dev.zio::zio-opentelemetry:3.0.0-RC26 //> using dep io.opentelemetry:opentelemetry-sdk:1.42.1 //> using dep io.opentelemetry:opentelemetry-sdk-trace:1.42.1 diff --git a/scala-cli/opentelemetry/TracingApp.scala b/scala-cli/opentelemetry/TracingApp.scala index a41b0e7c..14ba196d 100644 --- a/scala-cli/opentelemetry/TracingApp.scala +++ b/scala-cli/opentelemetry/TracingApp.scala @@ -1,5 +1,5 @@ //> using scala "3.5.1" -//> using dep dev.zio::zio:2.1.9 +//> using dep dev.zio::zio:2.1.11 //> using dep dev.zio::zio-opentelemetry:3.0.0-RC26 //> using dep io.opentelemetry:opentelemetry-sdk:1.42.1 //> using dep io.opentelemetry:opentelemetry-sdk-trace:1.42.1 From 02db269f8181a5df1684b21a2f1ea5a42dd3f1ed Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Thu, 17 Oct 2024 12:27:52 +0200 Subject: [PATCH 4/5] Update opentelemetry-api, ... to 1.43.0 (#897) Co-authored-by: Michael Nedokushev <grouzen.hexy@gmail.com> --- project/Dependencies.scala | 2 +- scala-cli/opentelemetry-zio-logging/ZioLoggingApp.scala | 6 +++--- scala-cli/opentelemetry/LoggingApp.scala | 6 +++--- scala-cli/opentelemetry/MetricsApp.scala | 6 +++--- scala-cli/opentelemetry/PropagatingApp.scala | 6 +++--- scala-cli/opentelemetry/TracingApp.scala | 6 +++--- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 7a090b5c..9d9a5fe0 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -4,7 +4,7 @@ object Dependencies { object Versions { val opentracing = "0.33.0" - val opentelemetry = "1.42.1" + val opentelemetry = "1.43.0" val opencensus = "0.31.1" val scalaCollectionCompat = "2.12.0" val zio = "2.1.11" diff --git a/scala-cli/opentelemetry-zio-logging/ZioLoggingApp.scala b/scala-cli/opentelemetry-zio-logging/ZioLoggingApp.scala index f112a21c..53ab0bef 100644 --- a/scala-cli/opentelemetry-zio-logging/ZioLoggingApp.scala +++ b/scala-cli/opentelemetry-zio-logging/ZioLoggingApp.scala @@ -2,9 +2,9 @@ //> using dep dev.zio::zio:2.1.11 //> using dep dev.zio::zio-opentelemetry:3.0.0-RC26 //> using dep dev.zio::zio-opentelemetry-zio-logging:3.0.0-RC26 -//> using dep io.opentelemetry:opentelemetry-sdk:1.42.1 -//> using dep io.opentelemetry:opentelemetry-sdk-trace:1.42.1 -//> using dep io.opentelemetry:opentelemetry-exporter-logging-otlp:1.42.1 +//> using dep io.opentelemetry:opentelemetry-sdk:1.43.0 +//> using dep io.opentelemetry:opentelemetry-sdk-trace:1.43.0 +//> using dep io.opentelemetry:opentelemetry-exporter-logging-otlp:1.43.0 //> using dep io.opentelemetry.semconv:opentelemetry-semconv:1.22.0-alpha import io.opentelemetry.exporter.logging.otlp.OtlpJsonLoggingSpanExporter diff --git a/scala-cli/opentelemetry/LoggingApp.scala b/scala-cli/opentelemetry/LoggingApp.scala index 15954231..edf8e6b1 100644 --- a/scala-cli/opentelemetry/LoggingApp.scala +++ b/scala-cli/opentelemetry/LoggingApp.scala @@ -1,9 +1,9 @@ //> using scala "3.5.1" //> using dep dev.zio::zio:2.1.11 //> using dep dev.zio::zio-opentelemetry:3.0.0-RC26 -//> using dep io.opentelemetry:opentelemetry-sdk:1.42.1 -//> using dep io.opentelemetry:opentelemetry-sdk-trace:1.42.1 -//> using dep io.opentelemetry:opentelemetry-exporter-logging-otlp:1.42.1 +//> using dep io.opentelemetry:opentelemetry-sdk:1.43.0 +//> using dep io.opentelemetry:opentelemetry-sdk-trace:1.43.0 +//> using dep io.opentelemetry:opentelemetry-exporter-logging-otlp:1.43.0 //> using dep io.opentelemetry.semconv:opentelemetry-semconv:1.22.0-alpha import io.opentelemetry.exporter.logging.otlp.OtlpJsonLoggingSpanExporter diff --git a/scala-cli/opentelemetry/MetricsApp.scala b/scala-cli/opentelemetry/MetricsApp.scala index f4278ad0..7f88ec40 100644 --- a/scala-cli/opentelemetry/MetricsApp.scala +++ b/scala-cli/opentelemetry/MetricsApp.scala @@ -1,9 +1,9 @@ //> using scala "3.5.1" //> using dep dev.zio::zio:2.1.11 //> using dep dev.zio::zio-opentelemetry:3.0.0-RC26 -//> using dep io.opentelemetry:opentelemetry-sdk:1.42.1 -//> using dep io.opentelemetry:opentelemetry-sdk-trace:1.42.1 -//> using dep io.opentelemetry:opentelemetry-exporter-logging-otlp:1.42.1 +//> using dep io.opentelemetry:opentelemetry-sdk:1.43.0 +//> using dep io.opentelemetry:opentelemetry-sdk-trace:1.43.0 +//> using dep io.opentelemetry:opentelemetry-exporter-logging-otlp:1.43.0 //> using dep io.opentelemetry.semconv:opentelemetry-semconv:1.22.0-alpha import io.opentelemetry.sdk.trace.SdkTracerProvider diff --git a/scala-cli/opentelemetry/PropagatingApp.scala b/scala-cli/opentelemetry/PropagatingApp.scala index f6aa5308..b0026ce6 100644 --- a/scala-cli/opentelemetry/PropagatingApp.scala +++ b/scala-cli/opentelemetry/PropagatingApp.scala @@ -1,9 +1,9 @@ //> using scala "3.5.1" //> using dep dev.zio::zio:2.1.11 //> using dep dev.zio::zio-opentelemetry:3.0.0-RC26 -//> using dep io.opentelemetry:opentelemetry-sdk:1.42.1 -//> using dep io.opentelemetry:opentelemetry-sdk-trace:1.42.1 -//> using dep io.opentelemetry:opentelemetry-exporter-logging-otlp:1.42.1 +//> using dep io.opentelemetry:opentelemetry-sdk:1.43.0 +//> using dep io.opentelemetry:opentelemetry-sdk-trace:1.43.0 +//> using dep io.opentelemetry:opentelemetry-exporter-logging-otlp:1.43.0 //> using dep io.opentelemetry.semconv:opentelemetry-semconv:1.22.0-alpha import io.opentelemetry.exporter.logging.otlp.OtlpJsonLoggingSpanExporter diff --git a/scala-cli/opentelemetry/TracingApp.scala b/scala-cli/opentelemetry/TracingApp.scala index 14ba196d..ac4fec73 100644 --- a/scala-cli/opentelemetry/TracingApp.scala +++ b/scala-cli/opentelemetry/TracingApp.scala @@ -1,9 +1,9 @@ //> using scala "3.5.1" //> using dep dev.zio::zio:2.1.11 //> using dep dev.zio::zio-opentelemetry:3.0.0-RC26 -//> using dep io.opentelemetry:opentelemetry-sdk:1.42.1 -//> using dep io.opentelemetry:opentelemetry-sdk-trace:1.42.1 -//> using dep io.opentelemetry:opentelemetry-exporter-logging-otlp:1.42.1 +//> using dep io.opentelemetry:opentelemetry-sdk:1.43.0 +//> using dep io.opentelemetry:opentelemetry-sdk-trace:1.43.0 +//> using dep io.opentelemetry:opentelemetry-exporter-logging-otlp:1.43.0 //> using dep io.opentelemetry.semconv:opentelemetry-semconv:1.22.0-alpha import io.opentelemetry.exporter.logging.otlp.OtlpJsonLoggingSpanExporter From 76e723e33e0ce58b275fa301d41191bbf8170594 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Thu, 17 Oct 2024 12:37:59 +0200 Subject: [PATCH 5/5] Update zio-logging to 2.3.2 (#898) Co-authored-by: Michael Nedokushev <grouzen.hexy@gmail.com> --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 9d9a5fe0..6d8b9c3c 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -8,7 +8,7 @@ object Dependencies { val opencensus = "0.31.1" val scalaCollectionCompat = "2.12.0" val zio = "2.1.11" - val zioLogging = "2.3.1" + val zioLogging = "2.3.2" val izumiReflect = "2.3.10" }