From 6079cc8c5cd6280313cd99738f9e35b992e06365 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Mon, 13 Nov 2023 20:09:37 +0000 Subject: [PATCH 1/2] Update opentelemetry-api, ... to 1.32.0 --- build.sbt | 2 +- examples/src/main/scala/PekkoHttpExample.scala | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index a86deb119..a1d1e6ceb 100644 --- a/build.sbt +++ b/build.sbt @@ -35,7 +35,7 @@ val FS2Version = "3.9.3" val MUnitVersion = "1.0.0-M10" val MUnitCatsEffectVersion = "2.0.0-M4" val MUnitDisciplineVersion = "2.0.0-M3" -val OpenTelemetryVersion = "1.31.0" +val OpenTelemetryVersion = "1.32.0" val OpenTelemetrySemConvVersion = "1.21.0-alpha" val PekkoStreamVersion = "1.0.1" val PekkoHttpVersion = "1.0.0" diff --git a/examples/src/main/scala/PekkoHttpExample.scala b/examples/src/main/scala/PekkoHttpExample.scala index dc00b928e..18e6a6d30 100644 --- a/examples/src/main/scala/PekkoHttpExample.scala +++ b/examples/src/main/scala/PekkoHttpExample.scala @@ -64,8 +64,8 @@ import scala.concurrent.duration._ * "org.apache.pekko" %% "pekko-stream" % "1.0.1", * "org.apache.pekko" %% "pekko-http" % "1.0.0", * "io.opentelemetry.instrumentation" % "opentelemetry-instrumentation-annotations" % "1.31.0", - * "io.opentelemetry" % "opentelemetry-exporter-otlp" % "1.31.0" % Runtime, - * "io.opentelemetry" % "opentelemetry-sdk-extension-autoconfigure" % "1.31.0" % Runtime + * "io.opentelemetry" % "opentelemetry-exporter-otlp" % "1.32.0" % Runtime, + * "io.opentelemetry" % "opentelemetry-sdk-extension-autoconfigure" % "1.32.0" % Runtime * ) * run / fork := true, * javaOptions += "-Dotel.java.global-autoconfigure.enabled=true", From 32c6aaf9139eb7d8c7448c1147af8afda7f41175 Mon Sep 17 00:00:00 2001 From: Maksym Ochenashko Date: Tue, 14 Nov 2023 13:29:42 +0200 Subject: [PATCH 2/2] Use different version for `io.opentelemetry.instrumentation` packages --- build.sbt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index a1d1e6ceb..d325c881e 100644 --- a/build.sbt +++ b/build.sbt @@ -36,6 +36,7 @@ val MUnitVersion = "1.0.0-M10" val MUnitCatsEffectVersion = "2.0.0-M4" val MUnitDisciplineVersion = "2.0.0-M3" val OpenTelemetryVersion = "1.32.0" +val OpenTelemetryInstrumentationVersion = "1.31.0" val OpenTelemetrySemConvVersion = "1.21.0-alpha" val PekkoStreamVersion = "1.0.1" val PekkoHttpVersion = "1.0.0" @@ -362,9 +363,9 @@ lazy val examples = project "io.opentelemetry" % "opentelemetry-sdk" % OpenTelemetryVersion, "io.opentelemetry" % "opentelemetry-sdk-extension-autoconfigure" % OpenTelemetryVersion, "io.opentelemetry" % "opentelemetry-extension-trace-propagators" % OpenTelemetryVersion % Runtime, - "io.opentelemetry.instrumentation" % "opentelemetry-instrumentation-annotations" % OpenTelemetryVersion + "io.opentelemetry.instrumentation" % "opentelemetry-instrumentation-annotations" % OpenTelemetryInstrumentationVersion ), - javaAgents += "io.opentelemetry.javaagent" % "opentelemetry-javaagent" % OpenTelemetryVersion % Runtime, + javaAgents += "io.opentelemetry.javaagent" % "opentelemetry-javaagent" % OpenTelemetryInstrumentationVersion % Runtime, run / fork := true, javaOptions += "-Dotel.java.global-autoconfigure.enabled=true", envVars ++= Map( @@ -382,7 +383,7 @@ lazy val docs = project libraryDependencies ++= Seq( "org.apache.pekko" %% "pekko-http" % PekkoHttpVersion, "io.opentelemetry" % "opentelemetry-sdk-extension-autoconfigure" % OpenTelemetryVersion, - "io.opentelemetry.instrumentation" % "opentelemetry-instrumentation-annotations" % OpenTelemetryVersion + "io.opentelemetry.instrumentation" % "opentelemetry-instrumentation-annotations" % OpenTelemetryInstrumentationVersion ), mdocVariables ++= Map( "OPEN_TELEMETRY_VERSION" -> OpenTelemetryVersion