Skip to content

Alternate strategy for pinning collector images #7586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jkwatson merged 4 commits into from
Aug 20, 2025
Merged

Alternate strategy for pinning collector images #7586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8fc073c
Revert "pin otel collector version (#7576)"
otelbot[bot] Aug 15, 2025
8327c81
Maybe simpler renovate
otelbot[bot] Aug 15, 2025
02a0783
Merge remote-tracking branch 'upstream/main' into maybe-simpler-renovate
trask Aug 19, 2025
acb36be
spotless
trask Aug 19, 2025
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
15 changes: 14 additions & 1 deletion .github/renovate.json5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
extends: [
'config:best-practices',
'helpers:pinGitHubActionDigestsToSemver',
'customManagers:githubActionsVersions'
],
ignorePaths: [], // overwrite default ignore which includes **/test/**
Copy link
Contributor

@jkwatson jkwatson Aug 18, 2025

Choose a reason for hiding this comment

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

for this particular rule, we only want to scan test paths, yes? Would it make renovate more efficient if we could encode that?

Copy link
Member Author

@trask trask Aug 18, 2025

Choose a reason for hiding this comment

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

it didn't seem like you could change the ignorePaths per custom manager

I don't think the efficiency is the problem, more about Renovate picking up false positives, which luckily didn't seem to be a problem for this repo (I tested in my fork)

// used to update docker image versions used in Java test files
packageRules: [
{
// this is to reduce the number of renovate PRs
Expand Down Expand Up @@ -95,5 +96,17 @@
],
depNameTemplate: 'java',
},
{
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',
},
],
}
4 changes: 0 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@ on:
pull_request:
workflow_dispatch:

env:
# renovate: datasource=github-releases depName=opentelemetry-collector packageName=open-telemetry/opentelemetry-collector-releases
OTEL_COLLECTOR_VERSION: v0.132.4

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
cancel-in-progress: true
Expand Down
13 changes: 1 addition & 12 deletions ...ometheus/src/test/java/io/opentelemetry/exporter/prometheus/CollectorIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,18 +59,7 @@
@SuppressWarnings("NonFinalStaticField")
class CollectorIntegrationTest {

private static final String COLLECTOR_IMAGE =
"otel/opentelemetry-collector-contrib" + collectorVersion();

private static String collectorVersion() {
String otelCollectorVersion = System.getenv("OTEL_COLLECTOR_VERSION");
if (otelCollectorVersion != null) {
// strip the leading 'v'
return ":" + otelCollectorVersion.substring(1);
}
// Default to latest if not set
return ":latest";
}
private static final String COLLECTOR_IMAGE = "otel/opentelemetry-collector-contrib:0.132.2";

private static final Integer COLLECTOR_HEALTH_CHECK_PORT = 13133;

Expand Down
13 changes: 1 addition & 12 deletions ...ests/otlp/src/main/java/io/opentelemetry/integrationtest/OtlpExporterIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,18 +114,7 @@ abstract class OtlpExporterIntegrationTest {

private static final AttributeKey<String> SERVICE_NAME = AttributeKey.stringKey("service.name");

private static final String COLLECTOR_IMAGE =
"otel/opentelemetry-collector-contrib" + collectorVersion();

private static String collectorVersion() {
String otelCollectorVersion = System.getenv("OTEL_COLLECTOR_VERSION");
if (otelCollectorVersion != null) {
// strip the leading 'v'
return ":" + otelCollectorVersion.substring(1);
}
// Default to latest if not set
return ":latest";
}
private static final String COLLECTOR_IMAGE = "otel/opentelemetry-collector-contrib:0.132.2";

private static final Integer COLLECTOR_OTLP_GRPC_PORT = 4317;
private static final Integer COLLECTOR_OTLP_HTTP_PORT = 4318;
Expand Down
2 changes: 1 addition & 1 deletion perf-harness/src/test/java/io/opentelemetry/perf/OtlpPipelineStressTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public class OtlpPipelineStressTest {

@Container
public static final GenericContainer<?> collectorContainer =
new GenericContainer<>(DockerImageName.parse("otel/opentelemetry-collector-contrib:latest"))
new GenericContainer<>(DockerImageName.parse("otel/opentelemetry-collector-contrib:0.132.2"))
.withImagePullPolicy(PullPolicy.alwaysPull())
.withNetwork(network)
.withNetworkAliases("otel-collector")
Expand Down
2 changes: 1 addition & 1 deletion sdk/trace/src/jmh/java/io/opentelemetry/sdk/trace/ExporterBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ private ExporterBenchmark() {}
@State(Scope.Benchmark)
public abstract static class AbstractProcessorBenchmark {
private static final DockerImageName OTLP_COLLECTOR_IMAGE =
DockerImageName.parse("otel/opentelemetry-collector-contrib:latest");
DockerImageName.parse("otel/opentelemetry-collector-contrib:0.132.2");
protected static final int OTLP_PORT = 5678;
private static final int HEALTH_CHECK_PORT = 13133;
protected SdkSpanBuilder sdkSpanBuilder;
Expand Down
2 changes: 1 addition & 1 deletion sdk/trace/src/jmh/java/io/opentelemetry/sdk/trace/SpanPipelineBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ private SpanPipelineBenchmark() {}
@State(Scope.Benchmark)
public abstract static class AbstractProcessorBenchmark {
private static final DockerImageName OTLP_COLLECTOR_IMAGE =
DockerImageName.parse("otel/opentelemetry-collector-contrib:latest");
DockerImageName.parse("otel/opentelemetry-collector-contrib:0.132.2");
private static final int EXPOSED_PORT = 5678;
private static final int HEALTH_CHECK_PORT = 13133;
private Tracer tracer;
Expand Down
Loading