From 8f56cc811d29c04d9a6c2efc3705561b82b72014 Mon Sep 17 00:00:00 2001 From: Simon Pasquier Date: Wed, 2 Jan 2019 09:54:28 +0100 Subject: [PATCH] *: add staticcheck target back Signed-off-by: Simon Pasquier --- Makefile | 7 +----- Makefile.common | 56 +++++++++++++++++++++++++------------------ exporter.go | 6 ++--- exporter_test.go | 10 ++++---- main.go | 1 + pkg/mapper/fsm/fsm.go | 2 +- pkg/mapper/mapper.go | 2 -- 7 files changed, 44 insertions(+), 40 deletions(-) diff --git a/Makefile b/Makefile index bc801fe..39ff3f4 100644 --- a/Makefile +++ b/Makefile @@ -11,14 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -# By being first, this takes over plain `make`. It cuts out `staticcheck` -# because in the circleci/golang:1.11 image it chokes on the go module cache. -default: precheck style unused build test - include Makefile.common -STATICCHECK_IGNORE = \ - github.com/prometheus/statsd_exporter/main.go:SA1019 \ +STATICCHECK_IGNORE = DOCKER_IMAGE_NAME ?= statsd-exporter diff --git a/Makefile.common b/Makefile.common index 741579e..fff85f9 100644 --- a/Makefile.common +++ b/Makefile.common @@ -29,6 +29,8 @@ GO ?= go GOFMT ?= $(GO)fmt FIRST_GOPATH := $(firstword $(subst :, ,$(shell $(GO) env GOPATH))) GOOPTS ?= +GOHOSTOS ?= $(shell $(GO) env GOHOSTOS) +GOHOSTARCH ?= $(shell $(GO) env GOHOSTARCH) GO_VERSION ?= $(shell $(GO) version) GO_VERSION_NUMBER ?= $(word 3, $(GO_VERSION)) @@ -62,17 +64,30 @@ PROMU := $(FIRST_GOPATH)/bin/promu STATICCHECK := $(FIRST_GOPATH)/bin/staticcheck pkgs = ./... -GO_VERSION ?= $(shell $(GO) version) -GO_BUILD_PLATFORM ?= $(subst /,-,$(lastword $(GO_VERSION))) +ifeq (arm, $(GOHOSTARCH)) + GOHOSTARM ?= $(shell GOARM= $(GO) env GOARM) + GO_BUILD_PLATFORM ?= $(GOHOSTOS)-$(GOHOSTARCH)v$(GOHOSTARM) +else + GO_BUILD_PLATFORM ?= $(GOHOSTOS)-$(GOHOSTARCH) +endif PROMU_VERSION ?= 0.2.0 PROMU_URL := https://github.com/prometheus/promu/releases/download/v$(PROMU_VERSION)/promu-$(PROMU_VERSION).$(GO_BUILD_PLATFORM).tar.gz +STATICCHECK_VERSION ?= 2019.1 +STATICCHECK_URL := https://github.com/dominikh/go-tools/releases/download/$(STATICCHECK_VERSION)/staticcheck_$(GOHOSTOS)_$(GOHOSTARCH) PREFIX ?= $(shell pwd) BIN_DIR ?= $(shell pwd) DOCKER_IMAGE_TAG ?= $(subst /,-,$(shell git rev-parse --abbrev-ref HEAD)) DOCKER_REPO ?= prom +ifeq ($(GOHOSTARCH),amd64) + ifeq ($(GOHOSTOS),$(filter $(GOHOSTOS),linux freebsd darwin windows)) + # Only supported on amd64 + test-flags := -race + endif +endif + .PHONY: all all: precheck style staticcheck unused build test @@ -110,12 +125,12 @@ common-test-short: .PHONY: common-test common-test: @echo ">> running all tests" - GO111MODULE=$(GO111MODULE) $(GO) test -race $(GOOPTS) $(pkgs) + GO111MODULE=$(GO111MODULE) $(GO) test $(test-flags) $(GOOPTS) $(pkgs) .PHONY: common-format common-format: @echo ">> formatting code" - GO111MODULE=$(GO111MODULE) $(GO) fmt $(GOOPTS) $(pkgs) + GO111MODULE=$(GO111MODULE) $(GO) fmt $(pkgs) .PHONY: common-vet common-vet: @@ -125,8 +140,12 @@ common-vet: .PHONY: common-staticcheck common-staticcheck: $(STATICCHECK) @echo ">> running staticcheck" + chmod +x $(STATICCHECK) ifdef GO111MODULE - GO111MODULE=$(GO111MODULE) $(STATICCHECK) -ignore "$(STATICCHECK_IGNORE)" -checks "SA*" $(pkgs) +# 'go list' needs to be executed before staticcheck to prepopulate the modules cache. +# Otherwise staticcheck might fail randomly for some reason not yet explained. + GO111MODULE=$(GO111MODULE) $(GO) list -e -compiled -test=true -export=false -deps=true -find=false -tags= -- ./... > /dev/null + GO111MODULE=$(GO111MODULE) $(STATICCHECK) -ignore "$(STATICCHECK_IGNORE)" $(pkgs) else $(STATICCHECK) -ignore "$(STATICCHECK_IGNORE)" $(pkgs) endif @@ -140,8 +159,9 @@ else ifdef GO111MODULE @echo ">> running check for unused/missing packages in go.mod" GO111MODULE=$(GO111MODULE) $(GO) mod tidy +ifeq (,$(wildcard vendor)) @git diff --exit-code -- go.sum go.mod -ifneq (,$(wildcard vendor)) +else @echo ">> running check for unused packages in vendor/" GO111MODULE=$(GO111MODULE) $(GO) mod vendor @git diff --exit-code -- go.sum go.mod vendor/ @@ -175,30 +195,20 @@ common-docker-tag-latest: promu: $(PROMU) $(PROMU): - curl -s -L $(PROMU_URL) | tar -xvz -C /tmp - mkdir -v -p $(FIRST_GOPATH)/bin - cp -v /tmp/promu-$(PROMU_VERSION).$(GO_BUILD_PLATFORM)/promu $(PROMU) + $(eval PROMU_TMP := $(shell mktemp -d)) + curl -s -L $(PROMU_URL) | tar -xvzf - -C $(PROMU_TMP) + mkdir -p $(FIRST_GOPATH)/bin + cp $(PROMU_TMP)/promu-$(PROMU_VERSION).$(GO_BUILD_PLATFORM)/promu $(FIRST_GOPATH)/bin/promu + rm -r $(PROMU_TMP) .PHONY: proto proto: @echo ">> generating code from proto files" @./scripts/genproto.sh -.PHONY: $(STATICCHECK) $(STATICCHECK): -ifdef GO111MODULE -# Get staticcheck from a temporary directory to avoid modifying the local go.{mod,sum}. -# See https://github.com/golang/go/issues/27643. -# For now, we are using the next branch of staticcheck because master isn't compatible yet with Go modules. - tmpModule=$$(mktemp -d 2>&1) && \ - mkdir -p $${tmpModule}/staticcheck && \ - cd "$${tmpModule}"/staticcheck && \ - GO111MODULE=on $(GO) mod init example.com/staticcheck && \ - GO111MODULE=on GOOS= GOARCH= $(GO) get -u honnef.co/go/tools/cmd/staticcheck@next && \ - rm -rf $${tmpModule}; -else - GOOS= GOARCH= GO111MODULE=off $(GO) get -u honnef.co/go/tools/cmd/staticcheck -endif + mkdir -p $(FIRST_GOPATH)/bin + curl -s -L $(STATICCHECK_URL) > $(STATICCHECK) ifdef GOVENDOR .PHONY: $(GOVENDOR) diff --git a/exporter.go b/exporter.go index 13c98f1..3d366f4 100644 --- a/exporter.go +++ b/exporter.go @@ -487,7 +487,7 @@ func NewExporter(mapper *mapper.MetricMapper) *Exporter { Summaries: NewSummaryContainer(mapper), Histograms: NewHistogramContainer(mapper), mapper: mapper, - labelValues: make(map[string]map[uint64]*LabelValues, 0), + labelValues: make(map[string]map[uint64]*LabelValues), } } @@ -513,9 +513,9 @@ func buildEvent(statType, metric string, value float64, relative bool, labels ma labels: labels, }, nil case "s": - return nil, fmt.Errorf("No support for StatsD sets") + return nil, fmt.Errorf("no support for StatsD sets") default: - return nil, fmt.Errorf("Bad stat type %s", statType) + return nil, fmt.Errorf("bad stat type %s", statType) } } diff --git a/exporter_test.go b/exporter_test.go index b4615b8..a7c6655 100644 --- a/exporter_test.go +++ b/exporter_test.go @@ -40,7 +40,7 @@ func TestNegativeCounter(t *testing.T) { } }() - events := make(chan Events, 0) + events := make(chan Events) go func() { c := Events{ &CounterEvent{ @@ -68,7 +68,7 @@ func TestInvalidUtf8InDatadogTagValue(t *testing.T) { } }() - events := make(chan Events, 0) + events := make(chan Events) go func() { for _, l := range []statsDPacketHandler{&StatsDUDPListener{}, &mockStatsDTCPListener{}} { @@ -83,7 +83,7 @@ func TestInvalidUtf8InDatadogTagValue(t *testing.T) { func TestHistogramUnits(t *testing.T) { // Start exporter with a synchronous channel - events := make(chan Events, 0) + events := make(chan Events) go func() { ex := NewExporter(&mapper.MetricMapper{}) ex.mapper.Defaults.TimerType = mapper.TimerTypeHistogram @@ -181,7 +181,7 @@ func TestEscapeMetricName(t *testing.T) { // bazqux metric should expire with ttl of 2s func TestTtlExpiration(t *testing.T) { // Mock a time.NewTicker - tickerCh := make(chan time.Time, 0) + tickerCh := make(chan time.Time) clock.ClockInstance = &clock.Clock{ TickerCh: tickerCh, } @@ -200,7 +200,7 @@ mappings: if err != nil { t.Fatalf("Config load error: %s %s", config, err) } - events := make(chan Events, 0) + events := make(chan Events) defer close(events) go func() { ex := NewExporter(testMapper) diff --git a/main.go b/main.go index 0e7f32a..7127afb 100644 --- a/main.go +++ b/main.go @@ -34,6 +34,7 @@ func init() { } func serveHTTP(listenAddress, metricsEndpoint string) { + //lint:ignore SA1019 prometheus.Handler() is deprecated. http.Handle(metricsEndpoint, prometheus.Handler()) http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { w.Write([]byte(` diff --git a/pkg/mapper/fsm/fsm.go b/pkg/mapper/fsm/fsm.go index efa22c5..cf8c00e 100644 --- a/pkg/mapper/fsm/fsm.go +++ b/pkg/mapper/fsm/fsm.go @@ -262,7 +262,7 @@ func TestIfNeedBacktracking(mappings []string, orderingDisabled bool) bool { for i1, r1 := range rules { currentRuleNeedBacktrack := false re1 := rulesRE[i1] - if re1 == nil || strings.Index(r1, "*") == -1 { + if re1 == nil || !strings.Contains(r1, "*") { continue } // if rule r1 is A.B.C.*.E.*, is there a rule r2 is A.B.C.D.x.x or A.B.C.*.E.F ? (x is any string or *) diff --git a/pkg/mapper/mapper.go b/pkg/mapper/mapper.go index b9fe3d7..4cb4fbe 100644 --- a/pkg/mapper/mapper.go +++ b/pkg/mapper/mapper.go @@ -54,8 +54,6 @@ type MetricMapper struct { MappingsCount prometheus.Gauge } -type matchMetricType string - type MetricMapping struct { Match string `yaml:"match"` Name string `yaml:"name"`