From ee4da3af2e48afc4670c922828ab789c0841a69e Mon Sep 17 00:00:00 2001
From: Luke Palmer <luke@lukepalmer.net>
Date: Thu, 5 Jan 2023 10:12:46 -0500
Subject: [PATCH] Lint and errcheck using golangci-lint (#3558)
---
.golangci.yml | 15 +++++++++++++++
Makefile | 26 ++------------------------
app/victoria-metrics/self_scraper.go | 4 +++-
3 files changed, 20 insertions(+), 25 deletions(-)
create mode 100644 .golangci.yml
diff --git a/.golangci.yml b/.golangci.yml
new file mode 100644
index 0000000000..5c6ebc7795
--- /dev/null
+++ b/.golangci.yml
@@ -0,0 +1,15 @@
+run:
+ timeout: 2m
+
+enable:
+ - revive
+
+issues:
+ exclude-rules:
+ - linters:
+ - staticcheck
+ text: "SA(4003|1019|5011):"
+
+linters-settings:
+ errcheck:
+ exclude: ./errcheck_excludes.txt
diff --git a/Makefile b/Makefile
index 7bd34e2897..4af4243316 100644
--- a/Makefile
+++ b/Makefile
@@ -314,29 +314,7 @@ vet:
go vet -mod=vendor ./lib/...
go vet -mod=vendor ./app/...
-lint: install-golint
- golint lib/...
- golint app/...
-
-install-golint:
- which golint || GO111MODULE=off go get golang.org/x/lint/golint
-
-errcheck: install-errcheck
- errcheck -exclude=errcheck_excludes.txt ./lib/...
- errcheck -exclude=errcheck_excludes.txt ./app/vminsert/...
- errcheck -exclude=errcheck_excludes.txt ./app/vmselect/...
- errcheck -exclude=errcheck_excludes.txt ./app/vmstorage/...
- errcheck -exclude=errcheck_excludes.txt ./app/vmagent/...
- errcheck -exclude=errcheck_excludes.txt ./app/vmalert/...
- errcheck -exclude=errcheck_excludes.txt ./app/vmauth/...
- errcheck -exclude=errcheck_excludes.txt ./app/vmbackup/...
- errcheck -exclude=errcheck_excludes.txt ./app/vmrestore/...
- errcheck -exclude=errcheck_excludes.txt ./app/vmctl/...
-
-install-errcheck:
- which errcheck || GO111MODULE=off go get github.com/kisielk/errcheck
-
-check-all: fmt vet lint errcheck golangci-lint
+check-all: fmt vet golangci-lint
test:
go test -mod=vendor ./lib/... ./app/...
@@ -387,7 +365,7 @@ install-qtc:
golangci-lint: install-golangci-lint
- golangci-lint run --exclude '(SA4003|SA1019|SA5011):' -D errcheck -D structcheck --timeout 2m
+ golangci-lint run
install-golangci-lint:
which golangci-lint || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin v1.50.1
diff --git a/app/victoria-metrics/self_scraper.go b/app/victoria-metrics/self_scraper.go
index ed12efeb44..1147979da6 100644
--- a/app/victoria-metrics/self_scraper.go
+++ b/app/victoria-metrics/self_scraper.go
@@ -85,7 +85,9 @@ func selfScraper(scrapeInterval time.Duration) {
mr.Timestamp = currentTimestamp
mr.Value = r.Value
}
- vmstorage.AddRows(mrs)
+ if err := vmstorage.AddRows(mrs); err != nil {
+ logger.Errorf("cannot store self-scraped metrics: %s", err)
+ }
}
}