[GO] update to go1.22 (#4291)

* [GO] update to go1.22 * update buildkite pipelines * Update golang version in Dockerfile * Update all buildkite pipelines to use go1.22.x * Update go version in Dockerfile * Cleanup envvar setting in buildkite pipelines * Update golangci-lint to go1.22 * update golangci-lint * update golangci-lint * gosimple lint fixes * fix staticcheck printf style statement * fix lint * run gci to fix lint for import order * fix gofmt lint * exclude comments from lll linter * fix lll lint * remove redundant lll section from golangci-lint * fix goconst lint * fix goconst lint * fix goconst lint
m3db · Aug 14, 2024 · dfdaf62 · dfdaf62
1 parent 493ffef
commit dfdaf62
Show file tree

Hide file tree

Showing 1,164 changed files with 3,901 additions and 3,669 deletions.
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -48,14 +48,16 @@ common: &common
 # Temporarily disable codecov while we investigate issues with uploading.
 env:
   SKIP_CODECOV: "true"
+  CGO_ENABLED: 0
+  GIMME_GO_VERSION: 1.22.x
 
 # Buildkite pipeline is currently broken, and we are working on fixing it. In the meantime, we are temporarily
 # disabling steps until it is fixed. ISSUE: https://github.com/m3db/m3/issues/4274
 steps:
 #  - name: "Codegen"
 #    env:
 #      CGO_ENABLED: 0
-#      GIMME_GO_VERSION: 1.18.x
+#      GIMME_GO_VERSION: 1.22.x
 #    plugins:
 #      gopath-checkout#v1.0.1:
 #        import: github.com/m3db/m3
@@ -122,9 +124,6 @@ steps:
                   make clean install-vendor-m3 services tools
     <<: *common
   - name: "Lint"
-    env:
-      CGO_ENABLED: 0
-      GIMME_GO_VERSION: 1.18.x
     plugins:
       docker-compose#v2.5.1:
         run: app
@@ -140,9 +139,6 @@ steps:
                   make clean lint
     <<: *common
   - label: "Integration (:docker:)"
-    env:
-      CGO_ENABLED: 0
-      GIMME_GO_VERSION: 1.18.x
     plugins:
       docker-compose#v2.5.1:
         run: app
@@ -158,9 +154,6 @@ steps:
                   make clean install-vendor-m3 docker-integration-test
     <<: *common
   - label: "M3 Cluster Integration Tests"
-    env:
-      CGO_ENABLED: 0
-      GIMME_GO_VERSION: 1.18.x
     plugins:
       gopath-checkout#v1.0.1:
         import: github.com/m3db/m3
@@ -195,7 +188,7 @@ steps:
 #    parallelism: 1
 #    env:
 #      CGO_ENABLED: 0
-#      GIMME_GO_VERSION: 1.18.x
+#      GIMME_GO_VERSION: 1.22.x
 #    plugins:
 #        gopath-checkout#v1.0.1:
 #          import: github.com/m3db/m3
@@ -286,7 +279,7 @@ steps:
 #    command: make clean install-vendor-m3 docs-test
 #    env:
 #      CGO_ENABLED: 0
-#      GIMME_GO_VERSION: 1.18.x
+#      GIMME_GO_VERSION: 1.22.x
 #    plugins:
 #        gopath-checkout#v1.0.1:
 #          import: github.com/m3db/m3

diff --git a/.golangci.yml b/.golangci.yml
@@ -81,6 +81,8 @@ linters-settings:
     min-len: 3
     # minimal occurrences count to trigger, 3 by default
     min-occurrences: 3
+    # ignore tests
+    ignore-tests: true 
   depguard:
     list-type: blacklist
     include-go-root: false
@@ -156,6 +158,7 @@ linters-settings:
       # as a general rule of thumb.
       - hugeParam
       - rangeValCopy
+      - ifElseChain
     enabled-checks:
       # temp disabled, something wrong on go 1.18
       # - ruleguard
@@ -170,6 +173,9 @@ linters-settings:
       - standard
       - prefix(github.com/m3db/m3)
       - default
+  staticcheck:
+    # disable pkg deprecation checks.
+    checks: ["all", "-SA1019"]
 
 linters:
   enable:
@@ -253,6 +259,26 @@ linters:
     - gomoddirectives
     - gofumpt
     - ifshort
+    - wastedassign
+    - usestdlibvars
+    - testifylint
+    - inamedparam
+    - exhaustruct
+    - depguard
+    - revive
+    - protogetter
+    - gosec
+    - mirror
+    - interfacebloat
+    - musttag
+    - nonamedreturns
+    - stylecheck
+    - contextcheck
+    - tagalign
+    - gosmopolitan
+    - nilerr
+    - whitespace
+    - bodyclose
   disable-all: false
   presets:
     # bodyclose, errcheck, gosec, govet, scopelint, staticcheck, typecheck

diff --git a/Dockerfile b/Dockerfile
@@ -1,3 +1,3 @@
-FROM golang:1.18-bullseye
+FROM golang:1.22-bullseye
 
 RUN apt-get update && apt-get install -y lsof netcat-openbsd docker.io jq
diff --git a/Makefile b/Makefile
@@ -41,7 +41,7 @@ LINUX_AMD64_ENV           := GOOS=linux GOARCH=amd64 $(GO_BUILD_COMMON_ENV)
 GO_RELEASER_DOCKER_IMAGE  := goreleaser/goreleaser:v1.8.3
 GO_RELEASER_RELEASE_ARGS  ?= --rm-dist
 GO_RELEASER_WORKING_DIR   := /go/src/github.com/m3db/m3
-GOLANGCI_LINT_VERSION     := v1.45.2
+GOLANGCI_LINT_VERSION     := v1.56.0
 
 export NPROC := 2 # Maximum package concurrency for unit tests.
 

diff --git a/docker/m3aggregator/Dockerfile b/docker/m3aggregator/Dockerfile
@@ -1,5 +1,5 @@
 # stage 1: build
-FROM golang:1.18-alpine3.15 AS builder
+FROM golang:1.22-alpine3.20 AS builder
 LABEL maintainer="The M3DB Authors <[email protected]>"
 
 # Install deps
@@ -15,7 +15,7 @@ RUN cd /go/src/github.com/m3db/m3/ && \
     make m3aggregator-linux-amd64
 
 # stage 2: lightweight "release"
-FROM alpine:3.15
+FROM alpine:3.20
 LABEL maintainer="The M3DB Authors <[email protected]>"
 
 EXPOSE 5000/tcp 6000/tcp 6001/tcp

diff --git a/docker/m3coordinator/Dockerfile b/docker/m3coordinator/Dockerfile
@@ -1,5 +1,5 @@
 # stage 1: build
-FROM golang:1.18-alpine3.15 AS builder
+FROM golang:1.22-alpine3.20 AS builder
 LABEL maintainer="The M3DB Authors <[email protected]>"
 
 # Install deps

diff --git a/docker/m3dbnode/Dockerfile b/docker/m3dbnode/Dockerfile
@@ -1,5 +1,5 @@
 # stage 1: build
-FROM golang:1.18-alpine3.15 AS builder
+FROM golang:1.22-alpine3.20 AS builder
 LABEL maintainer="The M3DB Authors <[email protected]>"
 
 # Install deps
@@ -15,7 +15,7 @@ RUN cd /go/src/github.com/m3db/m3/ && \
     make m3dbnode-linux-amd64
 
 # Stage 2: lightweight "release"
-FROM alpine:3.15
+FROM alpine:3.20
 LABEL maintainer="The M3DB Authors <[email protected]>"
 
 ENV GODEBUG madvdontneed=1

diff --git a/docker/m3dbnode/Dockerfile-setcap b/docker/m3dbnode/Dockerfile-setcap
@@ -1,5 +1,5 @@
 # stage 1: build
-FROM golang:1.18-alpine3.15 AS builder
+FROM golang:1.22-alpine3.20 AS builder
 LABEL maintainer="The M3DB Authors <[email protected]>"
 
 # Install deps
@@ -15,7 +15,7 @@ RUN cd /go/src/github.com/m3db/m3/ && \
     make m3dbnode-linux-amd64
 
 # Stage 2: lightweight "release"
-FROM alpine:3.15
+FROM alpine:3.20
 LABEL maintainer="The M3DB Authors <[email protected]>"
 
 ENV GODEBUG madvdontneed=1

diff --git a/docker/m3query/Dockerfile b/docker/m3query/Dockerfile
@@ -1,5 +1,5 @@
 # stage 1: build
-FROM golang:1.18-alpine3.15 AS builder
+FROM golang:1.22-alpine3.20 AS builder
 LABEL maintainer="The M3DB Authors <[email protected]>"
 
 # Install deps
@@ -15,7 +15,7 @@ RUN cd /go/src/github.com/m3db/m3/ && \
     make m3query-linux-amd64
 
 # stage 2: lightweight "release"
-FROM alpine:3.15
+FROM alpine:3.20
 LABEL maintainer="The M3DB Authors <[email protected]>"
 
 EXPOSE 7201/tcp 7203/tcp

diff --git a/examples/dbnode/metrics_client/main.go b/examples/dbnode/metrics_client/main.go
@@ -27,13 +27,13 @@ import (
 	"log"
 	"time"
 
+	yaml "gopkg.in/yaml.v2"
+
 	"github.com/m3db/m3/src/dbnode/client"
 	"github.com/m3db/m3/src/dbnode/storage/index"
 	"github.com/m3db/m3/src/m3ninx/idx"
 	"github.com/m3db/m3/src/x/ident"
 	xtime "github.com/m3db/m3/src/x/time"
-
-	yaml "gopkg.in/yaml.v2"
 )
 
 const (
@@ -84,8 +84,8 @@ func main() {
 // runTaggedExample demonstrates how to write "tagged" (indexed) metrics data
 // and then read it back out again by either:
 //
-//   1. Querying for a set of time series using an inverted index query
-//   2. Querying for a specific time series by its ID directly
+//  1. Querying for a set of time series using an inverted index query
+//  2. Querying for a specific time series by its ID directly
 func runTaggedExample(session client.Session) {
 	log.Printf("------ run tagged example ------")
 	var (

diff --git a/examples/dbnode/proto_client/main.go b/examples/dbnode/proto_client/main.go
@@ -29,11 +29,12 @@ import (
 
 	"github.com/jhump/protoreflect/desc"
 	"github.com/jhump/protoreflect/dynamic"
+	yaml "gopkg.in/yaml.v2"
+
 	"github.com/m3db/m3/src/dbnode/client"
 	"github.com/m3db/m3/src/dbnode/encoding/proto"
 	"github.com/m3db/m3/src/x/ident"
 	xtime "github.com/m3db/m3/src/x/time"
-	yaml "gopkg.in/yaml.v2"
 )
 
 const (
@@ -135,8 +136,8 @@ func runUntaggedExample(session client.Session, schema *desc.MessageDescriptor)
 // runTaggedExample demonstrates how to write "tagged" (indexed) data into M3DB with a given protobuf
 // schema and then read it back out again by either:
 //
-//   1. Querying for a specific time series by its ID directly
-//   2. TODO(rartoul): Querying for a set of time series using an inverted index query
+//  1. Querying for a specific time series by its ID directly
+//  2. TODO(rartoul): Querying for a set of time series using an inverted index query
 func runTaggedExample(session client.Session, schema *desc.MessageDescriptor) {
 	log.Printf("------ run tagged example ------")
 	var (

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/m3db/m3
 
-go 1.18
+go 1.22
 
 require (
 	github.com/MichaelTJones/pcg v0.0.0-20180122055547-df440c6ed7ed
@@ -91,7 +91,10 @@ require (
 	gopkg.in/yaml.v2 v2.4.0
 )
 
-require golang.org/x/exp v0.0.0-20230725093048-515e97ebf090
+require (
+	github.com/twmb/murmur3 v1.1.6
+	golang.org/x/exp v0.0.0-20230725093048-515e97ebf090
+)
 
 require (
 	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
@@ -102,7 +105,6 @@ require (
 	github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46 // indirect
 	github.com/alecthomas/units v0.0.0-20210927113745-59d0afb8317a // indirect
 	github.com/aws/aws-sdk-go v1.41.7 // indirect
-	github.com/benbjohnson/clock v1.3.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cenkalti/backoff/v4 v4.1.2 // indirect
 	github.com/containerd/continuity v0.1.0 // indirect
@@ -166,7 +168,6 @@ require (
 	github.com/stretchr/objx v0.3.0 // indirect
 	github.com/tinylib/msgp v1.1.0 // indirect
 	github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect
-	github.com/twmb/murmur3 v1.1.6 // indirect
 	github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
 	go.etcd.io/bbolt v1.3.6 // indirect
 	go.etcd.io/etcd/client/v2 v2.306.0-alpha.0 // indirect

diff --git a/go.sum b/go.sum
@@ -237,6 +237,7 @@ github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnweb
 github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
 github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c=
 github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b h1:AP/Y7sqYicnjGDfD5VcY4CIfh1hRXBUavxrvELjTiOE=
+github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b/go.mod h1:ac9efd0D1fsDb3EJvhqgXRbFx7bs2wqZ10HQPeU8U/Q=
 github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
 github.com/bonitoo-io/go-sql-bigquery v0.3.4-1.4.0/go.mod h1:J4Y6YJm0qTWB9aFziB7cPeSyc6dOZFyJdteSeybVpXQ=
 github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk=
@@ -259,6 +260,7 @@ github.com/cenkalti/backoff/v4 v4.1.2/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInq
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054 h1:uH66TXeswKn5PW5zdZ39xEwfS9an067BirqA+P4QaLI=
+github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
 github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cespare/xxhash/v2 v2.1.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tjxl5dIMyVM=
@@ -287,8 +289,11 @@ github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490 h1:KwaoQzs/WeUxxJqiJsZ
 github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
 github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5 h1:xD/lrqdvwsc+O2bjSSi3YqY73Ke3LAiSCx49aCesA0E=
+github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo=
 github.com/cockroachdb/errors v1.2.4 h1:Lap807SXTH5tri2TivECb/4abUkMZC9zRoLarvcKDqs=
+github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA=
 github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f h1:o/kfcElHqOiXqcou5a3rIlMc7oJbMQkeLk0VQJ7zgqY=
+github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI=
 github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
 github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE=
 github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9NM2vtYHaUen+NljV0/baGCAPELGm2q9ZXpWU=
@@ -496,6 +501,7 @@ github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXt
 github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
 github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4=
 github.com/getsentry/raven-go v0.2.0 h1:no+xWJRb5ZI7eE8TWgIq1jLulQiIoLG0IfYxv5JYMGs=
+github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ=
 github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
@@ -540,6 +546,7 @@ github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8=
 github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
+github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI=
 github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik=
 github.com/go-openapi/analysis v0.18.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik=
@@ -1312,6 +1319,7 @@ github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndr
 github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
 github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA=
 github.com/prashantv/protectmem v0.0.0-20171002184600-e20412882b3a h1:AA9vgIBDjMHPC2McaGPojgV2dcI78ZC0TLNhYCXEKH8=
+github.com/prashantv/protectmem v0.0.0-20171002184600-e20412882b3a/go.mod h1:lzZQ3Noex5pfAy7mkAeCjcBDteYU85uWWnJ/y6gKU8k=
 github.com/prometheus/alertmanager v0.20.0/go.mod h1:9g2i48FAyZW6BtbsnvHtMHQXl2aVtrORKwKVCQ+nbrg=
 github.com/prometheus/alertmanager v0.23.0/go.mod h1:0MLTrjQI8EuVmvykEhcfr/7X0xmaDAZrqMgxIq3OXHk=
 github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
@@ -1474,6 +1482,7 @@ github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3
 github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
 github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI=
 github.com/streadway/quantile v0.0.0-20220407130108-4246515d968d h1:X4+kt6zM/OVO6gbJdAfJR60MGPsqCzbtXNnjoGqdfAs=
+github.com/streadway/quantile v0.0.0-20220407130108-4246515d968d/go.mod h1:lbP8tGiBjZ5YWIc2fzuRpTaz0b/53vT6PEs3QuAWzuU=
 github.com/stretchr/objx v0.0.0-20180129172003-8a3f7159479f/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -1492,7 +1501,9 @@ github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDW
 github.com/tinylib/msgp v1.1.0 h1:9fQd+ICuRIu/ue4vxJZu6/LzxN0HwMds2nq/0cFvxHU=
 github.com/tinylib/msgp v1.1.0/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
 github.com/tklauser/go-sysconf v0.3.9 h1:JeUVdAOWhhxVcU6Eqr/ATFHgXk/mmiItdKeJPev3vTo=
+github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs=
 github.com/tklauser/numcpus v0.3.0 h1:ILuRUQBtssgnxw0XXIjKUC56fgnOrFoQQ/4+DeU2biQ=
+github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 h1:uruHq4dN7GR16kFc5fp3d1RIYzJW5onx8Ybykw2YQFA=
@@ -1992,6 +2003,7 @@ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9sn
 golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.1.0 h1:g6Z6vPFA9dYBAF7DWcH6sCcOntplXsDKcliusYijMlw=
+golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

diff --git a/scripts/comparator/compare.go b/scripts/comparator/compare.go
@@ -31,12 +31,12 @@ import (
 	"os"
 	"time"
 
+	"go.uber.org/zap"
+
 	"github.com/m3db/m3/scripts/comparator/utils"
 	"github.com/m3db/m3/src/query/api/v1/handler/prometheus"
 	xerrors "github.com/m3db/m3/src/x/errors"
 	"github.com/m3db/m3/src/x/instrument"
-
-	"go.uber.org/zap"
 )
 
 func paramError(err string, log *zap.Logger) {

diff --git a/scripts/comparator/grafana/generate_dash.go b/scripts/comparator/grafana/generate_dash.go
@@ -26,10 +26,10 @@ import (
 	"text/template"
 	"time"
 
+	"go.uber.org/zap"
+
 	"github.com/m3db/m3/scripts/comparator/utils"
 	"github.com/m3db/m3/src/x/instrument"
-
-	"go.uber.org/zap"
 )
 
 // TemplateData is a collection of template data.