Merge pull request #9254 from prometheus/superq/go1.17

Build with Go 1.17 / npm 7 / node 16

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2.1
 
 orbs:
   prometheus: prometheus/prometheus@0.11.0
-  go: circleci/go@0.2.0
+  go: circleci/go@1.7.0
   win: circleci/windows@2.3.0
 
 executors:
@@ -11,10 +11,10 @@ executors:
   # should also be updated.
   golang:
     docker:
-      - image: circleci/golang:1.16-node
+      - image: quay.io/prometheus/golang-builder:1.17-base
   golang_115:
     docker:
-      - image: circleci/golang:1.15-node
+      - image: quay.io/prometheus/golang-builder:1.15-base
 
 jobs:
   test_go:
@@ -24,8 +24,6 @@ jobs:
       - prometheus/setup_environment
       - go/load-cache:
           key: v1
-      - run:
-          command: sudo apt-get install -y yamllint
       - run:
           command: make GO_ONLY=1
           environment:
@@ -116,8 +114,6 @@ jobs:
       - run:
           command: jb install
           working_directory: ~/project/documentation/prometheus-mixin
-      - run:
-          command: sudo apt-get install -y yamllint
       - run:
           command: make
           working_directory: ~/project/documentation/prometheus-mixin
@@ -129,8 +125,6 @@ jobs:
     executor: golang
     steps:
       - checkout
-      - run: mkdir -v -p "${PATH%%:*}" && curl -sL --fail https://github.com/mikefarah/yq/releases/download/v4.6.3/yq_linux_amd64 -o "${PATH%%:*}/yq" && chmod -v +x "${PATH%%:*}/yq"
-      - run: sha256sum -c <(echo "c4343783c3361495c0d6d1eb742bba7432aa65e13e9fb8d7e201d544bcf14246 ${PATH%%:*}/yq")
       - run: ./scripts/sync_repo_files.sh
 
 workflows:

.promu.yml

@@ -1,7 +1,7 @@
 go:
     # Whenever the Go version is updated here,
     # .circle/config.yml should also be updated.
-    version: 1.16
+    version: 1.17
 repository:
     path: github.com/prometheus/prometheus
 build:

cmd/prometheus/main_unix_test.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 main

config/config_default_test.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 config

documentation/prometheus-mixin/tools.go

@@ -12,7 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//+build tools
+//go:build tools
+// +build tools
 
 // Package tools tracks dependencies for tools that used in the build process.
 // See https://github.com/golang/go/issues/25922

pkg/runtime/limits_default.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 runtime

pkg/runtime/limits_windows.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 runtime

pkg/runtime/statfs.go

@@ -11,6 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build openbsd || windows || netbsd || solaris
 // +build openbsd windows netbsd solaris
 
 package runtime

pkg/runtime/statfs_default.go

@@ -11,8 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build !windows,!openbsd,!netbsd,!solaris
-// +build !386
+//go:build !windows && !openbsd && !netbsd && !solaris && !386
+// +build !windows,!openbsd,!netbsd,!solaris,!386
 
 package runtime
 

pkg/runtime/statfs_linux_386.go

@@ -11,6 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build linux && 386
 // +build linux,386
 
 package runtime

pkg/runtime/statfs_uint32.go

@@ -11,6 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build (386 && darwin) || (386 && freebsd)
 // +build 386,darwin 386,freebsd
 
 package runtime

pkg/runtime/uname_default.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 runtime

pkg/runtime/vmlimits_default.go

@@ -11,8 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build !windows
-// +build !openbsd
+//go:build !windows && !openbsd
+// +build !windows,!openbsd
 
 package runtime
 

pkg/runtime/vmlimits_openbsd.go

@@ -11,6 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build openbsd
 // +build openbsd
 
 package runtime

promql/fuzz.go

@@ -12,6 +12,7 @@
 // limitations under the License.
 
 // Only build when go-fuzz is in use
+//go:build gofuzz
 // +build gofuzz
 
 package promql

scripts/tools.go

@@ -11,6 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build tools
 // +build tools
 
 // Package tools tracks dependencies for tools that are required to generate the protobuf code.

tsdb/chunks/head_chunks_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 chunks

tsdb/fileutil/dir_unix.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !windows
 // +build !windows
 
 package fileutil

tsdb/fileutil/dir_windows.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build windows
 // +build windows
 
 package fileutil

tsdb/fileutil/flock_solaris.go

@@ -11,6 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build solaris
 // +build solaris
 
 package fileutil

tsdb/fileutil/flock_unix.go

@@ -11,6 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd
 // +build darwin dragonfly freebsd linux netbsd openbsd
 
 package fileutil

tsdb/fileutil/mmap_386.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 fileutil

tsdb/fileutil/mmap_amd64.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 fileutil

tsdb/fileutil/mmap_unix.go

@@ -11,6 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !windows && !plan9
 // +build !windows,!plan9
 
 package fileutil

tsdb/fileutil/preallocate_other.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !linux && !darwin
 // +build !linux,!darwin
 
 package fileutil

tsdb/fileutil/sync.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !linux && !darwin
 // +build !linux,!darwin
 
 package fileutil

tsdb/fileutil/sync_darwin.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build darwin
 // +build darwin
 
 package fileutil

tsdb/fileutil/sync_linux.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build linux
 // +build linux
 
 package fileutil

tsdb/goversion/goversion.go

@@ -11,6 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build go1.12
 // +build go1.12
 
 // Package goversion enforces the go version supported by the tsdb module.

tsdb/wal_test.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 tsdb

web/ui/assets_generate.go

@@ -11,6 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build ignore
 // +build ignore
 
 package main

web/ui/ui.go

@@ -11,6 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !builtinassets
 // +build !builtinassets
 
 package ui