Merge branch 'series/2.x' into update/sbt-bloop-2.0.3

zio · Oct 17, 2024 · 1a5131f · 1a5131f
2 parents aac2bbf + 76e723e
commit 1a5131f
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 30 deletions.
diff --git 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(
@@ -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
@@ -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
@@ -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))

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -4,11 +4,11 @@ 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.9"
-    val zioLogging            = "2.3.1"
+    val zio                   = "2.1.11"
+    val zioLogging            = "2.3.2"
     val izumiReflect          = "2.3.10"
   }
 

diff --git 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)

diff --git a/scala-cli/opentelemetry-zio-logging/ZioLoggingApp.scala b/scala-cli/opentelemetry-zio-logging/ZioLoggingApp.scala
@@ -1,10 +1,10 @@
 //> 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
-//> 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/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
@@ -1,9 +1,9 @@
 //> 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
-//> 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
@@ -1,9 +1,9 @@
 //> 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
-//> 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
@@ -1,9 +1,9 @@
 //> 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
-//> 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
@@ -1,9 +1,9 @@
 //> 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
-//> 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