diff --git a/.github/workflows/build-common.yml b/.github/workflows/build-common.yml index 410ee82db6ff..d3861f646c76 100644 --- a/.github/workflows/build-common.yml +++ b/.github/workflows/build-common.yml @@ -94,9 +94,9 @@ jobs: else echo "Licenses are not up-to-date, please run './gradlew generateLicenseReport --no-build-cache' locally and commit." echo - echo "$(git diff --cached --stat licenses)" + git diff --cached --stat licenses echo - echo "$(git diff --cached licenses)" + git diff --cached licenses exit 1 fi @@ -165,8 +165,8 @@ jobs: echo "No diff detected." else echo "Diff detected - did you run './gradlew jApiCmp'?" - echo $(git diff --cached --name-only) - echo $(git diff --cached) + git diff --cached --name-only + git diff --cached exit 1 fi diff --git a/conventions/src/main/kotlin/otel.japicmp-conventions.gradle.kts b/conventions/src/main/kotlin/otel.japicmp-conventions.gradle.kts index e3fd6ed5d559..2deb9af3415b 100644 --- a/conventions/src/main/kotlin/otel.japicmp-conventions.gradle.kts +++ b/conventions/src/main/kotlin/otel.japicmp-conventions.gradle.kts @@ -16,6 +16,7 @@ plugins { val latestReleasedVersion: String by lazy { // hack to find the current released version of the project val temp: Configuration = configurations.create("tempConfig") + temp.resolutionStrategy.cacheDynamicVersionsFor(0, TimeUnit.SECONDS) // pick the bom, since we don't use dependency substitution on it. dependencies.add(temp.name, "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:latest.release") val moduleVersion = configurations["tempConfig"].resolvedConfiguration.firstLevelModuleDependencies.elementAt(0).moduleVersion diff --git a/docs/apidiffs/2.9.0_vs_2.8.0/opentelemetry-instrumentation-annotations.txt b/docs/apidiffs/2.9.0_vs_2.8.0/opentelemetry-instrumentation-annotations.txt new file mode 100644 index 000000000000..6aa2ff304556 --- /dev/null +++ b/docs/apidiffs/2.9.0_vs_2.8.0/opentelemetry-instrumentation-annotations.txt @@ -0,0 +1,2 @@ +Comparing source compatibility of opentelemetry-instrumentation-annotations-2.9.0.jar against opentelemetry-instrumentation-annotations-2.8.0.jar +No changes. \ No newline at end of file diff --git a/docs/apidiffs/2.9.0_vs_2.8.0/opentelemetry-instrumentation-api.txt b/docs/apidiffs/2.9.0_vs_2.8.0/opentelemetry-instrumentation-api.txt new file mode 100644 index 000000000000..7438346db72e --- /dev/null +++ b/docs/apidiffs/2.9.0_vs_2.8.0/opentelemetry-instrumentation-api.txt @@ -0,0 +1,2 @@ +Comparing source compatibility of opentelemetry-instrumentation-api-2.9.0.jar against opentelemetry-instrumentation-api-2.8.0.jar +No changes. \ No newline at end of file diff --git a/docs/apidiffs/2.9.0_vs_2.8.0/opentelemetry-spring-boot-autoconfigure.txt b/docs/apidiffs/2.9.0_vs_2.8.0/opentelemetry-spring-boot-autoconfigure.txt new file mode 100644 index 000000000000..a975a83fcbaf --- /dev/null +++ b/docs/apidiffs/2.9.0_vs_2.8.0/opentelemetry-spring-boot-autoconfigure.txt @@ -0,0 +1,5 @@ +Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.9.0.jar against opentelemetry-spring-boot-autoconfigure-2.8.0.jar +=== UNCHANGED CLASS: PUBLIC io.opentelemetry.instrumentation.spring.autoconfigure.OpenTelemetryAutoConfiguration (not serializable) + === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 + *** MODIFIED ANNOTATION: org.springframework.boot.context.properties.EnableConfigurationProperties + *** 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) diff --git a/docs/apidiffs/2.9.0_vs_2.8.0/opentelemetry-spring-boot-starter.txt b/docs/apidiffs/2.9.0_vs_2.8.0/opentelemetry-spring-boot-starter.txt new file mode 100644 index 000000000000..d78eeeb38d9b --- /dev/null +++ b/docs/apidiffs/2.9.0_vs_2.8.0/opentelemetry-spring-boot-starter.txt @@ -0,0 +1,2 @@ +Comparing source compatibility of opentelemetry-spring-boot-starter-2.9.0.jar against opentelemetry-spring-boot-starter-2.8.0.jar +No changes. \ No newline at end of file diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-annotations.txt b/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-annotations.txt index 3b2c3eb700fa..84c7ec708367 100644 --- a/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-annotations.txt +++ b/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-annotations.txt @@ -1,2 +1,2 @@ -Comparing source compatibility of opentelemetry-instrumentation-annotations-2.10.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.8.0.jar +Comparing source compatibility of opentelemetry-instrumentation-annotations-2.10.0-SNAPSHOT.jar against opentelemetry-instrumentation-annotations-2.9.0.jar No changes. \ No newline at end of file diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api.txt b/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api.txt index 400b7aa201e1..a7162c2594c7 100644 --- a/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api.txt +++ b/docs/apidiffs/current_vs_latest/opentelemetry-instrumentation-api.txt @@ -1,2 +1,2 @@ -Comparing source compatibility of opentelemetry-instrumentation-api-2.10.0-SNAPSHOT.jar against opentelemetry-instrumentation-api-2.8.0.jar +Comparing source compatibility of opentelemetry-instrumentation-api-2.10.0-SNAPSHOT.jar against opentelemetry-instrumentation-api-2.9.0.jar No changes. \ No newline at end of file diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-autoconfigure.txt b/docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-autoconfigure.txt index eb478ebb46e0..cbd60e06475f 100644 --- a/docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-autoconfigure.txt +++ b/docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-autoconfigure.txt @@ -1,5 +1,2 @@ -Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.10.0-SNAPSHOT.jar against opentelemetry-spring-boot-autoconfigure-2.8.0.jar -=== UNCHANGED CLASS: PUBLIC io.opentelemetry.instrumentation.spring.autoconfigure.OpenTelemetryAutoConfiguration (not serializable) - === CLASS FILE FORMAT VERSION: 52.0 <- 52.0 - *** MODIFIED ANNOTATION: org.springframework.boot.context.properties.EnableConfigurationProperties - *** 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) +Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.10.0-SNAPSHOT.jar against opentelemetry-spring-boot-autoconfigure-2.9.0.jar +No changes. \ No newline at end of file diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-starter.txt b/docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-starter.txt index b0632940232d..14eda4096401 100644 --- a/docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-starter.txt +++ b/docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-starter.txt @@ -1,2 +1,2 @@ -Comparing source compatibility of opentelemetry-spring-boot-starter-2.10.0-SNAPSHOT.jar against opentelemetry-spring-boot-starter-2.8.0.jar +Comparing source compatibility of opentelemetry-spring-boot-starter-2.10.0-SNAPSHOT.jar against opentelemetry-spring-boot-starter-2.9.0.jar No changes. \ No newline at end of file