Merge pull request #950 from mrueg/go-1.17

Add support for go 1.17
prometheus · Dec 20, 2021 · 1d09783 · 1d09783
2 parents 6d5cf25 + 8535b62
commit 1d09783
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 2 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -63,6 +63,8 @@ workflows:
           name: go-1-16
           go_version: "1.16"
           run_lint: true
-          # Style and unused/missing packages are only checked against
-          # the latest supported Go version.
+      - test:
+          name: go-1-17
+          go_version: "1.17"
+          run_lint: true
           run_style_and_unused: true
diff --git a/prometheus/collectors/dbstats_collector_go115.go b/prometheus/collectors/dbstats_collector_go115.go
@@ -11,6 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build go1.15
 // +build go1.15
 
 package collectors

diff --git a/prometheus/collectors/dbstats_collector_pre_go115.go b/prometheus/collectors/dbstats_collector_pre_go115.go
@@ -11,6 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !go1.15
 // +build !go1.15
 
 package collectors

diff --git 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
@@ -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