Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -243,5 +245,17 @@
'"https://github.com/(?<depName>[^/]+/[^/]+)/zipball/(?<currentValue>.+?)"',
],
},
{
customType: 'regex',
datasourceTemplate: 'docker',
managerFilePatterns: [
'**/*.java',
],
matchStrings: [
'"(?<depName>otel/opentelemetry-collector-contrib):(?<currentValue>[^@"]+)(?:@(?<currentDigest>sha256:[a-f0-9]+))?"',
],
autoReplaceStringTemplate: '"{{depName}}:{{newValue}}{{#if newDigest}}@{{newDigest}}{{/if}}"',
versioningTemplate: 'docker',
},
],
}
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

intentionally pinning earlier version where --log-level DEBUG still existed, want to test Renovate autoupdate and will fix then

.withExposedPorts(13133, 2000)
.waitingFor(Wait.forHttp("/").forPort(13133))
.withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger("otel-collector")))
Expand Down