fix: make lint pass clean(er) (#4390)

Author: darccio

.github/pull_request_template.md

@@ -30,8 +30,10 @@
 - [ ] [System-Tests](https://github.com/DataDog/system-tests/) covering this feature have been added and enabled with the va.b.c-dev version tag.
 - [ ] There is a benchmark for any new code, or changes to existing code.
 - [ ] If this interacts with the agent in a new way, a system test has been added.
-- [ ] New code is free of linting errors. You can check this by running `./scripts/lint.sh` locally.
+- [ ] New code is free of linting errors. You can check this by running `make lint` locally.
+- [ ] New code doesn't break existing tests. You can check this by running `make test` locally.
 - [ ] Add an appropriate team label so this PR gets put in the right place for the release notes.
-- [ ] Non-trivial go.mod changes, e.g. adding new modules, are reviewed by @DataDog/dd-trace-go-guild.
+- [ ] All generated files are up to date. You can check this by running `make generate` locally.
+- [ ] Non-trivial go.mod changes, e.g. adding new modules, are reviewed by @DataDog/dd-trace-go-guild. Make sure all nested modules are up to date by running `make fix-modules` locally.
 
 Unsure? Have a question? Request a review!

.golangci.yml

@@ -117,9 +117,14 @@ linters:
 formatters:
   enable:
     - gofmt
+    - goimports
   exclusions:
     generated: lax
     paths:
       - third_party$
       - builtin$
       - examples$
+  settings:
+    goimports:
+      local-prefixes:
+        - github.com/DataDog/dd-trace-go/v2

CONTRIBUTING.md

@@ -55,7 +55,7 @@ Our CI pipeline includes several automated checks:
 
 - **Copyright Check**: Verifies all files have proper copyright headers
 - **Generate Check**: Ensures generated code is up-to-date
-- **Module Check**: Validates Go module consistency using `./scripts/fix_modules.sh`
+- **Module Check**: Validates Go module consistency using `make fix-modules`
 - **Lint Check**: Runs comprehensive linting using `golangci-lint`
 - **Lock Analysis**: Runs `checklocks` to detect potential deadlocks and race conditions
 
@@ -87,6 +87,9 @@ Before submitting a PR, you can run the same checks locally using make targets:
 # Show all available targets
 make help
 
+# Install tools
+make tools-install
+
 # Run all linters (same as CI)
 make lint
 
@@ -107,15 +110,15 @@ You can also run scripts directly for more control:
 
 ```shell
 # Run specific linting options
-./scripts/lint.sh --all
+make lint
 
 # Format specific file types
-./scripts/format.sh --go
-./scripts/format.sh --shell
+make format/go
+make format/shell
 
 # Run specific test configurations
-./scripts/test.sh --contrib
-./scripts/test.sh --appsec
+make test/contrib
+make test/appsec
 ```
 
 ## Getting a PR Reviewed
@@ -130,19 +133,13 @@ We provide several utility scripts in the `scripts/` directory to help with comm
 
 ### Code Quality Scripts
 
-#### `./scripts/lint.sh`
+#### `make lint`
 
 Runs all linters on the codebase to ensure code quality and consistency.
 
 ```shell
-# Run all linters (default behavior)
-./scripts/lint.sh
-
-# Install linting tools only
-./scripts/lint.sh --tools
-
-# Run all linters and install tools
-./scripts/lint.sh --all
+# Run all linters (default behavior, install tools)
+make lint
 ```
 
 The script runs:
@@ -151,25 +148,19 @@ The script runs:
 - `golangci-lint` for comprehensive Go linting
 - `checklocks` for lock analysis (with error tolerance)
 
-#### `./scripts/format.sh`
+#### `make format`
 
 Formats Go and shell files in the repository.
 
 ```shell
-# Format Go files only (default behavior)
-./scripts/format.sh
+# Format both Go and shell files and install tools (default behavior)
+make format
 
 # Format Go files and install tools
-./scripts/format.sh --go
+make format/go
 
 # Format shell files and install tools
-./scripts/format.sh --shell
-
-# Format both Go and shell files and install tools
-./scripts/format.sh --all
-
-# Install formatting tools only
-./scripts/format.sh --tools
+make format/shell
 ```
 
 #### `./scripts/checklocks.sh`
@@ -189,12 +180,12 @@ Analyzes lock usage patterns to detect potential deadlocks and race conditions.
 
 ### Module Management Scripts
 
-#### `./scripts/fix_modules.sh`
+#### `make fix-modules`
 
 Maintains Go module consistency across the repository by running `go mod tidy` on all modules and adding missing replace directives for local imports.
 
 ```shell
-./scripts/fix_modules.sh
+make fix-modules
 ```
 
 This script:
@@ -205,34 +196,25 @@ This script:
 
 ### Testing Scripts
 
-#### `./scripts/test.sh`
+#### `make test`
 
 Enhanced testing script with improved output formatting and additional options.
 
 ```shell
 # Run core tests only
-./scripts/test.sh
+make test/unit
 
 # Run integration tests
-./scripts/test.sh --integration
+make test/integration
 
 # Run contrib tests
-./scripts/test.sh --contrib
+make test/contrib
 
 # Run all tests
-./scripts/test.sh --all
+make test
 
 # Run with AppSec enabled
-./scripts/test.sh --appsec
-
-# Install test tools
-./scripts/test.sh --tools
-
-# Run specific test with race detection
-./scripts/test.sh --race
-
-# Run with custom sleep time for service startup
-./scripts/test.sh --sleep 30
+make test/appsec
 ```
 
 The script provides:
@@ -269,13 +251,13 @@ For more specific control, you can use scripts directly:
 
 ```shell
 # Run specific linting configurations
-./scripts/lint.sh --tools
+make lint --tools
 
 # Format only specific file types
-./scripts/format.sh --go
+make format/go
 
 # Run specific test types
-./scripts/test.sh --contrib
+make test/contrib
 ```
 
 ### Docker Alternative

Makefile

@@ -95,15 +95,15 @@ test: tools-install test/unit ## Run all tests (core, integration, contrib)
 test/unit: tools-install ## Run unit tests
 	go test -v -failfast ./...
 
-.PHONY: test-appsec
+.PHONY: test/appsec
 test/appsec: tools-install ## Run tests with AppSec enabled
 	$(BIN_PATH) ./scripts/test.sh --appsec
 
-.PHONY: test-contrib
+.PHONY: test/contrib
 test/contrib: tools-install ## Run contrib package tests
 	$(BIN_PATH) ./scripts/test.sh --contrib
 
-.PHONY: test-integration
+.PHONY: test/integration
 test/integration: tools-install ## Run integration tests
 	$(BIN_PATH) ./scripts/test.sh --integration
 

appsec/appsecv1_test.go

@@ -10,14 +10,15 @@ import (
 	"strconv"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
 	"github.com/DataDog/dd-trace-go/v2/appsec"
 	"github.com/DataDog/dd-trace-go/v2/ddtrace/ext"
 	"github.com/DataDog/dd-trace-go/v2/ddtrace/mocktracer"
 	"github.com/DataDog/dd-trace-go/v2/ddtrace/tracer"
 	"github.com/DataDog/dd-trace-go/v2/internal/telemetry"
 	"github.com/DataDog/dd-trace-go/v2/internal/telemetry/telemetrytest"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 )
 
 func TestTrackUserLoginSuccessEvent(t *testing.T) {

contrib/99designs/gqlgen/appsec_test.go

@@ -18,12 +18,13 @@ import (
 	"github.com/99designs/gqlgen/graphql"
 	"github.com/99designs/gqlgen/graphql/handler"
 	"github.com/99designs/gqlgen/graphql/handler/transport"
-	"github.com/DataDog/dd-trace-go/v2/ddtrace/mocktracer"
-	"github.com/DataDog/dd-trace-go/v2/instrumentation/testutils"
 	"github.com/stretchr/testify/require"
 	"github.com/vektah/gqlparser/v2"
 	"github.com/vektah/gqlparser/v2/ast"
 	"github.com/vektah/gqlparser/v2/gqlerror"
+
+	"github.com/DataDog/dd-trace-go/v2/ddtrace/mocktracer"
+	"github.com/DataDog/dd-trace-go/v2/instrumentation/testutils"
 )
 
 func TestAppSec(t *testing.T) {

contrib/99designs/gqlgen/example_test.go

@@ -12,6 +12,7 @@ import (
 	"github.com/99designs/gqlgen/graphql/handler/testserver"
 
 	gqlgentrace "github.com/DataDog/dd-trace-go/contrib/99designs/gqlgen/v2"
+
 	"github.com/DataDog/dd-trace-go/v2/ddtrace/tracer"
 )
 

contrib/99designs/gqlgen/option.go

@@ -10,6 +10,7 @@ import (
 	"math"
 
 	"github.com/99designs/gqlgen/graphql"
+
 	"github.com/DataDog/dd-trace-go/v2/instrumentation"
 	instrgraphql "github.com/DataDog/dd-trace-go/v2/instrumentation/graphql"
 )

contrib/99designs/gqlgen/tracer_test.go

@@ -7,15 +7,17 @@ package gqlgen
 
 import (
 	"context"
+	"testing"
+
 	"github.com/99designs/gqlgen/client"
 	"github.com/99designs/gqlgen/graphql"
 	"github.com/99designs/gqlgen/graphql/handler/testserver"
 	"github.com/99designs/gqlgen/graphql/handler/transport"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"testing"
 
 	internaltestserver "github.com/DataDog/dd-trace-go/contrib/99designs/gqlgen/v2/internal/testserver"
+
 	"github.com/DataDog/dd-trace-go/v2/ddtrace/ext"
 	"github.com/DataDog/dd-trace-go/v2/ddtrace/mocktracer"
 )

contrib/IBM/sarama/example_test.go

@@ -11,6 +11,7 @@ import (
 	"log"
 
 	saramatrace "github.com/DataDog/dd-trace-go/contrib/IBM/sarama/v2"
+
 	"github.com/DataDog/dd-trace-go/v2/ddtrace/tracer"
 
 	"github.com/IBM/sarama"