Skip to content

Commit 0eb3bee

Browse files
authored
Update OTel SDK to 1.57.0, OTel Agent to 2.23.0 (#16)
* Update OTel SDK to 1.57.0, OTel Agent to 2.23.0 * Fix build, update dependencies * Update release script: attach agent jar
1 parent 85d0247 commit 0eb3bee

File tree

4 files changed

+18
-13
lines changed

4 files changed

+18
-13
lines changed

.github/workflows/release.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,8 @@ jobs:
3535
SONATYPE_USER: ${{ secrets.SONATYPE_USER }}
3636
SONATYPE_KEY: ${{ secrets.SONATYPE_KEY }}
3737
run: ./gradlew assemble publishToSonatype closeAndReleaseSonatypeStagingRepository
38+
39+
- name: Attach agent jar
40+
uses: softprops/action-gh-release@v2
41+
with:
42+
files: agent/build/libs/agent-${{ github.ref_name }}.jar

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ See https://github.com/iRevive/otel4s-showcase demo.
1616

1717
## Versions
1818

19-
- OpenTelemetry SDK: 1.56.0
20-
- OpenTelemetry Java Agent: 2.22.0
19+
- OpenTelemetry SDK: 1.57.0
20+
- OpenTelemetry Java Agent: 2.23.0
2121

2222
## Getting started
2323

@@ -28,14 +28,14 @@ lazy val service = project
2828
.in(file("service"))
2929
.settings(
3030
name := "service",
31-
javaAgents += "io.github.irevive" % "otel4s-opentelemetry-javaagent" % "2.22.0", // <1>
31+
javaAgents += "io.github.irevive" % "otel4s-opentelemetry-javaagent" % "2.23.0", // <1>
3232
run / fork := true, // <2>
3333
javaOptions += "-Dcats.effect.trackFiberContext=true", // <3>
3434
libraryDependencies ++= Seq( // <4>
3535
"org.typelevel" %% "otel4s-oteljava" % "0.14.0",
3636
"org.typelevel" %% "otel4s-oteljava-context-storage" % "0.14.0",
37-
"io.opentelemetry" % "opentelemetry-exporter-otlp" % "1.56.0" % Runtime,
38-
"io.opentelemetry" % "opentelemetry-sdk-extension-autoconfigure" % "1.56.0" % Runtime
37+
"io.opentelemetry" % "opentelemetry-exporter-otlp" % "1.57.0" % Runtime,
38+
"io.opentelemetry" % "opentelemetry-sdk-extension-autoconfigure" % "1.57.0" % Runtime
3939
)
4040
)
4141
```

build.gradle

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ buildscript {
99
}
1010
}
1111
dependencies {
12-
classpath "com.diffplug.spotless:spotless-plugin-gradle:7.2.1"
13-
classpath "com.gradleup.shadow:shadow-gradle-plugin:9.1.0"
12+
classpath "com.diffplug.spotless:spotless-plugin-gradle:8.1.0"
13+
classpath "com.gradleup.shadow:shadow-gradle-plugin:9.3.0"
1414
classpath "io.opentelemetry.instrumentation:gradle-plugins:2.22.0-alpha"
1515
classpath("org.apache.httpcomponents:httpclient:4.5.14")
1616
}
@@ -23,7 +23,7 @@ plugins {
2323
group "io.github.irevive"
2424

2525
// this line is managed by ./scripts/update-release-version.sh
26-
version "2.22.0"
26+
version "2.23.0"
2727

2828
nexusPublishing {
2929
packageGroup.set(rootProject.group.toString())
@@ -49,11 +49,11 @@ subprojects {
4949
ext {
5050
versions = [
5151
// this line is managed by ./scripts/update-sdk-version.sh
52-
opentelemetrySdk : "1.56.0",
52+
opentelemetrySdk : "1.57.0",
5353

5454
// these lines are managed by ./scripts/update-agent-version.sh
55-
opentelemetryJavaagent : "2.22.0",
56-
opentelemetryJavaagentAlpha: "2.22.0-alpha",
55+
opentelemetryJavaagent : "2.23.0",
56+
opentelemetryJavaagentAlpha: "2.23.0-alpha",
5757

5858
autoservice : "1.1.1"
5959
]
@@ -81,7 +81,7 @@ subprojects {
8181
implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:${versions.opentelemetryJavaagent}"))
8282
implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${versions.opentelemetryJavaagentAlpha}"))
8383

84-
testImplementation("org.mockito:mockito-core:5.18.0")
84+
testImplementation("org.mockito:mockito-core:5.21.0")
8585

8686
testImplementation(enforcedPlatform("org.junit:junit-bom:5.13.4"))
8787
testImplementation("org.junit.jupiter:junit-jupiter-api")

gradle/instrumentation.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ shadowJar {
3737
configurations = [project.configurations.runtimeClasspath, project.configurations.testInstrumentation]
3838
mergeServiceFiles()
3939
// mergeServiceFiles requires that duplicate strategy is set to include
40-
filesMatching("inst/META-INF/services/**") {
40+
filesMatching("META-INF/services/**") {
4141
duplicatesStrategy = DuplicatesStrategy.INCLUDE
4242
}
4343

0 commit comments

Comments
 (0)