Add go checks to Makefile

pkcll · pkcll · commit 746eebabcb11 · 2025-02-12T11:24:00.000-05:00
diff --git a/go.sum b/go.sum
@@ -615,8 +615,6 @@ github.com/pelletier/go-toml/v2 v2.2.0 h1:QLgLl2yMN7N+ruc31VynXs1vhMZa7CeHHejIeB
 github.com/pelletier/go-toml/v2 v2.2.0/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
 github.com/pierrec/lz4/v4 v4.1.22 h1:cKFw6uJDK+/gfw5BcDL0JL5aBsAFdsIT18eRtLj7VIU=
 github.com/pierrec/lz4/v4 v4.1.22/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
-github.com/pkcll/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.115.7 h1:RtooYoXR9+zDhykK9EXeSthn+05i9Yv1eyH+0JfHg9g=
-github.com/pkcll/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.115.7/go.mod h1:zBXZLZS8AMHEvypXIleFzP76fwigAgcY+wr3xm2kUr0=
 github.com/pkcll/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.115.8-0.20250212041627-e2b5908d3616 h1:Oxm7bfn3eIm28ifHcf3jfeNV9xCVU1hSNAIpcPYcYIk=
 github.com/pkcll/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.115.8-0.20250212041627-e2b5908d3616/go.mod h1:zBXZLZS8AMHEvypXIleFzP76fwigAgcY+wr3xm2kUr0=
 github.com/pkcll/prometheus v0.54.3-0.20250205152829-6e977873d1b5 h1:ltpoggpdltDTnzEJf/JMcXgpR3a5TDJuPJrJuqmJ6qk=
diff --git a/pkg/promotel/Makefile b/pkg/promotel/Makefile
@@ -5,6 +5,7 @@ help: ## Print this help text
 	tidy \
 	fmt \
 	lint \
+	checks \
 	test
 
 tidy: fmt ## run go mod tidy
@@ -16,5 +17,11 @@ fmt: ## run go fmt
 lint: ## run golangci-lint
 	golangci-lint run ./... --config=../../.golangci.yml
 
+checks: ## run go checks
+	go mod verify
+	go vet ./...
+	go run honnef.co/go/tools/cmd/staticcheck@latest -checks=all,-ST1000,-U1000,-ST1003 ./...
+	go run golang.org/x/vuln/cmd/govulncheck@latest ./...
+
 test: ## run unit tests
 	go test -v ./...
diff --git a/pkg/promotel/forwarder.go b/pkg/promotel/forwarder.go
@@ -156,24 +156,24 @@ func newExporterConfig(opts ForwarderOptions) (*internal.ExporterConfig, error)
 func newMetricExporter(opts ForwarderOptions, lggr logger.Logger) (internal.MetricExporter, error) {
 	expConfig, err := newExporterConfig(opts)
 	if err != nil {
-		return nil, fmt.Errorf("Failed to create exporter config %w", err)
+		return nil, fmt.Errorf("failed to create exporter config %w", err)
 	}
 	// Sends metrics data in OTLP format to otel-collector endpoint
 	exporter, err := internal.NewMetricExporter(expConfig, lggr)
 	if err != nil {
-		return nil, fmt.Errorf("Failed to create metric exporter %w", err)
+		return nil, fmt.Errorf("failed to create metric exporter %w", err)
 	}
 	return exporter, nil
 }
 
 func newMetricReceiver(g prometheus.Gatherer, r prometheus.Registerer, interval time.Duration, lggr logger.Logger, next internal.NextFunc) (internal.MetricReceiver, error) {
 	receiverConfig, err := internal.NewReceiverConfig()
 	if err != nil {
-		return nil, fmt.Errorf("Failed to create config %w", err)
+		return nil, fmt.Errorf("failed to create config %w", err)
 	}
 	receiver, err := internal.NewMetricReceiver(receiverConfig, g, r, interval, lggr, next)
 	if err != nil {
-		return nil, fmt.Errorf("Failed to create debug metric receiver %w", err)
+		return nil, fmt.Errorf("failed to create debug metric receiver %w", err)
 	}
 	return receiver, nil
 }
diff --git a/pkg/promotel/internal/consumer.go b/pkg/promotel/internal/consumer.go
@@ -19,7 +19,6 @@ type baseConsumer struct {
 	consumer.ConsumeMetricsFunc
 }
 
-// NewNop returns a Consumer that just drops all received data and returns no error.
 func NewNopConsumer() consumer.Metrics {
 	return &baseConsumer{
 		ConsumeMetricsFunc: func(context.Context, pmetric.Metrics) error { return nil },

Original file line number	Diff line number	Diff line change
`@@ -156,24 +156,24 @@ func newExporterConfig(opts ForwarderOptions) (*internal.ExporterConfig, error)`
`156`	`156`	`func newMetricExporter(opts ForwarderOptions, lggr logger.Logger) (internal.MetricExporter, error) {`
`157`	`157`	`expConfig, err := newExporterConfig(opts)`
`158`	`158`	`if err != nil {`
`159`		`- return nil, fmt.Errorf("Failed to create exporter config %w", err)`
	`159`	`+ return nil, fmt.Errorf("failed to create exporter config %w", err)`
`160`	`160`	`}`
`161`	`161`	`// Sends metrics data in OTLP format to otel-collector endpoint`
`162`	`162`	`exporter, err := internal.NewMetricExporter(expConfig, lggr)`
`163`	`163`	`if err != nil {`
`164`		`- return nil, fmt.Errorf("Failed to create metric exporter %w", err)`
	`164`	`+ return nil, fmt.Errorf("failed to create metric exporter %w", err)`
`165`	`165`	`}`
`166`	`166`	`return exporter, nil`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`func newMetricReceiver(g prometheus.Gatherer, r prometheus.Registerer, interval time.Duration, lggr logger.Logger, next internal.NextFunc) (internal.MetricReceiver, error) {`
`170`	`170`	`receiverConfig, err := internal.NewReceiverConfig()`
`171`	`171`	`if err != nil {`
`172`		`- return nil, fmt.Errorf("Failed to create config %w", err)`
	`172`	`+ return nil, fmt.Errorf("failed to create config %w", err)`
`173`	`173`	`}`
`174`	`174`	`receiver, err := internal.NewMetricReceiver(receiverConfig, g, r, interval, lggr, next)`
`175`	`175`	`if err != nil {`
`176`		`- return nil, fmt.Errorf("Failed to create debug metric receiver %w", err)`
	`176`	`+ return nil, fmt.Errorf("failed to create debug metric receiver %w", err)`
`177`	`177`	`}`
`178`	`178`	`return receiver, nil`
`179`	`179`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@ type baseConsumer struct {`
`19`	`19`	`consumer.ConsumeMetricsFunc`
`20`	`20`	`}`
`21`	`21`
`22`		`-// NewNop returns a Consumer that just drops all received data and returns no error.`
`23`	`22`	`func NewNopConsumer() consumer.Metrics {`
`24`	`23`	`return &baseConsumer{`
`25`	`24`	`ConsumeMetricsFunc: func(context.Context, pmetric.Metrics) error { return nil },`