Skip to content
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
24 changes: 12 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ See https://github.com/iRevive/otel4s-showcase demo.

## Versions

- OpenTelemetry SDK: 1.59.0
- OpenTelemetry Java Agent: 2.25.0
- OpenTelemetry SDK: 1.60.1
- OpenTelemetry Java Agent: 2.26.0

## Getting started

Expand All @@ -28,14 +28,14 @@ lazy val service = project
.in(file("service"))
.settings(
name := "service",
javaAgents += "io.github.irevive" % "otel4s-opentelemetry-javaagent" % "2.25.0", // <1>
javaAgents += "io.github.irevive" % "otel4s-opentelemetry-javaagent" % "2.26.0", // <1>
run / fork := true, // <2>
javaOptions += "-Dcats.effect.trackFiberContext=true", // <3>
libraryDependencies ++= Seq( // <4>
"org.typelevel" %% "otel4s-oteljava" % "0.14.0",
"org.typelevel" %% "otel4s-oteljava-context-storage" % "0.14.0",
"io.opentelemetry" % "opentelemetry-exporter-otlp" % "1.59.0" % Runtime,
"io.opentelemetry" % "opentelemetry-sdk-extension-autoconfigure" % "1.59.0" % Runtime
"org.typelevel" %% "otel4s-oteljava" % "0.15.2",
"org.typelevel" %% "otel4s-oteljava-context-storage" % "0.15.2",
"io.opentelemetry" % "opentelemetry-exporter-otlp" % "1.60.1" % Runtime,
"io.opentelemetry" % "opentelemetry-sdk-extension-autoconfigure" % "1.60.1" % Runtime
)
)
```
Expand Down Expand Up @@ -114,16 +114,16 @@ $ ./gradlew smoke-tests:build
## New version release

```shell
$ SDK_VERSION="1.59.0"
$ AGENT_VERSION="2.25.0"
$ RELEASE_VERSION="2.25.0"
$ SDK_VERSION="1.60.1"
$ AGENT_VERSION="2.26.0"
$ RELEASE_VERSION="2.26.0"
$ ./scripts/update-sdk-version.sh $SDK_VERSION
$ ./scripts/update-agent-version.sh $AGENT_VERSION
$ ./scripts/update-release-version.sh $RELEASE_VERSION
```

Once the CI is green, you can publish a tag:
```shell
$ git tag -a v2.25.0 -m "v2.25.0"
$ git push origin v2.25.0
$ git tag -a v2.26.0 -m "v2.26.0"
$ git push origin v2.26.0
```
10 changes: 5 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {
dependencies {
classpath "com.diffplug.spotless:spotless-plugin-gradle:8.1.0"
classpath "com.gradleup.shadow:shadow-gradle-plugin:9.3.0"
classpath "io.opentelemetry.instrumentation:gradle-plugins:2.25.0-alpha"
classpath "io.opentelemetry.instrumentation:gradle-plugins:2.26.0-alpha"
classpath("org.apache.httpcomponents:httpclient:4.5.14")
}
}
Expand All @@ -23,7 +23,7 @@ plugins {
group "io.github.irevive"

// this line is managed by ./scripts/update-release-version.sh
version "2.25.0"
version "2.26.0"

nexusPublishing {
packageGroup.set(rootProject.group.toString())
Expand All @@ -49,11 +49,11 @@ subprojects {
ext {
versions = [
// this line is managed by ./scripts/update-sdk-version.sh
opentelemetrySdk : "1.59.0",
opentelemetrySdk : "1.60.1",

// these lines are managed by ./scripts/update-agent-version.sh
opentelemetryJavaagent : "2.25.0",
opentelemetryJavaagentAlpha: "2.25.0-alpha",
opentelemetryJavaagent : "2.26.0",
opentelemetryJavaagentAlpha: "2.26.0-alpha",

autoservice : "1.1.1"
]
Expand Down
Loading