From 13fc3a99b4fe62a7ea38a6c1c7150e2990f6ce4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20R=C3=BCger?= Date: Fri, 17 Dec 2021 23:07:49 +0100 Subject: [PATCH] Add new go:build lines for go 1.17 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Manuel Rüger --- prometheus/collectors/dbstats_collector_go115.go | 3 ++- prometheus/collectors/dbstats_collector_pre_go115.go | 3 ++- prometheus/process_collector_other.go | 1 + prometheus/process_collector_test.go | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/prometheus/collectors/dbstats_collector_go115.go b/prometheus/collectors/dbstats_collector_go115.go index a6e6268ce..fbbe3dcb0 100644 --- a/prometheus/collectors/dbstats_collector_go115.go +++ b/prometheus/collectors/dbstats_collector_go115.go @@ -11,7 +11,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build go1.15 +//go:build !go1.13 || !go1.14 +// +build !go1.13 !go1.14 package collectors diff --git a/prometheus/collectors/dbstats_collector_pre_go115.go b/prometheus/collectors/dbstats_collector_pre_go115.go index 0568affe2..a0882388f 100644 --- a/prometheus/collectors/dbstats_collector_pre_go115.go +++ b/prometheus/collectors/dbstats_collector_pre_go115.go @@ -11,7 +11,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build !go1.15 +//go:build go1.13 || go1.14 +// +build go1.13 go1.14 package collectors diff --git a/prometheus/process_collector_other.go b/prometheus/process_collector_other.go index 3117461cd..2dc3660da 100644 --- a/prometheus/process_collector_other.go +++ b/prometheus/process_collector_other.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !windows // +build !windows package prometheus diff --git a/prometheus/process_collector_test.go b/prometheus/process_collector_test.go index 7b19c5e05..3a604aba9 100644 --- a/prometheus/process_collector_test.go +++ b/prometheus/process_collector_test.go @@ -11,6 +11,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build linux // +build linux package prometheus