From 187a01bd390ef8ee547022a7ede600e2235af792 Mon Sep 17 00:00:00 2001 From: Mitch Zhu Date: Fri, 21 Aug 2026 18:43:41 +0000 Subject: [PATCH] fix(golang): prune unused OpenTelemetry packages Remove the unconsumed OpenTelemetry contrib component and OTel exporters, examples, and test helpers that create cycles through gRPC and retired golang-prometheus providers. Retain the OTel API and SDK capabilities consumed by Azure Linux. Signed-off-by: Mitch Zhu --- base/comps/component-check-disablement.toml | 1 - base/comps/components.toml | 2 - .../golang-opentelemetry-otel.comp.toml | 1 + ...unused-exporters-and-examples.overlay.toml | 24 +++ locks/golang-opentelemetry-contrib.lock | 7 - locks/golang-opentelemetry-otel.lock | 2 +- .../golang-opentelemetry-contrib.spec | 158 ------------------ specs/g/golang-opentelemetry-contrib/sources | 1 - .../golang-opentelemetry-otel.spec | 15 +- 9 files changed, 40 insertions(+), 171 deletions(-) create mode 100644 base/comps/golang-opentelemetry-otel/golang-opentelemetry-otel.comp.toml create mode 100644 base/comps/golang-opentelemetry-otel/overlays/0001-drop-unused-exporters-and-examples.overlay.toml delete mode 100644 locks/golang-opentelemetry-contrib.lock delete mode 100644 specs/g/golang-opentelemetry-contrib/golang-opentelemetry-contrib.spec delete mode 100644 specs/g/golang-opentelemetry-contrib/sources diff --git a/base/comps/component-check-disablement.toml b/base/comps/component-check-disablement.toml index 4f3b9e5db9e..549032156b6 100644 --- a/base/comps/component-check-disablement.toml +++ b/base/comps/component-check-disablement.toml @@ -66,7 +66,6 @@ components = [ "golang-k8s-kube-openapi", "golang-k8s-utils", "golang-mongodb-mongo-driver", - "golang-opentelemetry-contrib", "golang-opentelemetry-otel", "golang-sigs-k8s-structured-merge-diff", "golang-x-crypto", diff --git a/base/comps/components.toml b/base/comps/components.toml index eb444ed1899..554920892fb 100644 --- a/base/comps/components.toml +++ b/base/comps/components.toml @@ -1050,8 +1050,6 @@ overlay-files = ["overlays/*.overlay.toml"] [components.golang-modernc-memory] [components.golang-modernc-sqlite] [components.golang-opencensus] -[components.golang-opentelemetry-contrib] -[components.golang-opentelemetry-otel] [components.golang-opentelemetry-proto] [components.golang-rsc-pdf] [components.golang-sigs-k8s-structured-merge-diff] diff --git a/base/comps/golang-opentelemetry-otel/golang-opentelemetry-otel.comp.toml b/base/comps/golang-opentelemetry-otel/golang-opentelemetry-otel.comp.toml new file mode 100644 index 00000000000..36877e7bd58 --- /dev/null +++ b/base/comps/golang-opentelemetry-otel/golang-opentelemetry-otel.comp.toml @@ -0,0 +1 @@ +[components.golang-opentelemetry-otel] diff --git a/base/comps/golang-opentelemetry-otel/overlays/0001-drop-unused-exporters-and-examples.overlay.toml b/base/comps/golang-opentelemetry-otel/overlays/0001-drop-unused-exporters-and-examples.overlay.toml new file mode 100644 index 00000000000..f2e05947bae --- /dev/null +++ b/base/comps/golang-opentelemetry-otel/overlays/0001-drop-unused-exporters-and-examples.overlay.toml @@ -0,0 +1,24 @@ +# Azure Linux has no RPM consumers of these exporters, examples, or test +# helpers. Keeping them creates build cycles through OpenTelemetry contrib, +# gRPC, OpenCensus, Zipkin, and the retired Prometheus/conntrack chain. + +[metadata] +category = "azl-pruning" +upstream-status = "inapplicable" + +[[overlays]] +description = "Drop unused OpenTelemetry exporters and examples" +type = "spec-search-replace" +section = "%prep" +regex = '^%goprep -A$' +replacement = '''%goprep -A + +rm -r \ + bridge/opentracing/test \ + example/dice \ + example/otel-collector \ + example/opencensus \ + example/prometheus \ + exporters/otlp \ + exporters/prometheus \ + exporters/zipkin''' diff --git a/locks/golang-opentelemetry-contrib.lock b/locks/golang-opentelemetry-contrib.lock deleted file mode 100644 index 67ca347bbcb..00000000000 --- a/locks/golang-opentelemetry-contrib.lock +++ /dev/null @@ -1,7 +0,0 @@ -# Managed by azldev component update. Do not edit manually. -version = 1 -import-commit = '439b50c76ac22d5106130e5937b6772d32a7fd20' -upstream-commit = '439b50c76ac22d5106130e5937b6772d32a7fd20' -manual-bump = 2 -input-fingerprint = 'sha256:ccb3d39911487be9e29eaf7f83de1052e3e5d2c48eabfd845fe5dfaf5fc14ea3' -resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e' diff --git a/locks/golang-opentelemetry-otel.lock b/locks/golang-opentelemetry-otel.lock index a362879cafc..2998cd4f894 100644 --- a/locks/golang-opentelemetry-otel.lock +++ b/locks/golang-opentelemetry-otel.lock @@ -3,5 +3,5 @@ version = 1 import-commit = '56d3a5ab53858473fc6eb30548bb1b3fa8b2bf66' upstream-commit = '56d3a5ab53858473fc6eb30548bb1b3fa8b2bf66' manual-bump = 2 -input-fingerprint = 'sha256:447537c38d29cdf2d40fc35f6063a505bc91e4c48fb2ef7290e2c40644261829' +input-fingerprint = 'sha256:b184ac5b0fe566f3ed378d92f384ddb323444906323fac93673c61b7f64612a6' resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e' diff --git a/specs/g/golang-opentelemetry-contrib/golang-opentelemetry-contrib.spec b/specs/g/golang-opentelemetry-contrib/golang-opentelemetry-contrib.spec deleted file mode 100644 index 8c0b7a1897f..00000000000 --- a/specs/g/golang-opentelemetry-contrib/golang-opentelemetry-contrib.spec +++ /dev/null @@ -1,158 +0,0 @@ -## START: Set by rpmautospec -## (rpmautospec version 0.8.3) -## RPMAUTOSPEC: autorelease, autochangelog -%define autorelease(e:s:pb:n) %{?-p:0.}%{lua: - release_number = 8; - base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); - print(release_number + base_release_number - 1); -}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} -## END: Set by rpmautospec - -# This spec file has been modified by azldev to include build configuration overlays. -# Do not edit manually; changes may be overwritten. - -# Generated by go2rpm 1.14.0 -%bcond check 1 -%bcond bootstrap 0 - -%global debug_package %{nil} - -%if %{with bootstrap} -%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^golang\\(.*\\)$ -%endif - -# https://github.com/open-telemetry/opentelemetry-go-contrib -%global goipath go.opentelemetry.io/contrib -%global forgeurl https://github.com/open-telemetry/opentelemetry-go-contrib -Version: 1.28.0 - -%gometa -L - -%global common_description %{expand: -Collection of extensions for OpenTelemetry-Go.} - -%global golicenses LICENSE -%global godocs README.md RELEASING.md CHANGELOG.md CONTRIBUTING.md - -Name: golang-opentelemetry-contrib -Release: %autorelease -Summary: Collection of extensions for OpenTelemetry-Go - -License: Apache-2.0 -URL: %{gourl} -Source: %{gosource} - -%description %{common_description} - -%gopkg - -%prep -%goprep -A -%autopatch -p1 - -rm -rfv instrumentation/github.com/astaxie/beego/ -# examples are not packaged -rm -rvf propagators/opencensus/examples -# drop until github.com/GoogleCloudPlatform/opentelemetry-operations-go is packaged -rm -rvf detectors/gcp - -# Remove deprectaed opencensus -rm -rvf propagators/opencensus/ - -%if %{without bootstrap} -%generate_buildrequires -%go_generate_buildrequires -%endif - -%install -%gopkginstall - -%if %{without bootstrap} -%if %{with check} -%check -# Check section disabled: Disabling checks for initial set of failures. -exit 0 - -for test in "TestDefaultConfig" "TestPartialUserProvidedConfig" \ -; do -awk -i inplace '/^func.*'"$test"'\(/ { print; print "\tt.Skip(\"disabled failing test\")"; next}1' $(grep -rl $test) -done -%ifarch s390x -%gocheck -t instrumentation -d go.opentelemetry.io/contrib/instrgen/driver -d go.opentelemetry.io/contrib/samplers/probability/consistent -%else -%gocheck -t instrumentation -d go.opentelemetry.io/contrib/instrgen/driver -%endif -%endif -%endif - -%gopkgfiles - -%changelog -## START: Generated by rpmautospec -* Wed Aug 19 2026 reuben olinsky - 1.28.0-8 -- build: mass rebuild auto-bumpable components - -* Wed Aug 19 2026 reuben olinsky - 1.28.0-7 -- build: mass rebuild auto-bumpable components - -* Thu Apr 30 2026 Daniel McIlvaney - 1.28.0-6 -- feat: introduce deterministic commit resolution via Azure Linux lock file - -* Thu Jul 24 2025 Fedora Release Engineering - 1.28.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Fri Jan 17 2025 Fedora Release Engineering - 1.28.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Mon Aug 05 2024 Mikel Olasagasti Uranga - 1.28.0-3 -- Skip failing test on s390x - -* Mon Aug 05 2024 Mikel Olasagasti Uranga - 1.28.0-2 -- Skip failing test on s390x - -* Mon Aug 05 2024 Mikel Olasagasti Uranga - 1.28.0-1 -- Update to 1.28.0 - Closes rhbz#2300811 - -* Thu Jul 18 2024 Fedora Release Engineering - 1.27.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Jul 01 2024 Robert-André Mauchin - 1.27.0-1 -- Update to 1.27.0 - -* Wed Apr 17 2024 Mikel Olasagasti Uranga - 1.17.0-2 -- Unbootstrap - -* Wed Apr 17 2024 Mikel Olasagasti Uranga - 1.17.0-1 -- Update to 1.17.0 - Closes rhbz#2254147 - -* Mon Apr 15 2024 Mikel Olasagasti Uranga - 1.10.0-8 -- Fix FTBFS - Closes rhbz#2225893 - -* Wed Jan 24 2024 Fedora Release Engineering - 1.10.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jan 20 2024 Fedora Release Engineering - 1.10.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Jul 20 2023 Fedora Release Engineering - 1.10.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 1.10.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sun Oct 09 2022 Robert-André Mauchin - 1.10.0-3 -- Remove astaxie/beego - -* Sun Oct 09 2022 Robert-André Mauchin - 1.10.0-2 -- Unbootstrap - -* Sun Sep 25 2022 Robert-André Mauchin - 1.10.0-1 -- Update to 1.10.0 - -* Sun Jan 30 2022 Robert-André Mauchin 1.3.0-2 -- Uncommitted changes - -* Sun Jan 30 2022 Robert-André Mauchin 1.3.0-1 -- Initial release - -## END: Generated by rpmautospec diff --git a/specs/g/golang-opentelemetry-contrib/sources b/specs/g/golang-opentelemetry-contrib/sources deleted file mode 100644 index 8b99665fc6a..00000000000 --- a/specs/g/golang-opentelemetry-contrib/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (opentelemetry-go-contrib-1.28.0.tar.gz) = 7e055bc9804c01588e37f1470970f1da5a98fbc46ff66704066bbbb9b2267d533d79e0e09d10ebacc1ffb1ea1b0c40c90b93f80f85811c0e6255ec2c3fad8c79 diff --git a/specs/g/golang-opentelemetry-otel/golang-opentelemetry-otel.spec b/specs/g/golang-opentelemetry-otel/golang-opentelemetry-otel.spec index 4c69daad8d7..9e9b7b69b84 100644 --- a/specs/g/golang-opentelemetry-otel/golang-opentelemetry-otel.spec +++ b/specs/g/golang-opentelemetry-otel/golang-opentelemetry-otel.spec @@ -2,7 +2,7 @@ ## (rpmautospec version 0.8.3) ## RPMAUTOSPEC: autorelease, autochangelog %define autorelease(e:s:pb:n) %{?-p:0.}%{lua: - release_number = 8; + release_number = 9; base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); print(release_number + base_release_number - 1); }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} @@ -50,6 +50,16 @@ Patch: 0001-Restore-jaeger-for-otel-1.28-and-removed-from-1.17.patch %prep %goprep -A + +rm -r \ + bridge/opentracing/test \ + example/dice \ + example/otel-collector \ + example/opencensus \ + example/prometheus \ + exporters/otlp \ + exporters/prometheus \ + exporters/zipkin %autopatch -p1 # OpenCensus is deprecated upstream @@ -81,6 +91,9 @@ done %changelog ## START: Generated by rpmautospec +* Fri Aug 21 2026 Mitch Zhu - 1.28.0-9 +- fix(golang): prune unused OpenTelemetry packages + * Wed Aug 19 2026 reuben olinsky - 1.28.0-8 - build: mass rebuild auto-bumpable components