Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update opentelemetry-api, ... to 1.28.0 #272

Merged
merged 3 commits into from
Jul 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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",
Expand All @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions docs/examples/histogram-custom-buckets.md
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
```

Expand Down Expand Up @@ -183,7 +183,7 @@ object HistogramBucketsExample extends IOApp.Simple {
.build()
)
}
.setResultAsGlobal(true)
.setResultAsGlobal
.build()
.getOpenTelemetrySdk
}
Expand Down
4 changes: 2 additions & 2 deletions docs/examples/honeycomb.md
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions docs/examples/jaeger-docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion examples/src/main/scala/HistogramBucketsExample.scala
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ object HistogramBucketsExample extends IOApp.Simple {
.build()
)
}
.setResultAsGlobal(true)
.setResultAsGlobal
.build()
.getOpenTelemetrySdk
}
Expand Down