Skip to content

Commit 7aebc1b

Browse files
Copilottraskotelbot[bot]
authored
Pin otel/opentelemetry-collector-contrib:latest to versioned image (#2347)
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: trask <218610+trask@users.noreply.github.com> Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com> Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com>
1 parent c89ef28 commit 7aebc1b

2 files changed

Lines changed: 15 additions & 1 deletion

File tree

.github/renovate.json5

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
'config:best-practices',
55
'helpers:pinGitHubActionDigestsToSemver',
66
],
7+
ignorePaths: [], // overwrite default ignore which includes **/test/**
8+
// used to update docker image versions used in Java test files
79
ignorePresets: [
810
':ignoreModulesAndTests', // needed to keep maven-extension test pom files up-to-date
911
'workarounds:javaLTSVersions', // Allow all Java major versions, not just LTS
@@ -243,5 +245,17 @@
243245
'"https://github.com/(?<depName>[^/]+/[^/]+)/zipball/(?<currentValue>.+?)"',
244246
],
245247
},
248+
{
249+
customType: 'regex',
250+
datasourceTemplate: 'docker',
251+
managerFilePatterns: [
252+
'**/*.java',
253+
],
254+
matchStrings: [
255+
'"(?<depName>otel/opentelemetry-collector-contrib):(?<currentValue>[^@"]+)(?:@(?<currentDigest>sha256:[a-f0-9]+))?"',
256+
],
257+
autoReplaceStringTemplate: '"{{depName}}:{{newValue}}{{#if newDigest}}@{{newDigest}}{{/if}}"',
258+
versioningTemplate: 'docker',
259+
},
246260
],
247261
}

aws-xray/src/awsTest/java/io/opentelemetry/contrib/aws/xray/AwsXrayRemoteSamplerIntegrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class AwsXrayRemoteSamplerIntegrationTest {
3939

4040
@Container
4141
private static final GenericContainer<?> otelCollector =
42-
new GenericContainer<>(DockerImageName.parse("otel/opentelemetry-collector-contrib:latest"))
42+
new GenericContainer<>(DockerImageName.parse("otel/opentelemetry-collector-contrib:0.136.0"))
4343
.withExposedPorts(13133, 2000)
4444
.waitingFor(Wait.forHttp("/").forPort(13133))
4545
.withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger("otel-collector")))

0 commit comments

Comments
 (0)