Merge pull request #30 from mackerelio/go117

lufia · web-flow · commit 103e8e478406 · 2021-11-16T10:09:13.000+09:00
upgrade Go version: +1.17
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -5,21 +5,19 @@ on:
     branches:
     - master
   pull_request:
-env:
-  GO111MODULE: on
 jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
     - uses: golangci/golangci-lint-action@v2
       with:
-        version: v1.35
+        version: v1.43
   test:
     strategy:
       matrix:
-        os: ['ubuntu-18.04', 'macos-10.15', 'windows-2019']
-        go: ['1.16.x', '1.15.x', '1.14.x']
+        os: ['ubuntu-20.04', 'macos-11', 'windows-2019']
+        go: ['1.17.x', '1.16.x']
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2
diff --git a/cmd/osstat/cpu.go b/cmd/osstat/cpu.go
@@ -1,3 +1,4 @@
+//go:build linux || (darwin && cgo)
 // +build linux darwin,cgo
 
 package main
diff --git a/cmd/osstat/generator_darwin_cgo.go b/cmd/osstat/generator_darwin_cgo.go
@@ -1,3 +1,4 @@
+//go:build darwin && cgo
 // +build darwin,cgo
 
 package main
diff --git a/cmd/osstat/generator_darwin_nocgo.go b/cmd/osstat/generator_darwin_nocgo.go
@@ -1,3 +1,4 @@
+//go:build darwin && !cgo
 // +build darwin,!cgo
 
 package main
diff --git a/cmd/osstat/generator_unix.go b/cmd/osstat/generator_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows && !linux && !darwin
 // +build !windows,!linux,!darwin
 
 package main
diff --git a/cmd/osstat/generator_windows.go b/cmd/osstat/generator_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package main
diff --git a/cmd/osstat/loadavg_unix.go b/cmd/osstat/loadavg_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package main
diff --git a/cmd/osstat/memory_unix.go b/cmd/osstat/memory_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package main
diff --git a/cpu/cpu_darwin_cgo.go b/cpu/cpu_darwin_cgo.go
@@ -1,3 +1,4 @@
+//go:build darwin && cgo
 // +build darwin,cgo
 
 package cpu
diff --git a/cpu/cpu_darwin_nocgo.go b/cpu/cpu_darwin_nocgo.go
@@ -1,3 +1,4 @@
+//go:build darwin && !cgo
 // +build darwin,!cgo
 
 package cpu
diff --git a/cpu/cpu_darwin_test.go b/cpu/cpu_darwin_test.go
@@ -1,3 +1,4 @@
+//go:build darwin && cgo
 // +build darwin,cgo
 
 package cpu
diff --git a/cpu/cpu_linux.go b/cpu/cpu_linux.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package cpu
diff --git a/cpu/cpu_linux_test.go b/cpu/cpu_linux_test.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package cpu
diff --git a/cpu/cpu_other.go b/cpu/cpu_other.go
@@ -1,3 +1,4 @@
+//go:build !linux && !darwin
 // +build !linux,!darwin
 
 package cpu
diff --git a/loadavg/loadavg_bsd_nocgo.go b/loadavg/loadavg_bsd_nocgo.go
@@ -1,3 +1,4 @@
+//go:build (darwin || freebsd || netbsd || openbsd) && !cgo
 // +build darwin freebsd netbsd openbsd
 // +build !cgo
 
diff --git a/loadavg/loadavg_bsd_nocgo_test.go b/loadavg/loadavg_bsd_nocgo_test.go
@@ -1,3 +1,4 @@
+//go:build (darwin || freebsd || netbsd || openbsd) && !cgo
 // +build darwin freebsd netbsd openbsd
 // +build !cgo
 
diff --git a/loadavg/loadavg_unix.go b/loadavg/loadavg_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows && cgo
 // +build !windows,cgo
 
 package loadavg
diff --git a/loadavg/loadavg_unix_nocgo.go b/loadavg/loadavg_unix_nocgo.go
@@ -1,3 +1,4 @@
+//go:build linux && !cgo
 // +build linux,!cgo
 
 package loadavg
diff --git a/loadavg/loadavg_unix_test.go b/loadavg/loadavg_unix_test.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package loadavg
diff --git a/loadavg/loadavg_windows.go b/loadavg/loadavg_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package loadavg
diff --git a/loadavg/loadavg_windows_test.go b/loadavg/loadavg_windows_test.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package loadavg
diff --git a/memory/memory_darwin.go b/memory/memory_darwin.go
@@ -1,3 +1,4 @@
+//go:build darwin
 // +build darwin
 
 package memory
