diff --git a/Makefile b/Makefile
index 59215936f..e6c2fd9ef 100644
--- a/Makefile
+++ b/Makefile
@@ -87,7 +87,8 @@ lint: $(TOOLS_DIR)/golangci-lint $(TOOLS_DIR)/misspell $(TOOLS_DIR)/stringer
 	set -e; for dir in $(ALL_GO_MOD_DIRS); do \
 	  echo "golangci-lint in $${dir}"; \
 	  (cd "$${dir}" && \
-	    $(abspath $(TOOLS_DIR))/golangci-lint run --fix); \
+	    $(abspath $(TOOLS_DIR))/golangci-lint run --fix && \
+	    $(abspath $(TOOLS_DIR))/golangci-lint run); \
 	done
 	$(TOOLS_DIR)/misspell -w $(ALL_DOCS)
 	set -e; for dir in $(ALL_GO_MOD_DIRS); do \
diff --git a/api/trace/noop_span.go b/api/trace/noop_span.go
index 1e518ef78..0f616ecbb 100644
--- a/api/trace/noop_span.go
+++ b/api/trace/noop_span.go
@@ -73,4 +73,4 @@ func (NoopSpan) AddEventWithTimestamp(ctx context.Context, timestamp time.Time,
 
 // SetName does nothing.
 func (NoopSpan) SetName(name string) {
-}
\ No newline at end of file
+}