Fix ios build. (#1758)

Signed-off-by: bwplotka <[email protected]>
prometheus · Mar 4, 2025 · 8a42da3 · 8a42da3
1 parent 40c62f7
commit 8a42da3
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 5 deletions.
diff --git 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
@@ -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 → ...etheus/process_collector_mem_cgo_darwin.c b/prometheus/process_collector_cgo_darwin.c → ...etheus/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 <mach/mach_init.h>
 #include <mach/task.h>

diff --git a/prometheus/process_collector_cgo_darwin.go → ...theus/process_collector_mem_cgo_darwin.go b/prometheus/process_collector_cgo_darwin.go → ...theus/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 → ...eus/process_collector_mem_nocgo_darwin.go b/prometheus/process_collector_nocgo_darwin.go → ...eus/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 → ...etheus/process_collector_not_supported.go b/prometheus/process_collector_wasip1_js.go → ...etheus/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 → ...etheus/process_collector_procfsenabled.go b/prometheus/process_collector_other.go → ...etheus/process_collector_procfsenabled.go