[Draft; don't merge] v2.0.0-alpha

.github/workflows/apps/appsec-test-contrib-submodules.sh

@@ -22,7 +22,15 @@ function gotestsum_runner() {
 function docker_runner() {
   # ignore the first argument, which is the JUnit report
   shift
-  docker run --platform=$PLATFORM -v $PWD:$PWD -w $PWD -eCGO_ENABLED=$CGO_ENABLED -eDD_APPSEC_ENABLED=$DD_APPSEC_ENABLED -eDD_APPSEC_WAF_TIMEOUT=$DD_APPSEC_WAF_TIMEOUT golang go test -v "$@"
+  # capture the working directory for the test run
+  WD=$(realpath "$1"); shift
+  docker run \
+    --platform="$PLATFORM" \
+    -v "$PWD":"$PWD" -w "$WD" \
+    -eCGO_ENABLED="$CGO_ENABLED" \
+    -eDD_APPSEC_ENABLED="$DD_APPSEC_ENABLED" \
+    -eDD_APPSEC_WAF_TIMEOUT="$DD_APPSEC_WAF_TIMEOUT" \
+    golang go test -v "$@"
 }
 
 runner="gotestsum_runner"
@@ -32,16 +40,14 @@ if [[ "$1" == "docker" ]]; then
   [[ -z "$PLATFORM" ]] && PLATFORM="linux/arm64"
 fi
 
-$runner "$JUNIT_REPORT.xml" ./appsec/... ./internal/appsec/...
+$runner "$JUNIT_REPORT.xml" "." ./appsec/... ./internal/appsec/...
 
 SCOPES=("gin-gonic/gin" "google.golang.org/grpc" "net/http" "gorilla/mux" "go-chi/chi" "go-chi/chi.v5" "labstack/echo.v4")
 for SCOPE in "${SCOPES[@]}"; do
   contrib=$(basename "$SCOPE")
   if [[ "$V2_BRANCH" == "true" ]]; then
-    cd "./v2/contrib/$SCOPE"
-    $runner "$JUNIT_REPORT.$contrib.xml" .
-    cd -
+    $runner "$JUNIT_REPORT.$contrib.xml" "./v2/contrib/$SCOPE" "."
   else
-    $runner "$JUNIT_REPORT.$contrib.xml" "./contrib/$SCOPE/..."
+    $runner "$JUNIT_REPORT.$contrib.xml" "." "./contrib/$SCOPE/..."
   fi
 done

.github/workflows/apps/parse/parse_version.go

@@ -8,7 +8,7 @@ package main
 import (
 	"fmt"
 
-	"gopkg.in/DataDog/dd-trace-go.v1/internal/version"
+	"github.com/DataDog/dd-trace-go/v2/internal/version"
 )
 
 func ghOutput(varName, v string) string {

.github/workflows/appsec.yml

@@ -26,7 +26,8 @@ on:
 env:
   DD_APPSEC_WAF_TIMEOUT: 5s
   JUNIT_REPORT: /tmp/gotestsum-report
-  V2_BRANCH: false
+  TO_TEST: ./appsec/... ./internal/appsec/...
+  V2_BRANCH: true
 jobs:
   native:
     strategy:
@@ -66,7 +67,28 @@ jobs:
         run: |
           go install gotest.tools/gotestsum@latest
           # Run the tests with gotestsum
-          env ${{ matrix.cgocheck }} CGO_ENABLED=${{ matrix.cgo_enabled }} ${{ matrix.appsec_enabled }} ./.github/workflows/apps/appsec-test-contrib-submodules.sh
+          env ${{ matrix.cgocheck }} CGO_ENABLED=${{ matrix.cgo_enabled }} ${{ matrix.appsec_enabled }} gotestsum --junitfile $JUNIT_REPORT.xml -- -v $TO_TEST
+          cd ./v2/contrib/gin-gonic/gin
+          env ${{ matrix.cgocheck }} CGO_ENABLED=${{ matrix.cgo_enabled }} ${{ matrix.appsec_enabled }} gotestsum --junitfile $JUNIT_REPORT.gin.xml -- -v .
+          cd -
+          cd ./v2/contrib/google.golang.org/grpc
+          env ${{ matrix.cgocheck }} CGO_ENABLED=${{ matrix.cgo_enabled }} ${{ matrix.appsec_enabled }} gotestsum --junitfile $JUNIT_REPORT.grpc.xml -- -v .
+          cd -
+          cd ./v2/contrib/net/http
+          env ${{ matrix.cgocheck }} CGO_ENABLED=${{ matrix.cgo_enabled }} ${{ matrix.appsec_enabled }} gotestsum --junitfile $JUNIT_REPORT.http.xml -- -v .
+          cd -
+          cd ./v2/contrib/gorilla/mux
+          env ${{ matrix.cgocheck }} CGO_ENABLED=${{ matrix.cgo_enabled }} ${{ matrix.appsec_enabled }} gotestsum --junitfile $JUNIT_REPORT.gorilla.xml -- -v .
+          cd -
+          cd ./v2/contrib/go-chi/chi
+          env ${{ matrix.cgocheck }} CGO_ENABLED=${{ matrix.cgo_enabled }} ${{ matrix.appsec_enabled }} gotestsum --junitfile $JUNIT_REPORT.chi.xml -- -v .
+          cd -
+          cd ./v2/contrib/go-chi/chi.v5
+          env ${{ matrix.cgocheck }} CGO_ENABLED=${{ matrix.cgo_enabled }} ${{ matrix.appsec_enabled }} gotestsum --junitfile $JUNIT_REPORT.chi.xml -- -v .
+          cd -
+          cd ./v2/contrib/labstack/echo.v4
+          env ${{ matrix.cgocheck }} CGO_ENABLED=${{ matrix.cgo_enabled }} ${{ matrix.appsec_enabled }} gotestsum --junitfile $JUNIT_REPORT.echo.xml -- -v .
+          cd -
 
       - name: Upload the results to Datadog CI App
         uses: ./.github/actions/dd-ci-upload
@@ -107,7 +129,28 @@ jobs:
         run: |
           go install gotest.tools/gotestsum@latest
           # Run the tests with gotestsum
-          env ${{ matrix.appsec_enabled }} ./.github/workflows/apps/appsec-test-contrib-submodules.sh
+          env ${{ matrix.appsec_enabled }} gotestsum --junitfile $JUNIT_REPORT.xml -- -v $TO_TEST
+          cd ./v2/contrib/gin-gonic/gin
+          env ${{ matrix.cgocheck }} CGO_ENABLED=${{ matrix.cgo_enabled }} ${{ matrix.appsec_enabled }} gotestsum --junitfile $JUNIT_REPORT.gin.xml -- -v .
+          cd -
+          cd ./v2/contrib/google.golang.org/grpc
+          env ${{ matrix.cgocheck }} CGO_ENABLED=${{ matrix.cgo_enabled }} ${{ matrix.appsec_enabled }} gotestsum --junitfile $JUNIT_REPORT.grpc.xml -- -v .
+          cd -
+          cd ./v2/contrib/net/http
+          env ${{ matrix.cgocheck }} CGO_ENABLED=${{ matrix.cgo_enabled }} ${{ matrix.appsec_enabled }} gotestsum --junitfile $JUNIT_REPORT.http.xml -- -v .
+          cd -
+          cd ./v2/contrib/gorilla/mux
+          env ${{ matrix.cgocheck }} CGO_ENABLED=${{ matrix.cgo_enabled }} ${{ matrix.appsec_enabled }} gotestsum --junitfile $JUNIT_REPORT.gorilla.xml -- -v .
+          cd -
+          cd ./v2/contrib/go-chi/chi
+          env ${{ matrix.cgocheck }} CGO_ENABLED=${{ matrix.cgo_enabled }} ${{ matrix.appsec_enabled }} gotestsum --junitfile $JUNIT_REPORT.chi.xml -- -v .
+          cd -
+          cd ./v2/contrib/go-chi/chi.v5
+          env ${{ matrix.cgocheck }} CGO_ENABLED=${{ matrix.cgo_enabled }} ${{ matrix.appsec_enabled }} gotestsum --junitfile $JUNIT_REPORT.chi.xml -- -v .
+          cd -
+          cd ./v2/contrib/labstack/echo.v4
+          env ${{ matrix.cgocheck }} CGO_ENABLED=${{ matrix.cgo_enabled }} ${{ matrix.appsec_enabled }} gotestsum --junitfile $JUNIT_REPORT.echo.xml -- -v .
+          cd -
 
       - name: Upload the results to Datadog CI App
         uses: ./.github/actions/dd-ci-upload
@@ -158,7 +201,28 @@ jobs:
           # Install gotestsum to get the results in a junit file
           go install gotest.tools/gotestsum@latest
           # Run the tests with gotestsum
-          env CGO_ENABLED=${{ matrix.cgo_enabled }} ${{ matrix.appsec_enabled }} /bin/bash ./.github/workflows/apps/appsec-test-contrib-submodules.sh
+          env CGO_ENABLED=${{ matrix.cgo_enabled }} ${{ matrix.appsec_enabled }} gotestsum --junitfile $JUNIT_REPORT.xml -- -v $TO_TEST
+          cd ./v2/contrib/gin-gonic/gin
+          env ${{ matrix.cgocheck }} CGO_ENABLED=${{ matrix.cgo_enabled }} ${{ matrix.appsec_enabled }} gotestsum --junitfile $JUNIT_REPORT.gin.xml -- -v .
+          cd -
+          cd ./v2/contrib/google.golang.org/grpc
+          env ${{ matrix.cgocheck }} CGO_ENABLED=${{ matrix.cgo_enabled }} ${{ matrix.appsec_enabled }} gotestsum --junitfile $JUNIT_REPORT.grpc.xml -- -v .
+          cd -
+          cd ./v2/contrib/net/http
+          env ${{ matrix.cgocheck }} CGO_ENABLED=${{ matrix.cgo_enabled }} ${{ matrix.appsec_enabled }} gotestsum --junitfile $JUNIT_REPORT.http.xml -- -v .
+          cd -
+          cd ./v2/contrib/gorilla/mux
+          env ${{ matrix.cgocheck }} CGO_ENABLED=${{ matrix.cgo_enabled }} ${{ matrix.appsec_enabled }} gotestsum --junitfile $JUNIT_REPORT.gorilla.xml -- -v .
+          cd -
+          cd ./v2/contrib/go-chi/chi
+          env ${{ matrix.cgocheck }} CGO_ENABLED=${{ matrix.cgo_enabled }} ${{ matrix.appsec_enabled }} gotestsum --junitfile $JUNIT_REPORT.chi.xml -- -v .
+          cd -
+          cd ./v2/contrib/go-chi/chi.v5
+          env ${{ matrix.cgocheck }} CGO_ENABLED=${{ matrix.cgo_enabled }} ${{ matrix.appsec_enabled }} gotestsum --junitfile $JUNIT_REPORT.chi.xml -- -v .
+          cd -
+          cd ./v2/contrib/labstack/echo.v4
+          env ${{ matrix.cgocheck }} CGO_ENABLED=${{ matrix.cgo_enabled }} ${{ matrix.appsec_enabled }} gotestsum --junitfile $JUNIT_REPORT.echo.xml -- -v .
+          cd -
 
       - name: Upload the results to Datadog CI App
         if: matrix.distribution != 'alpine' # datadog-ci CLI doesn't work on alpine
@@ -194,17 +258,10 @@ jobs:
         with:
           platforms: arm64
       - run: |
-          env CGO_ENABLED=${{ matrix.cgo_enabled }} DD_APPSEC_ENABLED=${{ matrix.appsec_enabled }} DD_APPSEC_WAF_TIMEOUT=$DD_APPSEC_WAF_TIMEOUT ./.github/workflows/apps/appsec-test-contrib-submodules.sh docker linux/arm64
+          env V2_BRANCH=$V2_BRANCH CGO_ENABLED=${{ matrix.cgo_enabled }} DD_APPSEC_ENABLED=${{ matrix.appsec_enabled }} DD_APPSEC_WAF_TIMEOUT=$DD_APPSEC_WAF_TIMEOUT ./.github/workflows/apps/appsec-test-contrib-submodules.sh docker linux/arm64
 
+  # TODO(darccio): revert to use main on merge into main
   smoke-tests:
-    uses: DataDog/appsec-go-test-app/.github/workflows/smoke-tests.yml@main
-    if: inputs.ref != 'refs/heads/v2-dev'
-    with:
-      dd-trace-go-version: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
-
-  smoke-tests-v2:
-    # TODO(darccio): change to main branch on v2 release
     uses: DataDog/appsec-go-test-app/.github/workflows/smoke-tests.yml@dario.castane/AIT-3705/dd-trace-go.v2
-    if: inputs.ref == 'refs/heads/v2-dev'
     with:
       dd-trace-go-version: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}

.github/workflows/govulncheck.yml

@@ -15,7 +15,7 @@ on:
   workflow_dispatch:
 
 env:
-  V2_BRANCH: false
+  V2_BRANCH: true
 
 jobs:
   govulncheck-tests:
@@ -36,8 +36,7 @@ jobs:
       - name: Run govulncheck-contribs
         if: ${{ env.V2_BRANCH != 'true' }}
         run: |
-          # Excluding legacy contrib grpc.v12
-          go list -f '{{.Dir}}' ./contrib/... | grep -v -e grpc.v12 | while read dir ; do
+          go list -f '{{.Dir}}' ./contrib/... | while read dir ; do
             govulncheck -C $dir .
           done
       - name: Run govulncheck-contribs (v2)

.github/workflows/multios-unit-tests.yml

@@ -27,7 +27,7 @@ on:
         type: string
 
 env:
-  V2_BRANCH: false
+  V2_BRANCH: true
 
 jobs:
   test-multi-os:
@@ -53,7 +53,7 @@ jobs:
         if: ${{ env.V2_BRANCH != 'true' }}
         shell: bash
         run: |
-          go list ./... | grep -v -e grpc.v12 -e google.golang.org/api -e sarama -e confluent-kafka-go -e cmemprof | sort >packages.txt
+          go list ./... | grep -v -e google.golang.org/api -e sarama -e confluent-kafka-go -e cmemprof | sort >packages.txt
           gotestsum --junitfile ${REPORT} -- $(cat packages.txt) -v -coverprofile=coverage.txt -covermode=atomic -timeout 15m
       - name: "Runner ${{ matrix.runner-index }}: Test Core and Contrib (No Integration Tests) v2"
         if: ${{ env.V2_BRANCH == 'true' }}

.github/workflows/parametric-tests.yml

@@ -28,12 +28,13 @@ jobs:
       group: "APM Larger Runners"
     env:
       TEST_LIBRARY: golang
-      V2_BRANCH: false
+      V2_BRANCH: true
     steps:
       - name: Checkout system tests
         uses: actions/checkout@v3
         with:
           repository: 'DataDog/system-tests'
+          ref: refs/heads/dario.castane/AIT-3705/dd-trace-go.v2
 
       - name: Checkout dd-trace-go
         uses: actions/checkout@v3

.github/workflows/system-tests.yml

@@ -94,7 +94,7 @@ jobs:
       DD_API_KEY: ${{ secrets.DD_API_KEY }}
       SYSTEM_TESTS_E2E_DD_API_KEY: ${{ secrets.SYSTEM_TESTS_E2E_DD_API_KEY }}
       SYSTEM_TESTS_E2E_DD_APP_KEY: ${{ secrets.SYSTEM_TESTS_E2E_DD_APP_KEY }}
-      V2_BRANCH: false
+      V2_BRANCH: true
     name: Test (${{ matrix.weblog-variant }}, ${{ matrix.scenario }})
     steps:
       - name: Checkout system tests

.github/workflows/unit-integration-tests.yml

@@ -51,7 +51,7 @@ jobs:
     env:
        TEST_RESULTS: /tmp/test-results # path to where test results will be saved
        INTEGRATION: true
-       V2_BRANCH: false
+       V2_BRANCH: true
     services:
       datadog-agent:
         image: datadog/agent:latest
@@ -199,8 +199,8 @@ jobs:
             PACKAGE_NAMES=$(go list ./contrib/... | grep -v -e grpc.v12 -e google.golang.org/api)
             gotestsum --junitfile ${TEST_RESULTS}/gotestsum-report.xml -- $PACKAGE_NAMES -v -race -coverprofile=coverage.txt -covermode=atomic
 
-      - name: Test Contrib Submodules
-        if: always()
+      - name: Test Contrib Submodules (v2)
+        if: ${{ env.V2_BRANCH == 'true' }} && always()
         run: ./.github/workflows/apps/test-contrib-submodules.sh
 
       - name: Upload the results to Datadog CI App
@@ -248,28 +248,10 @@ jobs:
 
       - name: Testing outlier google.golang.org/api
         run: |
+              cd ./v2/contrib/google.golang.org/api
               go get google.golang.org/api@v0.121.0 # version used to generate code
               go mod tidy # Go1.16 doesn't update the sum file correctly after the go get, this tidy fixes it
-              go test -v ./contrib/google.golang.org/api/...
-
-      - name: Testing outlier gRPC v1.2
-        if: ${{ env.V2_BRANCH != 'true' }}
-        run: |
-              # This hacky approach is necessary because running the tests regularly
-              # do not allow using grpc-go@v1.2.0 alongside sketches-go@v1.0.0
-              go mod vendor
-
-              # Checkout grpc-go@v1.2.0
-              cd vendor/google.golang.org && rm -rf grpc
-              git clone https://github.com/grpc/grpc-go grpc && cd grpc
-              git fetch origin && git checkout v1.2.0 && cd ../..
-
-              # Checkout sketches-go@v1.0.0
-              cd vendor/github.com/DataDog && rm -rf sketches-go
-              git clone https://github.com/DataDog/sketches-go && cd sketches-go
-              git fetch origin && git checkout v1.0.0 && cd ../..
-
-              go test -mod=vendor -v ./contrib/google.golang.org/grpc.v12/...
+              go test -v ./...
 
   test-core:
     runs-on:

.gitignore

@@ -15,7 +15,7 @@ go.work*
 dd-trace-go.iml
 vendor
 
-/contrib/google.golang.org/grpc.v12/vendor/
-/contrib_coverage.txt
+contrib_coverage*.txt
 /core_coverage.txt
-/gotestsum-report.xml
+gotestsum-report*.xml
+/internal/apps/unit-of-work/unit-of-work

.gitlab-ci.yml

@@ -9,7 +9,7 @@ variables:
   INDEX_FILE: index.txt
   KUBERNETES_SERVICE_ACCOUNT_OVERWRITE: dd-trace-go
   FF_USE_LEGACY_KUBERNETES_EXECUTION_STRATEGY: "true"
-  BENCHMARK_TARGETS: "BenchmarkStartRequestSpan|BenchmarkHttpServeTrace|BenchmarkTracerAddSpans|BenchmarkStartSpan|BenchmarkSingleSpanRetention|BenchmarkOTelApiWithCustomTags|BenchmarkInjectW3C|BenchmarkExtractW3C|BenchmarkPartialFlushing"
+  BENCHMARK_TARGETS: "BenchmarkStartRequestSpan|BenchmarkHttpServeTrace|BenchmarkTracerAddSpans|BenchmarkStartSpan|BenchmarkSingleSpanRetention|BenchmarkOTelApiWithCustomTags|BenchmarkInjectW3C|BenchmarkExtractW3C|BenchmarkPartialFlushing|BenchmarkConfig|BenchmarkStartSpanConfig"
 
 include:
   - ".gitlab/benchmarks.yml"

.golangci.yml

@@ -1,8 +1,5 @@
 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:

CONTRIBUTING.md

@@ -49,7 +49,7 @@ docker run --rm -v $(pwd):/app -w /app golangci/golangci-lint:v1.52.2 golangci-l
 
 ### 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.
+Please view our contrib [README.md](v2/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.
 
 ### Go Modules