diff --git a/.github/renovate.json5 b/.github/renovate.json5 index a7d6e7672..800574bec 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 fe281e3e2..bf922271c 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,7 @@ 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.136.0")) .withExposedPorts(13133, 2000) .waitingFor(Wait.forHttp("/").forPort(13133)) .withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger("otel-collector")))