From 4d6c1777d92985303d5127cf35bbe8e4e72e679a Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Fri, 4 Jul 2025 12:02:28 +0200 Subject: [PATCH 01/14] add label to renovate prs Signed-off-by: Gregor Zeitlinger --- .github/renovate.json5 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index d8cb8e634..91930c0c5 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -1,6 +1,8 @@ { - $schema: "https://docs.renovatebot.com/renovate-schema.json", - extends: ["config:recommended"], + $schema: "https://docs.renovatebot.com/renovate-schema.json", extends: [ + "config:best-practices", + "config:recommended", + ], platformCommit: "enabled", automerge: true, ignorePaths: [ @@ -8,4 +10,7 @@ // agent resources packages an OTel API that is the minimum required API version "**/prometheus-metrics-exporter-opentelemetry-otel-agent-resources/pom.xml", ], + labels: [ + "dependencies" + ] } From acc22522d359400376daf49a5317ce9b0c33db69 Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Fri, 4 Jul 2025 12:21:09 +0200 Subject: [PATCH 02/14] fix release Signed-off-by: Gregor Zeitlinger --- .github/workflows/release.yml | 2 +- pom.xml | 1 + prometheus-metrics-exporter-opentelemetry-shaded/pom.xml | 2 ++ prometheus-metrics-exposition-formats-shaded/pom.xml | 2 ++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1407be02b..2851f7403 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -47,7 +47,7 @@ jobs: gpg-passphrase: MAVEN_GPG_PASSPHRASE - name: Publish to Apache Maven Central - run: mvn deploy -P 'release,!default' -Dmaven.test.skip=true + run: mvn deploy -P 'release,!default' -Dmaven.test.skip=true -Drelease=true env: MAVEN_USERNAME: ${{ secrets.SONATYPE_MAVEN_REPOSITORY_USERNAME }} MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_MAVEN_REPOSITORY_PASSWORD }} diff --git a/pom.xml b/pom.xml index 509cc12e4..1017c35a3 100644 --- a/pom.xml +++ b/pom.xml @@ -34,6 +34,7 @@ false false -Werror + false diff --git a/prometheus-metrics-exporter-opentelemetry-shaded/pom.xml b/prometheus-metrics-exporter-opentelemetry-shaded/pom.xml index 2b5c67da4..9c86b5aaf 100644 --- a/prometheus-metrics-exporter-opentelemetry-shaded/pom.xml +++ b/prometheus-metrics-exporter-opentelemetry-shaded/pom.xml @@ -138,6 +138,8 @@ copy-resources + + ${release} target/metrics-exporter-opentelemetry/src/test diff --git a/prometheus-metrics-exposition-formats-shaded/pom.xml b/prometheus-metrics-exposition-formats-shaded/pom.xml index 1d64a2ad8..8afa80180 100644 --- a/prometheus-metrics-exposition-formats-shaded/pom.xml +++ b/prometheus-metrics-exposition-formats-shaded/pom.xml @@ -70,6 +70,8 @@ copy-resources + + ${release} target/metrics-exposition-formats/src/test From 2e1f6b4a2f9098a2f3e770867a86c1ff31843d9d Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Fri, 4 Jul 2025 12:22:06 +0200 Subject: [PATCH 03/14] fix release Signed-off-by: Gregor Zeitlinger --- scripts/build-release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build-release.sh b/scripts/build-release.sh index 94348d8ee..7c61bcde4 100755 --- a/scripts/build-release.sh +++ b/scripts/build-release.sh @@ -5,4 +5,4 @@ set -euo pipefail VERSION=${TAG#v} ./scripts/set-version.sh "$VERSION" -mvn -B package -P 'release,!default' -Dmaven.test.skip=true +mvn -B package -P 'release,!default' -Dmaven.test.skip=true -Drelease=true From d424e6aeb9f35b65e05d08757ada0f5b875e240c Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Fri, 4 Jul 2025 12:26:39 +0200 Subject: [PATCH 04/14] fix release Signed-off-by: Gregor Zeitlinger --- .github/workflows/test-release-build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-release-build.yml b/.github/workflows/test-release-build.yml index 78ee73332..abd182304 100644 --- a/.github/workflows/test-release-build.yml +++ b/.github/workflows/test-release-build.yml @@ -25,4 +25,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Run the Maven verify phase - run: mise run build-release + run: ./scripts/build-release.sh + env: + # don't ues the current snapshot version, to test a more realistic release + TAG: ${{ github.ref_name }} From f5cccb546ee2ea5ca1b1b11af30857c3a9c8843e Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Fri, 4 Jul 2025 12:42:48 +0200 Subject: [PATCH 05/14] fix release Signed-off-by: Gregor Zeitlinger --- .github/renovate.json5 | 10 +-- .../pom.xml | 84 +++++++++++-------- .../pom.xml | 35 ++++++-- scripts/build-release.sh | 2 +- 4 files changed, 80 insertions(+), 51 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 91930c0c5..3b6beecd9 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -1,8 +1,6 @@ { - $schema: "https://docs.renovatebot.com/renovate-schema.json", extends: [ - "config:best-practices", - "config:recommended", - ], + $schema: "https://docs.renovatebot.com/renovate-schema.json", + extends: ["config:best-practices", "config:recommended"], platformCommit: "enabled", automerge: true, ignorePaths: [ @@ -10,7 +8,5 @@ // agent resources packages an OTel API that is the minimum required API version "**/prometheus-metrics-exporter-opentelemetry-otel-agent-resources/pom.xml", ], - labels: [ - "dependencies" - ] + labels: ["dependencies"], } diff --git a/prometheus-metrics-exporter-opentelemetry-shaded/pom.xml b/prometheus-metrics-exporter-opentelemetry-shaded/pom.xml index 9c86b5aaf..6cd36f0d2 100644 --- a/prometheus-metrics-exporter-opentelemetry-shaded/pom.xml +++ b/prometheus-metrics-exporter-opentelemetry-shaded/pom.xml @@ -68,39 +68,57 @@ io.opentelemetry.instrumentation opentelemetry-resources - - - - org.wiremock - wiremock - 3.13.1 - test - - - org.hamcrest - hamcrest-core - - - - - org.awaitility - awaitility - 4.3.0 - test - - - io.opentelemetry - opentelemetry-proto - 1.7.1-alpha - test - - - io.opentelemetry - opentelemetry-sdk-testing - test - + + + + javadoc + + + release + + + default + + true + + + + + org.wiremock + wiremock + 3.13.1 + test + + + org.hamcrest + hamcrest-core + + + + + org.awaitility + awaitility + 4.3.0 + test + + + io.opentelemetry + opentelemetry-proto + + 1.7.1-alpha + test + + + io.opentelemetry + opentelemetry-sdk-testing + test + + + + + @@ -127,7 +145,7 @@ ../prometheus-metrics-exporter-opentelemetry/src/main - + @@ -138,8 +156,6 @@ copy-resources - - ${release} target/metrics-exporter-opentelemetry/src/test diff --git a/prometheus-metrics-exposition-formats-shaded/pom.xml b/prometheus-metrics-exposition-formats-shaded/pom.xml index 8afa80180..178dbebe4 100644 --- a/prometheus-metrics-exposition-formats-shaded/pom.xml +++ b/prometheus-metrics-exposition-formats-shaded/pom.xml @@ -33,15 +33,34 @@ protobuf-java ${protobuf-java.version} - - io.prometheus - prometheus-metrics-exposition-textformats - ${project.version} - test - test-jar - + + + + javadoc + + + release + + + default + + true + + + + + io.prometheus + prometheus-metrics-exposition-textformats + ${project.version} + test + test-jar + + + + + @@ -70,8 +89,6 @@ copy-resources - - ${release} target/metrics-exposition-formats/src/test diff --git a/scripts/build-release.sh b/scripts/build-release.sh index 7c61bcde4..94348d8ee 100755 --- a/scripts/build-release.sh +++ b/scripts/build-release.sh @@ -5,4 +5,4 @@ set -euo pipefail VERSION=${TAG#v} ./scripts/set-version.sh "$VERSION" -mvn -B package -P 'release,!default' -Dmaven.test.skip=true -Drelease=true +mvn -B package -P 'release,!default' -Dmaven.test.skip=true From 98302883152d220d0469a8cd4abbc8e209a0327e Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Fri, 4 Jul 2025 12:51:08 +0200 Subject: [PATCH 06/14] fix release Signed-off-by: Gregor Zeitlinger --- pom.xml | 29 +++++++++++ .../pom.xml | 49 ------------------- .../pom.xml | 31 ------------ 3 files changed, 29 insertions(+), 80 deletions(-) diff --git a/pom.xml b/pom.xml index 1017c35a3..de677d438 100644 --- a/pom.xml +++ b/pom.xml @@ -114,6 +114,35 @@ 2.3.0 test + + org.awaitility + awaitility + 4.3.0 + test + + + org.wiremock + wiremock + 3.13.1 + test + + + org.hamcrest + hamcrest-core + + + + + io.opentelemetry + opentelemetry-proto + 1.7.1-alpha + test + + + io.opentelemetry + opentelemetry-sdk-testing + test + diff --git a/prometheus-metrics-exporter-opentelemetry-shaded/pom.xml b/prometheus-metrics-exporter-opentelemetry-shaded/pom.xml index 6cd36f0d2..6b815c6b8 100644 --- a/prometheus-metrics-exporter-opentelemetry-shaded/pom.xml +++ b/prometheus-metrics-exporter-opentelemetry-shaded/pom.xml @@ -70,55 +70,6 @@ - - - - javadoc - - - release - - - default - - true - - - - - org.wiremock - wiremock - 3.13.1 - test - - - org.hamcrest - hamcrest-core - - - - - org.awaitility - awaitility - 4.3.0 - test - - - io.opentelemetry - opentelemetry-proto - - 1.7.1-alpha - test - - - io.opentelemetry - opentelemetry-sdk-testing - test - - - - - diff --git a/prometheus-metrics-exporter-opentelemetry/pom.xml b/prometheus-metrics-exporter-opentelemetry/pom.xml index 3d4d5c2f3..12eeca1f7 100644 --- a/prometheus-metrics-exporter-opentelemetry/pom.xml +++ b/prometheus-metrics-exporter-opentelemetry/pom.xml @@ -69,37 +69,6 @@ io.opentelemetry.instrumentation opentelemetry-resources - - - - org.wiremock - wiremock - 3.13.1 - test - - - org.hamcrest - hamcrest-core - - - - - org.awaitility - awaitility - 4.3.0 - test - - - io.opentelemetry - opentelemetry-proto - 1.7.1-alpha - test - - - io.opentelemetry - opentelemetry-sdk-testing - test - From bb0164d559f2db97320fdffa4c3eabc090a73254 Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Fri, 4 Jul 2025 12:54:05 +0200 Subject: [PATCH 07/14] fix release Signed-off-by: Gregor Zeitlinger --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index de677d438..c5ca8b332 100644 --- a/pom.xml +++ b/pom.xml @@ -141,6 +141,7 @@ io.opentelemetry opentelemetry-sdk-testing + 1.49.0 test From e6bcd437c73d814ec3fcbc510298a6021650ae3e Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Fri, 4 Jul 2025 12:57:22 +0200 Subject: [PATCH 08/14] fix release Signed-off-by: Gregor Zeitlinger --- pom.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c5ca8b332..7175f6c29 100644 --- a/pom.xml +++ b/pom.xml @@ -141,7 +141,6 @@ io.opentelemetry opentelemetry-sdk-testing - 1.49.0 test @@ -418,6 +417,13 @@ pom import + + io.opentelemetry.instrumentation + opentelemetry-instrumentation-bom-alpha + ${otel.instrumentation.version} + pom + import + From fef238acc1a4cfaed9b032f947cc39d14101952f Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Fri, 4 Jul 2025 13:00:11 +0200 Subject: [PATCH 09/14] fix release Signed-off-by: Gregor Zeitlinger --- pom.xml | 147 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 74 insertions(+), 73 deletions(-) diff --git a/pom.xml b/pom.xml index 7175f6c29..44a922daa 100644 --- a/pom.xml +++ b/pom.xml @@ -70,79 +70,6 @@ 3.0.2 provided - - - - org.junit.jupiter - junit-jupiter - ${junit-jupiter.version} - test - - - org.junit.jupiter - junit-jupiter-params - ${junit-jupiter.version} - test - - - org.mockito - mockito-core - 5.18.0 - test - - - org.assertj - assertj-core - 3.27.3 - test - - - com.google.guava - guava - ${guava.version} - test - - - org.slf4j - slf4j-simple - 2.0.17 - test - - - org.junit-pioneer - junit-pioneer - 2.3.0 - test - - - org.awaitility - awaitility - 4.3.0 - test - - - org.wiremock - wiremock - 3.13.1 - test - - - org.hamcrest - hamcrest-core - - - - - io.opentelemetry - opentelemetry-proto - 1.7.1-alpha - test - - - io.opentelemetry - opentelemetry-sdk-testing - test - @@ -426,6 +353,80 @@ + + + + org.junit.jupiter + junit-jupiter + ${junit-jupiter.version} + test + + + org.junit.jupiter + junit-jupiter-params + ${junit-jupiter.version} + test + + + org.mockito + mockito-core + 5.18.0 + test + + + org.assertj + assertj-core + 3.27.3 + test + + + com.google.guava + guava + ${guava.version} + test + + + org.slf4j + slf4j-simple + 2.0.17 + test + + + org.junit-pioneer + junit-pioneer + 2.3.0 + test + + + org.awaitility + awaitility + 4.3.0 + test + + + org.wiremock + wiremock + 3.13.1 + test + + + org.hamcrest + hamcrest-core + + + + + io.opentelemetry + opentelemetry-proto + 1.7.1-alpha + test + + + io.opentelemetry + opentelemetry-sdk-testing + test + + javadoc From 076128824c1601b89082d235c4261d7f066a58d7 Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Fri, 4 Jul 2025 13:07:41 +0200 Subject: [PATCH 10/14] fix release Signed-off-by: Gregor Zeitlinger --- .github/workflows/test-release-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-release-build.yml b/.github/workflows/test-release-build.yml index abd182304..f1aa44073 100644 --- a/.github/workflows/test-release-build.yml +++ b/.github/workflows/test-release-build.yml @@ -28,4 +28,4 @@ jobs: run: ./scripts/build-release.sh env: # don't ues the current snapshot version, to test a more realistic release - TAG: ${{ github.ref_name }} + TAG: ${{ github.run_number }} From e84641dafd2bdebada61d29b216c673e7a2d6b4e Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Fri, 4 Jul 2025 13:20:39 +0200 Subject: [PATCH 11/14] fix release Signed-off-by: Gregor Zeitlinger --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 44a922daa..db046b084 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,6 @@ false false -Werror - false From c9ab8dc4d801ab149fa48f4c2a3867321ec7c4f4 Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Fri, 4 Jul 2025 13:22:07 +0200 Subject: [PATCH 12/14] fix release Signed-off-by: Gregor Zeitlinger --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2851f7403..1407be02b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -47,7 +47,7 @@ jobs: gpg-passphrase: MAVEN_GPG_PASSPHRASE - name: Publish to Apache Maven Central - run: mvn deploy -P 'release,!default' -Dmaven.test.skip=true -Drelease=true + run: mvn deploy -P 'release,!default' -Dmaven.test.skip=true env: MAVEN_USERNAME: ${{ secrets.SONATYPE_MAVEN_REPOSITORY_USERNAME }} MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_MAVEN_REPOSITORY_PASSWORD }} From 21b6aa2632937e371b9df56dbe901dffaf49a967 Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Fri, 4 Jul 2025 13:45:12 +0200 Subject: [PATCH 13/14] fix release Signed-off-by: Gregor Zeitlinger --- pom.xml | 17 ++++------- .../pom.xml | 29 +++++++++++++++++++ .../pom.xml | 12 ++++++++ 3 files changed, 47 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index db046b084..334f4dc7e 100644 --- a/pom.xml +++ b/pom.xml @@ -350,6 +350,12 @@ pom import + + io.opentelemetry + opentelemetry-proto + 1.7.1-alpha + test + @@ -414,17 +420,6 @@ - - io.opentelemetry - opentelemetry-proto - 1.7.1-alpha - test - - - io.opentelemetry - opentelemetry-sdk-testing - test - diff --git a/prometheus-metrics-exporter-opentelemetry-shaded/pom.xml b/prometheus-metrics-exporter-opentelemetry-shaded/pom.xml index 6b815c6b8..1abee8d6c 100644 --- a/prometheus-metrics-exporter-opentelemetry-shaded/pom.xml +++ b/prometheus-metrics-exporter-opentelemetry-shaded/pom.xml @@ -70,6 +70,35 @@ + + + + javadoc + + + release + + + default + + true + + + + + io.opentelemetry + opentelemetry-proto + test + + + io.opentelemetry + opentelemetry-sdk-testing + test + + + + + diff --git a/prometheus-metrics-exporter-opentelemetry/pom.xml b/prometheus-metrics-exporter-opentelemetry/pom.xml index 12eeca1f7..95b27237d 100644 --- a/prometheus-metrics-exporter-opentelemetry/pom.xml +++ b/prometheus-metrics-exporter-opentelemetry/pom.xml @@ -69,6 +69,18 @@ io.opentelemetry.instrumentation opentelemetry-resources + + + + io.opentelemetry + opentelemetry-proto + test + + + io.opentelemetry + opentelemetry-sdk-testing + test + From 1fba7220e942c402c34e863686e34a11ab6adb28 Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Fri, 4 Jul 2025 13:51:26 +0200 Subject: [PATCH 14/14] fix release Signed-off-by: Gregor Zeitlinger --- .../pom.xml | 41 +++++++++++++------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/prometheus-metrics-exporter-opentelemetry/pom.xml b/prometheus-metrics-exporter-opentelemetry/pom.xml index 95b27237d..30eece5ae 100644 --- a/prometheus-metrics-exporter-opentelemetry/pom.xml +++ b/prometheus-metrics-exporter-opentelemetry/pom.xml @@ -69,20 +69,37 @@ io.opentelemetry.instrumentation opentelemetry-resources - - - - io.opentelemetry - opentelemetry-proto - test - - - io.opentelemetry - opentelemetry-sdk-testing - test - + + + + javadoc + + + release + + + default + + true + + + + + io.opentelemetry + opentelemetry-proto + test + + + io.opentelemetry + opentelemetry-sdk-testing + test + + + + +