From 3d25c9504e3e260dc9c3fe082a1cc70a0bedac31 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Fri, 7 Jul 2023 16:08:12 +0000 Subject: [PATCH 1/3] Update opentelemetry-api, ... to 1.28.0 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index b481d489b..a77ba21ee 100644 --- a/build.sbt +++ b/build.sbt @@ -33,7 +33,7 @@ val FS2Version = "3.7.0" val MUnitVersion = "1.0.0-M8" val MUnitCatsEffectVersion = "2.0.0-M3" val MUnitDisciplineVersion = "2.0.0-M3" -val OpenTelemetryVersion = "1.27.0" +val OpenTelemetryVersion = "1.28.0" val PlatformVersion = "1.0.2" val ScodecVersion = "1.1.37" val VaultVersion = "3.5.0" From 6754e755aeb95a3316dd3827feb15d6bef53937a Mon Sep 17 00:00:00 2001 From: Maksym Ochenashko Date: Fri, 7 Jul 2023 20:10:42 +0300 Subject: [PATCH 2/3] Use stable release of the `sdk-extension-autoconfigure` dependency --- build.sbt | 6 +++--- docs/examples/histogram-custom-buckets.md | 4 ++-- docs/examples/honeycomb.md | 4 ++-- docs/examples/jaeger-docker.md | 4 ++-- examples/src/main/scala/HistogramBucketsExample.scala | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build.sbt b/build.sbt index a77ba21ee..fee4684bf 100644 --- a/build.sbt +++ b/build.sbt @@ -260,8 +260,8 @@ lazy val examples = project libraryDependencies ++= Seq( "io.opentelemetry" % "opentelemetry-exporter-otlp" % OpenTelemetryVersion, "io.opentelemetry" % "opentelemetry-sdk" % OpenTelemetryVersion, - "io.opentelemetry" % "opentelemetry-sdk-extension-autoconfigure" % s"${OpenTelemetryVersion}-alpha", - "io.opentelemetry" % "opentelemetry-extension-trace-propagators" % s"${OpenTelemetryVersion}" % Runtime + "io.opentelemetry" % "opentelemetry-sdk-extension-autoconfigure" % OpenTelemetryVersion, + "io.opentelemetry" % "opentelemetry-extension-trace-propagators" % OpenTelemetryVersion % Runtime ), run / fork := true, javaOptions += "-Dotel.java.global-autoconfigure.enabled=true", @@ -277,7 +277,7 @@ lazy val docs = project .dependsOn(java) .settings( libraryDependencies ++= Seq( - "io.opentelemetry" % "opentelemetry-sdk-extension-autoconfigure" % s"${OpenTelemetryVersion}-alpha" + "io.opentelemetry" % "opentelemetry-sdk-extension-autoconfigure" % OpenTelemetryVersion ), mdocVariables := Map( "VERSION" -> version.value, diff --git a/docs/examples/histogram-custom-buckets.md b/docs/examples/histogram-custom-buckets.md index ec2eb428f..1db16f986 100644 --- a/docs/examples/histogram-custom-buckets.md +++ b/docs/examples/histogram-custom-buckets.md @@ -25,7 +25,7 @@ Add settings to the `build.sbt`: libraryDependencies ++= Seq( "org.typelevel" %% "otel4s-java" % "@VERSION@", // <1> "io.opentelemetry" % "opentelemetry-exporter-otlp" % "@OPEN_TELEMETRY_VERSION@" % Runtime, // <2> - "io.opentelemetry" % "opentelemetry-sdk-extension-autoconfigure" % "@OPEN_TELEMETRY_VERSION@-alpha" % Runtime // <3> + "io.opentelemetry" % "opentelemetry-sdk-extension-autoconfigure" % "@OPEN_TELEMETRY_VERSION@" % Runtime // <3> ) run / fork := true javaOptions += "-Dotel.service.name=histogram-buckets-example" // <4> @@ -38,7 +38,7 @@ Add directives to the `histogram-buckets.scala`: ```scala //> using lib "org.typelevel::otel4s-java:@VERSION@" // <1> //> using lib "io.opentelemetry:opentelemetry-exporter-otlp:@OPEN_TELEMETRY_VERSION@" // <2> -//> using lib "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:@OPEN_TELEMETRY_VERSION@-alpha" // <3> +//> using lib "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:@OPEN_TELEMETRY_VERSION@" // <3> //> using `java-opt` "-Dotel.service.name=histogram-buckets-example" // <4> ``` diff --git a/docs/examples/honeycomb.md b/docs/examples/honeycomb.md index 08cd6cc7e..1850e202c 100644 --- a/docs/examples/honeycomb.md +++ b/docs/examples/honeycomb.md @@ -24,7 +24,7 @@ Add settings to the `build.sbt`: libraryDependencies ++= Seq( "org.typelevel" %% "otel4s-java" % "@VERSION@", // <1> "io.opentelemetry" % "opentelemetry-exporter-otlp" % "@OPEN_TELEMETRY_VERSION@" % Runtime, // <2> - "io.opentelemetry" % "opentelemetry-sdk-extension-autoconfigure" % "@OPEN_TELEMETRY_VERSION@-alpha" % Runtime // <3> + "io.opentelemetry" % "opentelemetry-sdk-extension-autoconfigure" % "@OPEN_TELEMETRY_VERSION@" % Runtime // <3> ) run / fork := true javaOptions += "-Dotel.java.global-autoconfigure.enabled=true" // <4> @@ -38,7 +38,7 @@ Add directives to the `tracing.scala`: ```scala //> using lib "org.typelevel::otel4s-java:@VERSION@" // <1> //> using lib "io.opentelemetry:opentelemetry-exporter-otlp:@OPEN_TELEMETRY_VERSION@" // <2> -//> using lib "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:@OPEN_TELEMETRY_VERSION@-alpha" // <3> +//> using lib "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:@OPEN_TELEMETRY_VERSION@" // <3> //> using `java-opt` "-Dotel.java.global-autoconfigure.enabled=true" // <4> //> using `java-opt` "-Dotel.service.name=honeycomb-example" // <5> //> using `java-opt` "-Dotel.exporter.otlp.endpoint=https://api.honeycomb.io/" // <6> diff --git a/docs/examples/jaeger-docker.md b/docs/examples/jaeger-docker.md index 679035bce..1ac87f077 100644 --- a/docs/examples/jaeger-docker.md +++ b/docs/examples/jaeger-docker.md @@ -18,7 +18,7 @@ Add settings to the `build.sbt`: libraryDependencies ++= Seq( "org.typelevel" %% "otel4s-java" % "@VERSION@", // <1> "io.opentelemetry" % "opentelemetry-exporter-otlp" % "@OPEN_TELEMETRY_VERSION@" % Runtime, // <2> - "io.opentelemetry" % "opentelemetry-sdk-extension-autoconfigure" % "@OPEN_TELEMETRY_VERSION@-alpha" % Runtime // <3> + "io.opentelemetry" % "opentelemetry-sdk-extension-autoconfigure" % "@OPEN_TELEMETRY_VERSION@" % Runtime // <3> ) run / fork := true javaOptions += "-Dotel.java.global-autoconfigure.enabled=true" // <4> @@ -32,7 +32,7 @@ Add directives to the `tracing.scala`: ```scala //> using lib "org.typelevel::otel4s-java:@VERSION@" // <1> //> using lib "io.opentelemetry:opentelemetry-exporter-otlp:@OPEN_TELEMETRY_VERSION@" // <2> -//> using lib "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:@OPEN_TELEMETRY_VERSION@-alpha" // <3> +//> using lib "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:@OPEN_TELEMETRY_VERSION@" // <3> //> using `java-opt` "-Dotel.java.global-autoconfigure.enabled=true" // <4> //> using `java-opt` "-Dotel.service.name=jaeger-example" // <5> //> using `java-opt` "-Dotel.metrics.exporter=none" // <6> diff --git a/examples/src/main/scala/HistogramBucketsExample.scala b/examples/src/main/scala/HistogramBucketsExample.scala index cb33ba70f..d1838328f 100644 --- a/examples/src/main/scala/HistogramBucketsExample.scala +++ b/examples/src/main/scala/HistogramBucketsExample.scala @@ -89,7 +89,7 @@ object HistogramBucketsExample extends IOApp.Simple { .build() ) } - .setResultAsGlobal(true) + .setResultAsGlobal .build() .getOpenTelemetrySdk } From 861a4d6da6f18d149f7da968adff563c5bf4bf5f Mon Sep 17 00:00:00 2001 From: Maksym Ochenashko Date: Fri, 7 Jul 2023 22:25:44 +0300 Subject: [PATCH 3/3] Fix site --- docs/examples/histogram-custom-buckets.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/examples/histogram-custom-buckets.md b/docs/examples/histogram-custom-buckets.md index 1db16f986..fab84723e 100644 --- a/docs/examples/histogram-custom-buckets.md +++ b/docs/examples/histogram-custom-buckets.md @@ -183,7 +183,7 @@ object HistogramBucketsExample extends IOApp.Simple { .build() ) } - .setResultAsGlobal(true) + .setResultAsGlobal .build() .getOpenTelemetrySdk }