From 4b82da5abbbd57c68f50cb92bfe9a6248f2f4f68 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 10 Oct 2025 16:10:09 +0000 Subject: [PATCH 1/5] Initial plan From 974398ecad8732514b3760658aac75acc766b2cd Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 10 Oct 2025 16:19:23 +0000 Subject: [PATCH 2/5] Pin otel/opentelemetry-collector-contrib:latest to 0.137.0 Co-authored-by: trask <218610+trask@users.noreply.github.com> --- .github/renovate.json5 | 14 ++++++++++++++ .../xray/AwsXrayRemoteSamplerIntegrationTest.java | 4 +++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index a7d6e7672b..65b753f754 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 ignorePresets: [ ':ignoreModulesAndTests', // needed to keep maven-extension test pom files up-to-date 'workarounds:javaLTSVersions', // Allow all Java major versions, not just LTS @@ -243,5 +245,17 @@ '"https://github.com/(?[^/]+/[^/]+)/zipball/(?.+?)"', ], }, + { + 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/aws-xray/src/awsTest/java/io/opentelemetry/contrib/aws/xray/AwsXrayRemoteSamplerIntegrationTest.java b/aws-xray/src/awsTest/java/io/opentelemetry/contrib/aws/xray/AwsXrayRemoteSamplerIntegrationTest.java index fe281e3e2f..81069c2952 100644 --- a/aws-xray/src/awsTest/java/io/opentelemetry/contrib/aws/xray/AwsXrayRemoteSamplerIntegrationTest.java +++ b/aws-xray/src/awsTest/java/io/opentelemetry/contrib/aws/xray/AwsXrayRemoteSamplerIntegrationTest.java @@ -39,7 +39,9 @@ class AwsXrayRemoteSamplerIntegrationTest { @Container private static final GenericContainer otelCollector = - new GenericContainer<>(DockerImageName.parse("otel/opentelemetry-collector-contrib:latest")) + new GenericContainer<>( + DockerImageName.parse( + "otel/opentelemetry-collector-contrib:0.137.0@sha256:886722fe0f37af9d1fe24d29529253ec59fbf263b3b1df4facaf221373e19d23")) .withExposedPorts(13133, 2000) .waitingFor(Wait.forHttp("/").forPort(13133)) .withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger("otel-collector"))) From 3a2ea834053faf2de5bc048c5972a5fd2365a9a0 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Fri, 10 Oct 2025 09:26:57 -0700 Subject: [PATCH 3/5] Update aws-xray/src/awsTest/java/io/opentelemetry/contrib/aws/xray/AwsXrayRemoteSamplerIntegrationTest.java --- .../contrib/aws/xray/AwsXrayRemoteSamplerIntegrationTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws-xray/src/awsTest/java/io/opentelemetry/contrib/aws/xray/AwsXrayRemoteSamplerIntegrationTest.java b/aws-xray/src/awsTest/java/io/opentelemetry/contrib/aws/xray/AwsXrayRemoteSamplerIntegrationTest.java index 81069c2952..0021459df0 100644 --- a/aws-xray/src/awsTest/java/io/opentelemetry/contrib/aws/xray/AwsXrayRemoteSamplerIntegrationTest.java +++ b/aws-xray/src/awsTest/java/io/opentelemetry/contrib/aws/xray/AwsXrayRemoteSamplerIntegrationTest.java @@ -41,7 +41,7 @@ class AwsXrayRemoteSamplerIntegrationTest { private static final GenericContainer otelCollector = new GenericContainer<>( DockerImageName.parse( - "otel/opentelemetry-collector-contrib:0.137.0@sha256:886722fe0f37af9d1fe24d29529253ec59fbf263b3b1df4facaf221373e19d23")) + "otel/opentelemetry-collector-contrib:0.136.0")) .withExposedPorts(13133, 2000) .waitingFor(Wait.forHttp("/").forPort(13133)) .withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger("otel-collector"))) From 16d7c968217cf141c6754898e3d42692551dc87d Mon Sep 17 00:00:00 2001 From: otelbot <197425009+otelbot@users.noreply.github.com> Date: Fri, 10 Oct 2025 16:28:28 +0000 Subject: [PATCH 4/5] ./gradlew spotlessApply --- .../contrib/aws/xray/AwsXrayRemoteSamplerIntegrationTest.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/aws-xray/src/awsTest/java/io/opentelemetry/contrib/aws/xray/AwsXrayRemoteSamplerIntegrationTest.java b/aws-xray/src/awsTest/java/io/opentelemetry/contrib/aws/xray/AwsXrayRemoteSamplerIntegrationTest.java index 0021459df0..bf922271cc 100644 --- a/aws-xray/src/awsTest/java/io/opentelemetry/contrib/aws/xray/AwsXrayRemoteSamplerIntegrationTest.java +++ b/aws-xray/src/awsTest/java/io/opentelemetry/contrib/aws/xray/AwsXrayRemoteSamplerIntegrationTest.java @@ -39,9 +39,7 @@ class AwsXrayRemoteSamplerIntegrationTest { @Container private static final GenericContainer otelCollector = - new GenericContainer<>( - DockerImageName.parse( - "otel/opentelemetry-collector-contrib:0.136.0")) + new GenericContainer<>(DockerImageName.parse("otel/opentelemetry-collector-contrib:0.136.0")) .withExposedPorts(13133, 2000) .waitingFor(Wait.forHttp("/").forPort(13133)) .withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger("otel-collector"))) From 2d9a515b8203dd4c311005babc4c2b68b93bb292 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Fri, 10 Oct 2025 09:31:00 -0700 Subject: [PATCH 5/5] Update .github/renovate.json5 --- .github/renovate.json5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 65b753f754..800574bec4 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -252,7 +252,7 @@ '**/*.java', ], matchStrings: [ - '"(?otel/opentelemetry-collector-contrib):(?[^@"]+)(?:@(?sha256:[a-f0-9]+))?\"', + '"(?otel/opentelemetry-collector-contrib):(?[^@"]+)(?:@(?sha256:[a-f0-9]+))?"', ], autoReplaceStringTemplate: '"{{depName}}:{{newValue}}{{#if newDigest}}@{{newDigest}}{{/if}}"', versioningTemplate: 'docker',