@@ -32,7 +33,8 @@ func Get() (*Stats, error) {
 	}
 	memory, err := collectMemoryStats(out)
 	if err != nil {
-		go cmd.Wait()
+		// it is needed to cleanup the process, but its result is not needed.
+		go cmd.Wait() //nolint:errcheck
 		return nil, err
 	}
 	if err := cmd.Wait(); err != nil {
diff --git a/memory/memory_darwin_test.go b/memory/memory_darwin_test.go
@@ -1,3 +1,4 @@
+//go:build darwin
 // +build darwin
 
 package memory
diff --git a/memory/memory_freebsd.go b/memory/memory_freebsd.go
@@ -1,3 +1,4 @@
+//go:build freebsd
 // +build freebsd
 
 package memory
diff --git a/memory/memory_freebsd_test.go b/memory/memory_freebsd_test.go
@@ -1,3 +1,4 @@
+//go:build freebsd
 // +build freebsd
 
 package memory
diff --git a/memory/memory_linux.go b/memory/memory_linux.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package memory
diff --git a/memory/memory_linux_test.go b/memory/memory_linux_test.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package memory
diff --git a/memory/memory_other.go b/memory/memory_other.go
@@ -1,3 +1,4 @@
+//go:build !linux && !darwin && !windows && !freebsd
 // +build !linux,!darwin,!windows,!freebsd
 
 package memory
diff --git a/memory/memory_windows.go b/memory/memory_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package memory
diff --git a/memory/memory_windows_test.go b/memory/memory_windows_test.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package memory
diff --git a/network/network_bsd.go b/network/network_bsd.go
@@ -1,3 +1,4 @@
+//go:build darwin || freebsd || netbsd
 // +build darwin freebsd netbsd
 
 package network
@@ -29,7 +30,8 @@ func Get() ([]Stats, error) {
 	}
 	networks, err := collectNetworkStats(out)
 	if err != nil {
-		go cmd.Wait()
+		// it is needed to cleanup the process, but its result is not needed.
+		go cmd.Wait() //nolint:errcheck
 		return nil, err
 	}
 	if err := cmd.Wait(); err != nil {
diff --git a/network/network_bsd_test.go b/network/network_bsd_test.go
@@ -1,3 +1,4 @@
+//go:build darwin || freebsd || netbsd
 // +build darwin freebsd netbsd
 
 package network
diff --git a/network/network_linux.go b/network/network_linux.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package network
diff --git a/network/network_linux_test.go b/network/network_linux_test.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package network
diff --git a/network/network_other.go b/network/network_other.go
@@ -1,3 +1,4 @@
+//go:build !linux && !darwin && !freebsd && !netbsd
 // +build !linux,!darwin,!freebsd,!netbsd
 
 package network
diff --git a/uptime/uptime_bsd.go b/uptime/uptime_bsd.go
@@ -1,3 +1,4 @@
+//go:build darwin || freebsd || netbsd || openbsd
 // +build darwin freebsd netbsd openbsd
 
 package uptime
@@ -22,5 +23,5 @@ func get() (time.Duration, error) {
 	}
 	timeval = *(*syscall.Timeval)(unsafe.Pointer(&out[0]))
 	sec, nsec := timeval.Unix()
-	return time.Now().Sub(time.Unix(sec, nsec)), nil
+	return time.Since(time.Unix(sec, nsec)), nil
 }
diff --git a/uptime/uptime_linux.go b/uptime/uptime_linux.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package uptime
diff --git a/uptime/uptime_windows.go b/uptime/uptime_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package uptime

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+//go:build linux \|\| (darwin && cgo)`
`1`	`2`	`// +build linux darwin,cgo`
`2`	`3`
`3`	`4`	`package main`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+//go:build darwin && cgo`
`1`	`2`	`// +build darwin,cgo`
`2`	`3`
`3`	`4`	`package main`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+//go:build darwin && !cgo`
`1`	`2`	`// +build darwin,!cgo`
`2`	`3`
`3`	`4`	`package main`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+//go:build !windows && !linux && !darwin`
`1`	`2`	`// +build !windows,!linux,!darwin`
`2`	`3`
`3`	`4`	`package main`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+//go:build windows`
`1`	`2`	`// +build windows`
`2`	`3`
`3`	`4`	`package main`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+//go:build !windows`
`1`	`2`	`// +build !windows`
`2`	`3`
`3`	`4`	`package main`