Merge branch 'main' into francois.mazeau/appsec-system-tests

DataDog · Apr 14, 2023 · 0f170bf · 0f170bf
2 parents aaa9f85 + 259b49f
commit 0f170bf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,5 +1,8 @@
 run:
   deadline: 10m
+  skip-dirs:
+    # This package is an exception and has its own test job (Testing outlier gRPC v1.2).
+    - contrib/google.golang.org/grpc.v12
 linters:
   disable-all: true
   enable:

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -41,6 +41,12 @@ If a PR sits open for more than a month awaiting work or replies by the author,
 A set of [Style guidelines](https://github.com/DataDog/dd-trace-go/wiki/Style-guidelines) was added to our Wiki. Please spend some time browsing it.
 It will help tremendously in avoiding comments and speeding up the PR process.
 
+To run golangci-lint locally:
+
+```
+docker run --rm -v $(pwd):/app -w /app golangci/golangci-lint:v1.52.2 golangci-lint run -v
+```
+
 ### Integrations
 
 Please view our contrib [README.md](contrib/README.md) for information on new integrations. If you need support for a new integration, please file an issue to discuss before opening a PR.