Skip to content

Commit 50a0b60

Browse files
committed
Revert "pin otel collector version (#7576)"
1 parent 18aca41 commit 50a0b60

File tree

4 files changed

+2
-27
lines changed

4 files changed

+2
-27
lines changed

.github/renovate.json5

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
extends: [
44
'config:best-practices',
55
'helpers:pinGitHubActionDigestsToSemver',
6-
'customManagers:githubActionsVersions'
76
],
87
packageRules: [
98
{

.github/workflows/build.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ on:
88
pull_request:
99
workflow_dispatch:
1010

11-
env:
12-
# renovate: datasource=github-releases depName=opentelemetry-collector packageName=open-telemetry/opentelemetry-collector-releases
13-
OTEL_COLLECTOR_VERSION: v0.132.2
14-
1511
concurrency:
1612
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
1713
cancel-in-progress: true

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

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

6262
private static final String COLLECTOR_IMAGE =
63-
"otel/opentelemetry-collector-contrib" + collectorVersion();
64-
65-
private static String collectorVersion() {
66-
String otelCollectorVersion = System.getenv("OTEL_COLLECTOR_VERSION");
67-
if (otelCollectorVersion != null) {
68-
// strip the leading 'v'
69-
return ":" + otelCollectorVersion.substring(1);
70-
}
71-
// Default to latest if not set
72-
return ":latest";
73-
}
63+
"otel/opentelemetry-collector-contrib:latest";
7464

7565
private static final Integer COLLECTOR_HEALTH_CHECK_PORT = 13133;
7666

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

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -115,17 +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" + collectorVersion();
119-
120-
private static String collectorVersion() {
121-
String otelCollectorVersion = System.getenv("OTEL_COLLECTOR_VERSION");
122-
if (otelCollectorVersion != null) {
123-
// strip the leading 'v'
124-
return ":" + otelCollectorVersion.substring(1);
125-
}
126-
// Default to latest if not set
127-
return ":latest";
128-
}
118+
"otel/opentelemetry-collector-contrib:latest";
129119

130120
private static final Integer COLLECTOR_OTLP_GRPC_PORT = 4317;
131121
private static final Integer COLLECTOR_OTLP_HTTP_PORT = 4318;

0 commit comments

Comments
 (0)