search

open-telemetry / opentelemetry-collector-contrib

Contrib repository for the OpenTelemetry Collector
https://opentelemetry.io
Apache License 2.0
2.94k stars 2.29k forks source link

[CI] make update-otel needs manual steps #35159

Open mx-psi opened 2 weeks ago

mx-psi commented 2 weeks ago

Component(s)

No response

Describe the issue you're reporting

make update-otel needs manual steps on the otelcontribcol and oteltestbedcol go.mod files.

To reproduce checkout to 56149b2 and try to update to open-telemetry/opentelemetry-collector@6c2697c4453c8ecb8416a9854abbe65deb7517f9 by running 

git checkout 56149b2
make update-otel OTEL_STABLE_VERSION=6c2697c4453c8ecb8416a9854abbe65deb7517f9 OTEL_VERSION=6c2697c4453c8ecb8416a9854abbe65deb7517f9

This is what #35158 did, and as you can see on https://github.com/open-telemetry/opentelemetry-collector-contrib/actions/runs/10828278572/job/30043431071?pr=35158, the check-collector-module-version CI job failed with the following:

Logs from the check-collector-module-version ``` ./.github/workflows/scripts/check-collector-module-version.sh shell: /usr/bin/bash -e {0} env: TEST_RESULTS: testbed/tests/results/junit/results.xml SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2 Checking go.opentelemetry.io/collector is used with v0.109.1-0.20240911162712-6c2697c445[3](https://github.com/open-telemetry/opentelemetry-collector-contrib/actions/runs/10828278572/job/30043431071?pr=35158#step:3:3)c Checking go.opentelemetry.io/collector/cmd/builder is used with v0.109.1-0.202[4](https://github.com/open-telemetry/opentelemetry-collector-contrib/actions/runs/10828278572/job/30043431071?pr=35158#step:3:4)0911162712-6c2697c44[5](https://github.com/open-telemetry/opentelemetry-collector-contrib/actions/runs/10828278572/job/30043431071?pr=35158#step:3:5)3c Checking go.opentelemetry.io/collector/component is used with v0.109.1-0.202409111[6](https://github.com/open-telemetry/opentelemetry-collector-contrib/actions/runs/10828278572/job/30043431071?pr=35158#step:3:6)2712-6c2697c4453c Checking go.opentelemetry.io/collector/config/configauth is used with v0.109.1-0.20240911162[7](https://github.com/open-telemetry/opentelemetry-collector-contrib/actions/runs/10828278572/job/30043431071?pr=35158#step:3:8)12-6c2697c4453c Checking go.opentelemetry.io/collector/config/configgrpc is used with v0.109.1-0.20240911162712-6c2697c4453c Checking go.opentelemetry.io/collector/config/confighttp is used with v0.109.1-0.20240911162712-6c2697c4453c Checking go.opentelemetry.io/collector/config/confignet is used with v0.109.1-0.20240911162712-6c2697c4453c Checking go.opentelemetry.io/collector/config/configtelemetry is used with v0.109.1-0.20240911162712-6c2697c4453c Checking go.opentelemetry.io/collector/config/internal is used with v0.109.1-0.20240911162712-6c2697c4453c Checking go.opentelemetry.io/collector/connector is used with v0.109.1-0.20240911162712-6c2697c4453c Checking go.opentelemetry.io/collector/connector/forwardconnector is used with v0.109.1-0.20240911162712-6c2697c4453c Checking go.opentelemetry.io/collector/consumer is used with v0.109.1-0.20240911162712-6c2697c4453c Checking go.opentelemetry.io/collector/exporter is used with v0.109.1-0.20240911162712-6c2697c4453c Checking go.opentelemetry.io/collector/exporter/debugexporter is used with v0.109.1-0.20240911162712-6c2697c4453c Checking go.opentelemetry.io/collector/exporter/loggingexporter is used with v0.109.1-0.20240911162712-6c2697c4453c Checking go.opentelemetry.io/collector/exporter/otlpexporter is used with v0.109.1-0.20240911162712-6c2697c4453c Checking go.opentelemetry.io/collector/exporter/otlphttpexporter is used with v0.109.1-0.20240911162712-6c2697c4453c Checking go.opentelemetry.io/collector/extension is used with v0.109.1-0.20240911162712-6c2697c4453c Checking go.opentelemetry.io/collector/extension/auth is used with v0.109.1-0.20240911162712-6c2697c4453c Checking go.opentelemetry.io/collector/extension/zpagesextension is used with v0.109.1-0.20240911162712-6c2697c4453c Checking go.opentelemetry.io/collector/otelcol is used with v0.109.1-0.20240911162712-6c2697c4453c Checking go.opentelemetry.io/collector/processor is used with v0.109.1-0.20240911162712-6c2697c4453c Checking go.opentelemetry.io/collector/processor/batchprocessor is used with v0.109.1-0.20240911162712-6c2697c4453c Checking go.opentelemetry.io/collector/processor/memorylimiterprocessor is used with v0.109.1-0.20240911162712-6c2697c4453c Checking go.opentelemetry.io/collector/receiver is used with v0.109.1-0.20240911162712-6c2697c4453c Checking go.opentelemetry.io/collector/receiver/otlpreceiver is used with v0.109.1-0.20240911162712-6c2697c4453c Checking go.opentelemetry.io/collector/semconv is used with v0.109.1-0.20240911162712-6c2697c4453c Checking go.opentelemetry.io/collector/pdata is used with v1.15.1-0.20240911162712-6c2697c4453c Checking go.opentelemetry.io/collector/featuregate is used with v1.15.1-0.20240911162712-6c2697c4453c Checking go.opentelemetry.io/collector/pdata is used with v1.15.1-0.20240911162712-6c2697c4453c Checking go.opentelemetry.io/collector/confmap is used with v1.15.1-0.20240911162712-6c2697c4453c Checking go.opentelemetry.io/collector/config/configcompression is used with v1.15.1-0.20240911162712-6c2697c4453c Checking go.opentelemetry.io/collector/config/configopaque is used with v1.15.1-0.20240911162712-6c2697c4453c Checking go.opentelemetry.io/collector/config/configtls is used with v1.15.1-0.20240911162712-6c2697c4453c diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod index [8](https://github.com/open-telemetry/opentelemetry-collector-contrib/actions/runs/10828278572/job/30043431071?pr=35158#step:3:9)401e8a..b8d20f5 100644 --- a/cmd/otelcontribcol/go.mod +++ b/cmd/otelcontribcol/go.mod @@ -223,15 +223,15 @@ require ( go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.10[9](https://github.com/open-telemetry/opentelemetry-collector-contrib/actions/runs/10828278572/job/30043431071?pr=35158#step:3:10).0 go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.109.1-0.20240911162712-6c2697c4453c go.opentelemetry.io/collector/connector v0.[10](https://github.com/open-telemetry/opentelemetry-collector-contrib/actions/runs/10828278572/job/30043431071?pr=35158#step:3:11)9.1-0.20240911162712-6c2697c4453c - go.opentelemetry.io/collector/connector/forwardconnector v0.109.0 + go.opentelemetry.io/collector/connector/forwardconnector v0.109.1-0.202409[11](https://github.com/open-telemetry/opentelemetry-collector-contrib/actions/runs/10828278572/job/30043431071?pr=35158#step:3:12)162712-6c2697c4453c go.opentelemetry.io/collector/consumer/consumertest v0.109.1-0.20240911162712-6c2697c4453c go.opentelemetry.io/collector/exporter v0.109.1-0.202409111627[12](https://github.com/open-telemetry/opentelemetry-collector-contrib/actions/runs/10828278572/job/30043431071?pr=35158#step:3:13)-6c2697c4453c go.opentelemetry.io/collector/exporter/debugexporter v0.109.1-0.20240911162712-6c2697c4453c go.opentelemetry.io/collector/exporter/nopexporter v0.109.0 go.opentelemetry.io/collector/exporter/otlpexporter v0.109.1-0.20240911162712-6c2697c4453c - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.109.0 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.109.1-0.20240911162712-6c2697c4453c go.opentelemetry.io/collector/extension v0.109.1-0.20240911162712-6c2697c4453c - go.opentelemetry.io/collector/extension/zpagesextension v0.109.0 + go.opentelemetry.io/collector/extension/zpagesextension v0.109.1-0.20240911162712-6c2697c4453c go.opentelemetry.io/collector/otelcol v0.109.1-0.20240911162712-6c2697c4453c go.opentelemetry.io/collector/pdata v1.[15](https://github.com/open-telemetry/opentelemetry-collector-contrib/actions/runs/10828278572/job/30043431071?pr=35158#step:3:16).1-0.20240911162712-6c2697c4453c go.opentelemetry.io/collector/processor v0.109.1-0.20240911162712-6c2697c4453c diff --git a/cmd/oteltestbedcol/go.mod b/cmd/oteltestbedcol/go.mod index 5b83548..50eba5c 100644 --- a/cmd/oteltestbedcol/go.mod +++ b/cmd/oteltestbedcol/go.mod @@ -42,17 +42,17 @@ require ( go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.109.0 go.opentelemetry.io/collector/connector v0.109.1-0.20240911[16](https://github.com/open-telemetry/opentelemetry-collector-contrib/actions/runs/10828278572/job/30043431071?pr=35158#step:3:17)2712-6c2697c4453c go.opentelemetry.io/collector/exporter v0.109.1-0.20240911162712-6c2697c4453c - go.opentelemetry.io/collector/exporter/debugexporter v0.109.0 - go.opentelemetry.io/collector/exporter/otlpexporter v0.109.0 - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.109.0 + go.opentelemetry.io/collector/exporter/debugexporter v0.109.1-0.20240911162712-6c2697c4453c + go.opentelemetry.io/collector/exporter/otlpexporter v0.109.1-0.[20](https://github.com/open-telemetry/opentelemetry-collector-contrib/actions/runs/10828278572/job/30043431071?pr=35158#step:3:21)240911162712-6c2697c4453c + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.109.1-0.20240911162712-6c2697c4453c go.opentelemetry.io/collector/extension v0.109.1-0.20240911162712-6c2697c4453c - go.opentelemetry.io/collector/extension/zpagesextension v0.109.0 + go.opentelemetry.io/collector/extension/zpagesextension v0.109.1-0.20240911162712-6c2697c4453c go.opentelemetry.io/collector/otelcol v0.109.1-0.20240911162712-6c2697c4453c go.opentelemetry.io/collector/processor v0.109.1-0.20[24](https://github.com/open-telemetry/opentelemetry-collector-contrib/actions/runs/10828278572/job/30043431071?pr=35158#step:3:25)0911162712-6c2697c4453c go.opentelemetry.io/collector/processor/batchprocessor v0.109.1-0.20240911162712-6c2697c4453c - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.109.0 + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.109.1-0.20240911162712-6c2697c4453c go.opentelemetry.io/collector/receiver v0.109.1-0.20240911162712-6c2697c4453c - go.opentelemetry.io/collector/receiver/otlpreceiver v0.109.0 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.109.1-0.20240911162712-6c2697c4453c go.uber.org/goleak v1.3.0 golang.org/x/sys v0.[25](https://github.com/open-telemetry/opentelemetry-collector-contrib/actions/runs/10828278572/job/30043431071?pr=35158#step:3:26).0 ) Error: Process completed with exit code 1. ```

A possibility is to run ./.github/workflows/scripts/check-collector-module-version.sh on make update-otel before make gotidy, and move its git diff check outside of the script.

mx-psi commented 2 weeks ago

A possibility is to run ./.github/workflows/scripts/check-collector-module-version.sh on make update-otel before make gotidy, and move its git diff check outside of the script.

This would need to be done before the builder manifests are updated