Alternate strategy for pinning collector images (#7586)

Co-authored-by: otelbot <[email protected]>

Author: trask

.github/renovate.json5

@@ -3,8 +3,9 @@
   extends: [
     'config:best-practices',
     'helpers:pinGitHubActionDigestsToSemver',
-    'customManagers:githubActionsVersions'
   ],
+  ignorePaths: [], // overwrite default ignore which includes **/test/**
+                   // used to update docker image versions used in Java test files
   packageRules: [
     {
       // this is to reduce the number of renovate PRs
@@ -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',
+    },
   ],
 }

.github/workflows/build.yml

@@ -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

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

@@ -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;
 

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

@@ -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;

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

@@ -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")

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

@@ -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;

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

@@ -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;