Skip to content

Commit

Permalink
Merge branch 'series/2.x' into update/sbt-scoverage-2.2.2
Browse files Browse the repository at this point in the history
  • Loading branch information
grouzen authored Oct 21, 2024
2 parents e92d27c + 59668e8 commit 0ab2bb2
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.10.2
sbt.version=1.10.3
4 changes: 2 additions & 2 deletions scala-cli/opentelemetry-zio-logging/ZioLoggingApp.scala
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//> 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 dev.zio::zio-opentelemetry-zio-logging:3.0.0-RC26
//> using dep dev.zio::zio-opentelemetry:3.0.0
//> using dep dev.zio::zio-opentelemetry-zio-logging:3.0.0
//> 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
Expand Down
2 changes: 1 addition & 1 deletion scala-cli/opentelemetry/BaggageApp.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//> 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 dev.zio::zio-opentelemetry:3.0.0

import zio.*
import zio.telemetry.opentelemetry.baggage.Baggage
Expand Down
2 changes: 1 addition & 1 deletion scala-cli/opentelemetry/LoggingApp.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//> 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 dev.zio::zio-opentelemetry:3.0.0
//> 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
Expand Down
2 changes: 1 addition & 1 deletion scala-cli/opentelemetry/MetricsApp.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//> 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 dev.zio::zio-opentelemetry:3.0.0
//> 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
Expand Down
2 changes: 1 addition & 1 deletion scala-cli/opentelemetry/PropagatingApp.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//> 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 dev.zio::zio-opentelemetry:3.0.0
//> 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
Expand Down
2 changes: 1 addition & 1 deletion scala-cli/opentelemetry/TracingApp.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//> 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 dev.zio::zio-opentelemetry:3.0.0
//> 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
Expand Down

0 comments on commit 0ab2bb2

Please sign in to comment.