Skip to content

Commit 99cbd23

Browse files
authored
Merge branch 'main' into pinning
2 parents 161b5e7 + 4077a5e commit 99cbd23

File tree

44 files changed

+404
-561
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+404
-561
lines changed

.github/workflows/documentation-synchronization-audit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
1919
with:
2020
distribution: temurin
21-
java-version: 17
21+
java-version-file: .java-version
2222

2323
- name: Set up gradle
2424
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0

.github/workflows/release.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,14 @@ jobs:
252252
sleep 60
253253
done
254254
255+
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
256+
with:
257+
distribution: temurin
258+
java-version-file: .java-version
259+
260+
- name: Setup Gradle
261+
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
262+
255263
- name: Update apidiff baseline
256264
env:
257265
VERSION: ${{ needs.release.outputs.version }}

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Unreleased
44

5-
## Version 2.22.0 (2025-11-19)
5+
## Version 2.22.0 (2025-11-20)
66

77
### ⚠️ Breaking Changes
88

build.gradle.kts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,24 +76,25 @@ if (gradle.startParameter.taskNames.contains("listTestsInPartition")) {
7676
throw GradleException("Invalid test partition")
7777
}
7878

79-
val partitionTasks = ArrayList<Test>()
79+
val partitionTasks = ArrayList<String>()
8080
var testPartitionCounter = 0
8181
subprojects {
8282
// relying on predictable ordering of subprojects
8383
// (see https://docs.gradle.org/current/dsl/org.gradle.api.Project.html#N14CB4)
8484
// since we are splitting these tasks across different github action jobs
8585
val enabled = testPartitionCounter++ % 4 == testPartition
8686
if (enabled) {
87+
val projectPath = this.path
8788
tasks.withType<Test>().configureEach {
88-
partitionTasks.add(this)
89+
val taskPath = projectPath + ":" + this.name
90+
partitionTasks.add(taskPath)
8991
}
9092
}
9193
}
9294

9395
doLast {
9496
File("test-tasks.txt").printWriter().use { writer ->
95-
partitionTasks.forEach { task ->
96-
var taskPath = task.project.path + ":" + task.name
97+
partitionTasks.forEach { taskPath ->
9798
// smoke tests are run separately
9899
// :instrumentation:test runs all instrumentation tests
99100
if (taskPath != ":smoke-tests:test" && taskPath != ":instrumentation:test") {
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Comparing source compatibility of opentelemetry-instrumentation-annotations-2.22.0.jar against opentelemetry-instrumentation-annotations-2.21.0.jar
2+
No changes.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Comparing source compatibility of opentelemetry-instrumentation-api-2.22.0.jar against opentelemetry-instrumentation-api-2.21.0.jar
2+
No changes.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.22.0.jar against opentelemetry-spring-boot-autoconfigure-2.21.0.jar
2+
=== UNCHANGED CLASS: PUBLIC io.opentelemetry.instrumentation.spring.autoconfigure.OpenTelemetryAutoConfiguration (not serializable)
3+
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
4+
--- REMOVED ANNOTATION: org.springframework.boot.context.properties.EnableConfigurationProperties
5+
--- REMOVED ELEMENT: value=io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.OtlpExporterProperties,io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.OtelResourceProperties,io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.OtelSpringProperties (-)
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Comparing source compatibility of opentelemetry-spring-boot-starter-2.22.0.jar against opentelemetry-spring-boot-starter-2.21.0.jar
2+
No changes.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Comparing source compatibility of opentelemetry-instrumentation-annotations-2.23.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.21.0.jar
1+
Comparing source compatibility of opentelemetry-instrumentation-annotations-2.23.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.22.0.jar
22
No changes.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Comparing source compatibility of opentelemetry-instrumentation-api-2.23.0-SNAPSHOT.jar against opentelemetry-instrumentation-api-2.21.0.jar
1+
Comparing source compatibility of opentelemetry-instrumentation-api-2.23.0-SNAPSHOT.jar against opentelemetry-instrumentation-api-2.22.0.jar
22
No changes.

0 commit comments

Comments
 (0)