go1.17 gofmt

bobbypage · bobbypage · commit 4449be7455e7 · 2021-08-25T14:25:23.000-07:00
diff --git a/cmd/internal/storage/influxdb/influxdb_test.go b/cmd/internal/storage/influxdb/influxdb_test.go
@@ -12,7 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build influxdb_test
 // +build influxdb_test
+
 // To run unit test: go test -tags influxdb_test
 
 package influxdb
diff --git a/fs/fs.go b/fs/fs.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build linux
 // +build linux
 
 // Provides Filesystem Stats
diff --git a/integration/tests/api/perf_test.go b/integration/tests/api/perf_test.go
@@ -1,3 +1,4 @@
+//go:build libpfm && cgo
 // +build libpfm,cgo
 
 // Copyright 2020 Google Inc. All Rights Reserved.
diff --git a/machine/operatingsystem_unix.go b/machine/operatingsystem_unix.go
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build freebsd || darwin || linux
 // +build freebsd darwin linux
 
 package machine
diff --git a/nvm/machine_libipmctl.go b/nvm/machine_libipmctl.go
@@ -1,3 +1,4 @@
+//go:build libipmctl && cgo
 // +build libipmctl,cgo
 
 // Copyright 2020 Google Inc. All Rights Reserved.
diff --git a/nvm/machine_no_libipmctl.go b/nvm/machine_no_libipmctl.go
@@ -1,3 +1,4 @@
+//go:build !libipmctl || !cgo
 // +build !libipmctl !cgo
 
 // Copyright 2020 Google Inc. All Rights Reserved.
diff --git a/perf/collector_libpfm.go b/perf/collector_libpfm.go
@@ -1,3 +1,4 @@
+//go:build libpfm && cgo
 // +build libpfm,cgo
 
 // Copyright 2020 Google Inc. All Rights Reserved.
diff --git a/perf/collector_libpfm_test.go b/perf/collector_libpfm_test.go
@@ -1,3 +1,4 @@
+//go:build libpfm && cgo
 // +build libpfm,cgo
 
 // Copyright 2020 Google Inc. All Rights Reserved.
diff --git a/perf/collector_no_libpfm.go b/perf/collector_no_libpfm.go
@@ -1,3 +1,4 @@
+//go:build !libpfm || !cgo
 // +build !libpfm !cgo
 
 // Copyright 2020 Google Inc. All Rights Reserved.
diff --git a/perf/manager_libpfm.go b/perf/manager_libpfm.go
@@ -1,3 +1,4 @@
+//go:build libpfm && cgo
 // +build libpfm,cgo
 
 // Copyright 2020 Google Inc. All Rights Reserved.
diff --git a/perf/manager_libpfm_test.go b/perf/manager_libpfm_test.go
@@ -1,3 +1,4 @@
+//go:build libpfm && cgo
 // +build libpfm,cgo
 
 // Copyright 2020 Google Inc. All Rights Reserved.
diff --git a/perf/manager_no_libpfm.go b/perf/manager_no_libpfm.go
@@ -1,3 +1,4 @@
+//go:build !libpfm || !cgo
 // +build !libpfm !cgo
 
 // Copyright 2020 Google Inc. All Rights Reserved.
diff --git a/perf/types_libpfm.go b/perf/types_libpfm.go
@@ -1,3 +1,4 @@
+//go:build libpfm && cgo
 // +build libpfm,cgo
 
 // Copyright 2020 Google Inc. All Rights Reserved.
diff --git a/perf/uncore_libpfm.go b/perf/uncore_libpfm.go
@@ -1,3 +1,4 @@
+//go:build libpfm && cgo
 // +build libpfm,cgo
 
 // Copyright 2020 Google Inc. All Rights Reserved.
diff --git a/perf/uncore_libpfm_test.go b/perf/uncore_libpfm_test.go
@@ -1,3 +1,4 @@
+//go:build libpfm && cgo
 // +build libpfm,cgo
 
 // Copyright 2020 Google Inc. All Rights Reserved.
diff --git a/resctrl/collector.go b/resctrl/collector.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 // Copyright 2020 Google Inc. All Rights Reserved.
diff --git a/resctrl/manager.go b/resctrl/manager.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 // Copyright 2020 Google Inc. All Rights Reserved.
diff --git a/utils/sysfs/sysfs_notx86.go b/utils/sysfs/sysfs_notx86.go
@@ -1,3 +1,4 @@
+//go:build !x86
 // +build !x86
 
 // Copyright 2021 Google Inc. All Rights Reserved.
diff --git a/utils/sysfs/sysfs_x86.go b/utils/sysfs/sysfs_x86.go
@@ -1,3 +1,4 @@
+//go:build x86
 // +build x86
 
 // Copyright 2021 Google Inc. All Rights Reserved.

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+//go:build libpfm && cgo`
`1`	`2`	`// +build libpfm,cgo`
`2`	`3`
`3`	`4`	`// Copyright 2020 Google Inc. All Rights Reserved.`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+//go:build libipmctl && cgo`
`1`	`2`	`// +build libipmctl,cgo`
`2`	`3`
`3`	`4`	`// Copyright 2020 Google Inc. All Rights Reserved.`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+//go:build !libipmctl \|\| !cgo`
`1`	`2`	`// +build !libipmctl !cgo`
`2`	`3`
`3`	`4`	`// Copyright 2020 Google Inc. All Rights Reserved.`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+//go:build !libpfm \|\| !cgo`
`1`	`2`	`// +build !libpfm !cgo`
`2`	`3`
`3`	`4`	`// Copyright 2020 Google Inc. All Rights Reserved.`