Skip to content

Commit 67cb5f1

Browse files
authored
Update apidiff baseline to released version 2.9.0 (#12462)
1 parent 1176300 commit 67cb5f1

10 files changed

+21
-12
lines changed

.github/workflows/build-common.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ jobs:
9494
else
9595
echo "Licenses are not up-to-date, please run './gradlew generateLicenseReport --no-build-cache' locally and commit."
9696
echo
97-
echo "$(git diff --cached --stat licenses)"
97+
git diff --cached --stat licenses
9898
echo
99-
echo "$(git diff --cached licenses)"
99+
git diff --cached licenses
100100
exit 1
101101
fi
102102
@@ -165,8 +165,8 @@ jobs:
165165
echo "No diff detected."
166166
else
167167
echo "Diff detected - did you run './gradlew jApiCmp'?"
168-
echo $(git diff --cached --name-only)
169-
echo $(git diff --cached)
168+
git diff --cached --name-only
169+
git diff --cached
170170
exit 1
171171
fi
172172

conventions/src/main/kotlin/otel.japicmp-conventions.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ plugins {
1616
val latestReleasedVersion: String by lazy {
1717
// hack to find the current released version of the project
1818
val temp: Configuration = configurations.create("tempConfig")
19+
temp.resolutionStrategy.cacheDynamicVersionsFor(0, TimeUnit.SECONDS)
1920
// pick the bom, since we don't use dependency substitution on it.
2021
dependencies.add(temp.name, "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:latest.release")
2122
val moduleVersion = configurations["tempConfig"].resolvedConfiguration.firstLevelModuleDependencies.elementAt(0).moduleVersion
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Comparing source compatibility of opentelemetry-instrumentation-annotations-2.9.0.jar against opentelemetry-instrumentation-annotations-2.8.0.jar
2+
No changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Comparing source compatibility of opentelemetry-instrumentation-api-2.9.0.jar against opentelemetry-instrumentation-api-2.8.0.jar
2+
No changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.9.0.jar against opentelemetry-spring-boot-autoconfigure-2.8.0.jar
2+
=== UNCHANGED CLASS: PUBLIC io.opentelemetry.instrumentation.spring.autoconfigure.OpenTelemetryAutoConfiguration (not serializable)
3+
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
4+
*** MODIFIED ANNOTATION: org.springframework.boot.context.properties.EnableConfigurationProperties
5+
*** MODIFIED 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 (<- io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.OtlpExporterProperties,io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.OtelResourceProperties,io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.PropagationProperties)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Comparing source compatibility of opentelemetry-spring-boot-starter-2.9.0.jar against opentelemetry-spring-boot-starter-2.8.0.jar
2+
No changes.
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Comparing source compatibility of opentelemetry-instrumentation-annotations-2.10.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.8.0.jar
1+
Comparing source compatibility of opentelemetry-instrumentation-annotations-2.10.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.9.0.jar
22
No changes.
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Comparing source compatibility of opentelemetry-instrumentation-api-2.10.0-SNAPSHOT.jar against opentelemetry-instrumentation-api-2.8.0.jar
1+
Comparing source compatibility of opentelemetry-instrumentation-api-2.10.0-SNAPSHOT.jar against opentelemetry-instrumentation-api-2.9.0.jar
22
No changes.
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
1-
Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.10.0-SNAPSHOT.jar against opentelemetry-spring-boot-autoconfigure-2.8.0.jar
2-
=== UNCHANGED CLASS: PUBLIC io.opentelemetry.instrumentation.spring.autoconfigure.OpenTelemetryAutoConfiguration (not serializable)
3-
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
4-
*** MODIFIED ANNOTATION: org.springframework.boot.context.properties.EnableConfigurationProperties
5-
*** MODIFIED 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 (<- io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.OtlpExporterProperties,io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.OtelResourceProperties,io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.PropagationProperties)
1+
Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.10.0-SNAPSHOT.jar against opentelemetry-spring-boot-autoconfigure-2.9.0.jar
2+
No changes.
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Comparing source compatibility of opentelemetry-spring-boot-starter-2.10.0-SNAPSHOT.jar against opentelemetry-spring-boot-starter-2.8.0.jar
1+
Comparing source compatibility of opentelemetry-spring-boot-starter-2.10.0-SNAPSHOT.jar against opentelemetry-spring-boot-starter-2.9.0.jar
22
No changes.

0 commit comments

Comments
 (0)