Skip to content

Commit 8327c81

Browse files
otelbot[bot]trask
authored andcommitted
Maybe simpler renovate
1 parent 8fc073c commit 8327c81

File tree

6 files changed

+19
-5
lines changed

6 files changed

+19
-5
lines changed

.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
packageRules: [
810
{
911
// this is to reduce the number of renovate PRs
@@ -94,5 +96,17 @@
9496
],
9597
depNameTemplate: 'java',
9698
},
99+
{
100+
customType: 'regex',
101+
datasourceTemplate: 'docker',
102+
managerFilePatterns: [
103+
'**/*.java'
104+
],
105+
matchStrings: [
106+
'"(?<depName>otel/opentelemetry-collector-contrib):(?<currentValue>[^@"]+)(?:@(?<currentDigest>sha256:[a-f0-9]+))?"',
107+
],
108+
autoReplaceStringTemplate: '"{{depName}}:{{newValue}}{{#if newDigest}}@{{newDigest}}{{/if}}"',
109+
versioningTemplate: 'docker',
110+
},
97111
],
98112
}

exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/CollectorIntegrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
class CollectorIntegrationTest {
6161

6262
private static final String COLLECTOR_IMAGE =
63-
"otel/opentelemetry-collector-contrib:latest";
63+
"otel/opentelemetry-collector-contrib:0.132.2";
6464

6565
private static final Integer COLLECTOR_HEALTH_CHECK_PORT = 13133;
6666

integration-tests/otlp/src/main/java/io/opentelemetry/integrationtest/OtlpExporterIntegrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ abstract class OtlpExporterIntegrationTest {
115115
private static final AttributeKey<String> SERVICE_NAME = AttributeKey.stringKey("service.name");
116116

117117
private static final String COLLECTOR_IMAGE =
118-
"otel/opentelemetry-collector-contrib:latest";
118+
"otel/opentelemetry-collector-contrib:0.132.2";
119119

120120
private static final Integer COLLECTOR_OTLP_GRPC_PORT = 4317;
121121
private static final Integer COLLECTOR_OTLP_HTTP_PORT = 4318;

perf-harness/src/test/java/io/opentelemetry/perf/OtlpPipelineStressTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public class OtlpPipelineStressTest {
6868

6969
@Container
7070
public static final GenericContainer<?> collectorContainer =
71-
new GenericContainer<>(DockerImageName.parse("otel/opentelemetry-collector-contrib:latest"))
71+
new GenericContainer<>(DockerImageName.parse("otel/opentelemetry-collector-contrib:0.132.2"))
7272
.withImagePullPolicy(PullPolicy.alwaysPull())
7373
.withNetwork(network)
7474
.withNetworkAliases("otel-collector")

sdk/trace/src/jmh/java/io/opentelemetry/sdk/trace/ExporterBenchmark.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ private ExporterBenchmark() {}
3636
@State(Scope.Benchmark)
3737
public abstract static class AbstractProcessorBenchmark {
3838
private static final DockerImageName OTLP_COLLECTOR_IMAGE =
39-
DockerImageName.parse("otel/opentelemetry-collector-contrib:latest");
39+
DockerImageName.parse("otel/opentelemetry-collector-contrib:0.132.2");
4040
protected static final int OTLP_PORT = 5678;
4141
private static final int HEALTH_CHECK_PORT = 13133;
4242
protected SdkSpanBuilder sdkSpanBuilder;

sdk/trace/src/jmh/java/io/opentelemetry/sdk/trace/SpanPipelineBenchmark.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ private SpanPipelineBenchmark() {}
3838
@State(Scope.Benchmark)
3939
public abstract static class AbstractProcessorBenchmark {
4040
private static final DockerImageName OTLP_COLLECTOR_IMAGE =
41-
DockerImageName.parse("otel/opentelemetry-collector-contrib:latest");
41+
DockerImageName.parse("otel/opentelemetry-collector-contrib:0.132.2");
4242
private static final int EXPOSED_PORT = 5678;
4343
private static final int HEALTH_CHECK_PORT = 13133;
4444
private Tracer tracer;

0 commit comments

Comments
 (0)