From 527e6bb4e45c1afd1f292352c07d0f02a892a1ab Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 20 Aug 2025 17:08:07 +0000 Subject: [PATCH 1/2] chore(deps): pin otel/opentelemetry-collector-contrib docker tag to 8d5c659 --- .../exporter/prometheus/CollectorIntegrationTest.java | 2 +- .../integrationtest/OtlpExporterIntegrationTest.java | 2 +- .../test/java/io/opentelemetry/perf/OtlpPipelineStressTest.java | 2 +- .../jmh/java/io/opentelemetry/sdk/trace/ExporterBenchmark.java | 2 +- .../java/io/opentelemetry/sdk/trace/SpanPipelineBenchmark.java | 2 +- 5 files changed, 5 insertions(+), 5 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 ff0e3229ba4..47a168d2632 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,7 +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@sha256:8d5c6595ac5d6fd8ee0ca91868bead6426353b077722b85f5ae98e583caa259b"; 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 f680cbb632a..b0a348e3125 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,7 +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@sha256:8d5c6595ac5d6fd8ee0ca91868bead6426353b077722b85f5ae98e583caa259b"; 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 92d181f27a2..bfbb7c83cbb 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:0.132.2")) + new GenericContainer<>(DockerImageName.parse("otel/opentelemetry-collector-contrib:0.132.2@sha256:8d5c6595ac5d6fd8ee0ca91868bead6426353b077722b85f5ae98e583caa259b")) .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 c7f81ab3138..71a1b37ad0e 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:0.132.2"); + DockerImageName.parse("otel/opentelemetry-collector-contrib:0.132.2@sha256:8d5c6595ac5d6fd8ee0ca91868bead6426353b077722b85f5ae98e583caa259b"); 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 063e170853e..182bd43778e 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:0.132.2"); + DockerImageName.parse("otel/opentelemetry-collector-contrib:0.132.2@sha256:8d5c6595ac5d6fd8ee0ca91868bead6426353b077722b85f5ae98e583caa259b"); private static final int EXPOSED_PORT = 5678; private static final int HEALTH_CHECK_PORT = 13133; private Tracer tracer; From de41cf55b48611faf7ccd219a8c3947e20236947 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Wed, 20 Aug 2025 10:19:05 -0700 Subject: [PATCH 2/2] spotless --- .../exporter/prometheus/CollectorIntegrationTest.java | 3 ++- .../integrationtest/OtlpExporterIntegrationTest.java | 3 ++- .../java/io/opentelemetry/perf/OtlpPipelineStressTest.java | 4 +++- .../java/io/opentelemetry/sdk/trace/ExporterBenchmark.java | 3 ++- .../io/opentelemetry/sdk/trace/SpanPipelineBenchmark.java | 3 ++- 5 files changed, 11 insertions(+), 5 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 47a168d2632..f0205e1ecd5 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,7 +59,8 @@ @SuppressWarnings("NonFinalStaticField") class CollectorIntegrationTest { - private static final String COLLECTOR_IMAGE = "otel/opentelemetry-collector-contrib:0.132.2@sha256:8d5c6595ac5d6fd8ee0ca91868bead6426353b077722b85f5ae98e583caa259b"; + private static final String COLLECTOR_IMAGE = + "otel/opentelemetry-collector-contrib:0.132.2@sha256:8d5c6595ac5d6fd8ee0ca91868bead6426353b077722b85f5ae98e583caa259b"; 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 b0a348e3125..9883e5feb8c 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,7 +114,8 @@ 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@sha256:8d5c6595ac5d6fd8ee0ca91868bead6426353b077722b85f5ae98e583caa259b"; + private static final String COLLECTOR_IMAGE = + "otel/opentelemetry-collector-contrib:0.132.2@sha256:8d5c6595ac5d6fd8ee0ca91868bead6426353b077722b85f5ae98e583caa259b"; 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 bfbb7c83cbb..66d652bbaed 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,9 @@ public class OtlpPipelineStressTest { @Container public static final GenericContainer collectorContainer = - new GenericContainer<>(DockerImageName.parse("otel/opentelemetry-collector-contrib:0.132.2@sha256:8d5c6595ac5d6fd8ee0ca91868bead6426353b077722b85f5ae98e583caa259b")) + new GenericContainer<>( + DockerImageName.parse( + "otel/opentelemetry-collector-contrib:0.132.2@sha256:8d5c6595ac5d6fd8ee0ca91868bead6426353b077722b85f5ae98e583caa259b")) .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 71a1b37ad0e..b04917b6de6 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,8 @@ private ExporterBenchmark() {} @State(Scope.Benchmark) public abstract static class AbstractProcessorBenchmark { private static final DockerImageName OTLP_COLLECTOR_IMAGE = - DockerImageName.parse("otel/opentelemetry-collector-contrib:0.132.2@sha256:8d5c6595ac5d6fd8ee0ca91868bead6426353b077722b85f5ae98e583caa259b"); + DockerImageName.parse( + "otel/opentelemetry-collector-contrib:0.132.2@sha256:8d5c6595ac5d6fd8ee0ca91868bead6426353b077722b85f5ae98e583caa259b"); 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 182bd43778e..c58f25e2156 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,8 @@ private SpanPipelineBenchmark() {} @State(Scope.Benchmark) public abstract static class AbstractProcessorBenchmark { private static final DockerImageName OTLP_COLLECTOR_IMAGE = - DockerImageName.parse("otel/opentelemetry-collector-contrib:0.132.2@sha256:8d5c6595ac5d6fd8ee0ca91868bead6426353b077722b85f5ae98e583caa259b"); + DockerImageName.parse( + "otel/opentelemetry-collector-contrib:0.132.2@sha256:8d5c6595ac5d6fd8ee0ca91868bead6426353b077722b85f5ae98e583caa259b"); private static final int EXPOSED_PORT = 5678; private static final int HEALTH_CHECK_PORT = 13133; private Tracer tracer;