From e2b987596b78804861134954fa491599f32b3d1d Mon Sep 17 00:00:00 2001 From: bwplotka Date: Tue, 4 Mar 2025 14:01:32 +0000 Subject: [PATCH] Fix ios build. Signed-off-by: bwplotka --- CHANGELOG.md | 1 + prometheus/process_collector_darwin.go | 2 ++ ...lector_cgo_darwin.c => process_collector_mem_cgo_darwin.c} | 2 +- ...ctor_cgo_darwin.go => process_collector_mem_cgo_darwin.go} | 2 +- ..._nocgo_darwin.go => process_collector_mem_nocgo_darwin.go} | 2 +- ...lector_wasip1_js.go => process_collector_not_supported.go} | 4 ++-- ..._collector_other.go => process_collector_procfsenabled.go} | 0 7 files changed, 8 insertions(+), 5 deletions(-) rename prometheus/{process_collector_cgo_darwin.c => process_collector_mem_cgo_darwin.c} (98%) rename prometheus/{process_collector_cgo_darwin.go => process_collector_mem_cgo_darwin.go} (97%) rename prometheus/{process_collector_nocgo_darwin.go => process_collector_mem_nocgo_darwin.go} (97%) rename prometheus/{process_collector_wasip1_js.go => process_collector_not_supported.go} (95%) rename prometheus/{process_collector_other.go => process_collector_procfsenabled.go} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e2519dd4..dcbb1a07c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## 1.21.1 / 2025-03-04 * [BUGFIX] prometheus: Revert of `Inc`, `Add` and `Observe` cumulative metric CAS optimizations (#1661), causing regressions on low contention cases. +* [BUGFIX] prometheus: Fix GOOS=ios build, broken due to process_collector_* wrong build tags. ## 1.21.0 / 2025-02-17 diff --git a/prometheus/process_collector_darwin.go b/prometheus/process_collector_darwin.go index 50eb860a6..0a61b9846 100644 --- a/prometheus/process_collector_darwin.go +++ b/prometheus/process_collector_darwin.go @@ -11,6 +11,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build darwin && !ios + package prometheus import ( diff --git a/prometheus/process_collector_cgo_darwin.c b/prometheus/process_collector_mem_cgo_darwin.c similarity index 98% rename from prometheus/process_collector_cgo_darwin.c rename to prometheus/process_collector_mem_cgo_darwin.c index 1554f674d..d00a24315 100644 --- a/prometheus/process_collector_cgo_darwin.c +++ b/prometheus/process_collector_mem_cgo_darwin.c @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build darwin && cgo +//go:build darwin && !ios && cgo #include #include diff --git a/prometheus/process_collector_cgo_darwin.go b/prometheus/process_collector_mem_cgo_darwin.go similarity index 97% rename from prometheus/process_collector_cgo_darwin.go rename to prometheus/process_collector_mem_cgo_darwin.go index b375c3a77..9ac53f999 100644 --- a/prometheus/process_collector_cgo_darwin.go +++ b/prometheus/process_collector_mem_cgo_darwin.go @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build darwin && cgo +//go:build darwin && !ios && cgo package prometheus diff --git a/prometheus/process_collector_nocgo_darwin.go b/prometheus/process_collector_mem_nocgo_darwin.go similarity index 97% rename from prometheus/process_collector_nocgo_darwin.go rename to prometheus/process_collector_mem_nocgo_darwin.go index 516504731..8ddb0995d 100644 --- a/prometheus/process_collector_nocgo_darwin.go +++ b/prometheus/process_collector_mem_nocgo_darwin.go @@ -11,7 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build darwin && !cgo +//go:build darwin && !ios && !cgo package prometheus diff --git a/prometheus/process_collector_wasip1_js.go b/prometheus/process_collector_not_supported.go similarity index 95% rename from prometheus/process_collector_wasip1_js.go rename to prometheus/process_collector_not_supported.go index c68f7f851..7732b7f37 100644 --- a/prometheus/process_collector_wasip1_js.go +++ b/prometheus/process_collector_not_supported.go @@ -11,8 +11,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build wasip1 || js -// +build wasip1 js +//go:build wasip1 || js || ios +// +build wasip1 js ios package prometheus diff --git a/prometheus/process_collector_other.go b/prometheus/process_collector_procfsenabled.go similarity index 100% rename from prometheus/process_collector_other.go rename to prometheus/process_collector_procfsenabled.go