From 8fc073cf73fce5b00bd54c31fade7752881c8b24 Mon Sep 17 00:00:00 2001 From: otelbot <197425009+otelbot@users.noreply.github.com> Date: Fri, 15 Aug 2025 16:26:13 -0700 Subject: [PATCH 1/3] Revert "pin otel collector version (#7576)" --- .github/renovate.json5 | 1 - .github/workflows/build.yml | 4 ---- .../prometheus/CollectorIntegrationTest.java | 12 +----------- .../integrationtest/OtlpExporterIntegrationTest.java | 12 +----------- 4 files changed, 2 insertions(+), 27 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index f73bd08bfa2..311334af387 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -3,7 +3,6 @@ extends: [ 'config:best-practices', 'helpers:pinGitHubActionDigestsToSemver', - 'customManagers:githubActionsVersions' ], packageRules: [ { diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 110d5257304..061b30fd9f6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,10 +8,6 @@ on: pull_request: workflow_dispatch: -env: - # renovate: datasource=github-releases depName=opentelemetry-collector packageName=open-telemetry/opentelemetry-collector-releases - OTEL_COLLECTOR_VERSION: v0.132.4 - concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }} cancel-in-progress: true diff --git a/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/CollectorIntegrationTest.java b/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/CollectorIntegrationTest.java index 36373157231..ced638da1e9 100644 --- a/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/CollectorIntegrationTest.java +++ b/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/CollectorIntegrationTest.java @@ -60,17 +60,7 @@ class CollectorIntegrationTest { private static final String COLLECTOR_IMAGE = - "otel/opentelemetry-collector-contrib" + collectorVersion(); - - private static String collectorVersion() { - String otelCollectorVersion = System.getenv("OTEL_COLLECTOR_VERSION"); - if (otelCollectorVersion != null) { - // strip the leading 'v' - return ":" + otelCollectorVersion.substring(1); - } - // Default to latest if not set - return ":latest"; - } + "otel/opentelemetry-collector-contrib:latest"; private static final Integer COLLECTOR_HEALTH_CHECK_PORT = 13133; diff --git a/integration-tests/otlp/src/main/java/io/opentelemetry/integrationtest/OtlpExporterIntegrationTest.java b/integration-tests/otlp/src/main/java/io/opentelemetry/integrationtest/OtlpExporterIntegrationTest.java index bd182012f46..5e3b8b74769 100644 --- a/integration-tests/otlp/src/main/java/io/opentelemetry/integrationtest/OtlpExporterIntegrationTest.java +++ b/integration-tests/otlp/src/main/java/io/opentelemetry/integrationtest/OtlpExporterIntegrationTest.java @@ -115,17 +115,7 @@ abstract class OtlpExporterIntegrationTest { private static final AttributeKey SERVICE_NAME = AttributeKey.stringKey("service.name"); private static final String COLLECTOR_IMAGE = - "otel/opentelemetry-collector-contrib" + collectorVersion(); - - private static String collectorVersion() { - String otelCollectorVersion = System.getenv("OTEL_COLLECTOR_VERSION"); - if (otelCollectorVersion != null) { - // strip the leading 'v' - return ":" + otelCollectorVersion.substring(1); - } - // Default to latest if not set - return ":latest"; - } + "otel/opentelemetry-collector-contrib:latest"; private static final Integer COLLECTOR_OTLP_GRPC_PORT = 4317; private static final Integer COLLECTOR_OTLP_HTTP_PORT = 4318; From 8327c81da310191423db31ebcec7127fd683bcf5 Mon Sep 17 00:00:00 2001 From: otelbot <197425009+otelbot@users.noreply.github.com> Date: Fri, 15 Aug 2025 16:40:31 -0700 Subject: [PATCH 2/3] Maybe simpler renovate --- .github/renovate.json5 | 14 ++++++++++++++ .../prometheus/CollectorIntegrationTest.java | 2 +- .../OtlpExporterIntegrationTest.java | 2 +- .../opentelemetry/perf/OtlpPipelineStressTest.java | 2 +- .../opentelemetry/sdk/trace/ExporterBenchmark.java | 2 +- .../sdk/trace/SpanPipelineBenchmark.java | 2 +- 6 files changed, 19 insertions(+), 5 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 311334af387..7c84d4c8ebc 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -4,6 +4,8 @@ 'config:best-practices', 'helpers:pinGitHubActionDigestsToSemver', ], + ignorePaths: [], // overwrite default ignore which includes **/test/** + // used to update docker image versions used in Java test files packageRules: [ { // this is to reduce the number of renovate PRs @@ -94,5 +96,17 @@ ], depNameTemplate: 'java', }, + { + customType: 'regex', + datasourceTemplate: 'docker', + managerFilePatterns: [ + '**/*.java' + ], + matchStrings: [ + '"(?otel/opentelemetry-collector-contrib):(?[^@"]+)(?:@(?sha256:[a-f0-9]+))?"', + ], + autoReplaceStringTemplate: '"{{depName}}:{{newValue}}{{#if newDigest}}@{{newDigest}}{{/if}}"', + versioningTemplate: 'docker', + }, ], } diff --git a/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/CollectorIntegrationTest.java b/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/CollectorIntegrationTest.java index ced638da1e9..9c7ac0c59cc 100644 --- a/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/CollectorIntegrationTest.java +++ b/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/CollectorIntegrationTest.java @@ -60,7 +60,7 @@ class CollectorIntegrationTest { private static final String COLLECTOR_IMAGE = - "otel/opentelemetry-collector-contrib:latest"; + "otel/opentelemetry-collector-contrib:0.132.2"; private static final Integer COLLECTOR_HEALTH_CHECK_PORT = 13133; diff --git a/integration-tests/otlp/src/main/java/io/opentelemetry/integrationtest/OtlpExporterIntegrationTest.java b/integration-tests/otlp/src/main/java/io/opentelemetry/integrationtest/OtlpExporterIntegrationTest.java index 5e3b8b74769..9b3b1239d3a 100644 --- a/integration-tests/otlp/src/main/java/io/opentelemetry/integrationtest/OtlpExporterIntegrationTest.java +++ b/integration-tests/otlp/src/main/java/io/opentelemetry/integrationtest/OtlpExporterIntegrationTest.java @@ -115,7 +115,7 @@ abstract class OtlpExporterIntegrationTest { private static final AttributeKey SERVICE_NAME = AttributeKey.stringKey("service.name"); private static final String COLLECTOR_IMAGE = - "otel/opentelemetry-collector-contrib:latest"; + "otel/opentelemetry-collector-contrib:0.132.2"; private static final Integer COLLECTOR_OTLP_GRPC_PORT = 4317; private static final Integer COLLECTOR_OTLP_HTTP_PORT = 4318; diff --git a/perf-harness/src/test/java/io/opentelemetry/perf/OtlpPipelineStressTest.java b/perf-harness/src/test/java/io/opentelemetry/perf/OtlpPipelineStressTest.java index 845b2388b9a..92d181f27a2 100644 --- a/perf-harness/src/test/java/io/opentelemetry/perf/OtlpPipelineStressTest.java +++ b/perf-harness/src/test/java/io/opentelemetry/perf/OtlpPipelineStressTest.java @@ -68,7 +68,7 @@ public class OtlpPipelineStressTest { @Container public static final GenericContainer collectorContainer = - new GenericContainer<>(DockerImageName.parse("otel/opentelemetry-collector-contrib:latest")) + new GenericContainer<>(DockerImageName.parse("otel/opentelemetry-collector-contrib:0.132.2")) .withImagePullPolicy(PullPolicy.alwaysPull()) .withNetwork(network) .withNetworkAliases("otel-collector") diff --git a/sdk/trace/src/jmh/java/io/opentelemetry/sdk/trace/ExporterBenchmark.java b/sdk/trace/src/jmh/java/io/opentelemetry/sdk/trace/ExporterBenchmark.java index 72abbe0541d..c7f81ab3138 100644 --- a/sdk/trace/src/jmh/java/io/opentelemetry/sdk/trace/ExporterBenchmark.java +++ b/sdk/trace/src/jmh/java/io/opentelemetry/sdk/trace/ExporterBenchmark.java @@ -36,7 +36,7 @@ private ExporterBenchmark() {} @State(Scope.Benchmark) public abstract static class AbstractProcessorBenchmark { private static final DockerImageName OTLP_COLLECTOR_IMAGE = - DockerImageName.parse("otel/opentelemetry-collector-contrib:latest"); + DockerImageName.parse("otel/opentelemetry-collector-contrib:0.132.2"); protected static final int OTLP_PORT = 5678; private static final int HEALTH_CHECK_PORT = 13133; protected SdkSpanBuilder sdkSpanBuilder; diff --git a/sdk/trace/src/jmh/java/io/opentelemetry/sdk/trace/SpanPipelineBenchmark.java b/sdk/trace/src/jmh/java/io/opentelemetry/sdk/trace/SpanPipelineBenchmark.java index cbb9ee97b50..063e170853e 100644 --- a/sdk/trace/src/jmh/java/io/opentelemetry/sdk/trace/SpanPipelineBenchmark.java +++ b/sdk/trace/src/jmh/java/io/opentelemetry/sdk/trace/SpanPipelineBenchmark.java @@ -38,7 +38,7 @@ private SpanPipelineBenchmark() {} @State(Scope.Benchmark) public abstract static class AbstractProcessorBenchmark { private static final DockerImageName OTLP_COLLECTOR_IMAGE = - DockerImageName.parse("otel/opentelemetry-collector-contrib:latest"); + DockerImageName.parse("otel/opentelemetry-collector-contrib:0.132.2"); private static final int EXPOSED_PORT = 5678; private static final int HEALTH_CHECK_PORT = 13133; private Tracer tracer; From acb36be4c96c4acb2df1ed602d6d918cb65d3a2b Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 19 Aug 2025 14:09:01 -0700 Subject: [PATCH 3/3] spotless --- .../exporter/prometheus/CollectorIntegrationTest.java | 3 +-- .../integrationtest/OtlpExporterIntegrationTest.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/CollectorIntegrationTest.java b/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/CollectorIntegrationTest.java index 9c7ac0c59cc..ff0e3229ba4 100644 --- a/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/CollectorIntegrationTest.java +++ b/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/CollectorIntegrationTest.java @@ -59,8 +59,7 @@ @SuppressWarnings("NonFinalStaticField") class CollectorIntegrationTest { - private static final String COLLECTOR_IMAGE = - "otel/opentelemetry-collector-contrib:0.132.2"; + private static final String COLLECTOR_IMAGE = "otel/opentelemetry-collector-contrib:0.132.2"; private static final Integer COLLECTOR_HEALTH_CHECK_PORT = 13133; diff --git a/integration-tests/otlp/src/main/java/io/opentelemetry/integrationtest/OtlpExporterIntegrationTest.java b/integration-tests/otlp/src/main/java/io/opentelemetry/integrationtest/OtlpExporterIntegrationTest.java index 9b3b1239d3a..f680cbb632a 100644 --- a/integration-tests/otlp/src/main/java/io/opentelemetry/integrationtest/OtlpExporterIntegrationTest.java +++ b/integration-tests/otlp/src/main/java/io/opentelemetry/integrationtest/OtlpExporterIntegrationTest.java @@ -114,8 +114,7 @@ abstract class OtlpExporterIntegrationTest { private static final AttributeKey SERVICE_NAME = AttributeKey.stringKey("service.name"); - private static final String COLLECTOR_IMAGE = - "otel/opentelemetry-collector-contrib:0.132.2"; + private static final String COLLECTOR_IMAGE = "otel/opentelemetry-collector-contrib:0.132.2"; private static final Integer COLLECTOR_OTLP_GRPC_PORT = 4317; private static final Integer COLLECTOR_OTLP_HTTP_PORT = 4318;