From 230b086db2679a847c3f3b98d29afa029bc118b8 Mon Sep 17 00:00:00 2001 From: Radu Gruia Date: Fri, 23 Aug 2024 09:35:45 +0100 Subject: [PATCH] chore: re-enable staticcheck linter. update deprecated method --- .golangci.yml | 6 +----- events/events.go | 3 ++- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index b6c53fd70..f33c51ba4 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -2,6 +2,7 @@ linters: enable: - errcheck - misspell + - staticcheck - unconvert - unparam - unused @@ -10,8 +11,3 @@ linters: - whitespace disable: - govet -linters-settings: - staticcheck: - checks: - - all - - '-SA1019' # allow the use of deprecated functions (since we have some) diff --git a/events/events.go b/events/events.go index 1d81e81e9..e4b4b7b9e 100644 --- a/events/events.go +++ b/events/events.go @@ -15,6 +15,7 @@ import ( "github.com/teamkeel/keel/util" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/trace" + "go.opentelemetry.io/otel/trace/noop" ) // Event names @@ -56,7 +57,7 @@ var contextKey handlerContextKey = "eventHandler" func WithEventHandler(ctx context.Context, handler EventHandler) (context.Context, error) { // If no tracing provider is set up, then events will not work. // It is better to error than to let events silently malfunction. - if otel.GetTracerProvider() == trace.NewNoopTracerProvider() { + if otel.GetTracerProvider() == noop.NewTracerProvider() { return nil, errors.New("cannot use events when there is no trace provider configured") }