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

.github/workflows/apps/go.mod

@@ -1,12 +1,12 @@
 module github.com/DataDog/dd-trace-go/.github/workflows/apps
 
-go 1.23.3
+go 1.22.0
 
 require (
+	github.com/DataDog/dd-trace-go/v2 v2.0.0-rc.2
 	github.com/Masterminds/semver/v3 v3.3.1
 	github.com/stretchr/testify v1.10.0
 	golang.org/x/mod v0.22.0
-	gopkg.in/DataDog/dd-trace-go.v1 v1.70.1
 )
 
 require (

.github/workflows/apps/go.sum

@@ -1,3 +1,5 @@
+github.com/DataDog/dd-trace-go/v2 v2.0.0-rc.2 h1:V9IEiUjs5+ye8xTReLo2KS/P4j0HvwS+YJXhRnmmDDY=
+github.com/DataDog/dd-trace-go/v2 v2.0.0-rc.2/go.mod h1:5heIdFEknx0pqz3WykyjDo/aMaxjkd8bMySlHPDj6jA=
 github.com/Masterminds/semver/v3 v3.3.1 h1:QtNSWtVZ3nBfk8mAOu/B6v7FMJ+NHTIgUPi7rj+4nv4=
 github.com/Masterminds/semver/v3 v3.3.1/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
@@ -8,8 +10,6 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
 golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
-gopkg.in/DataDog/dd-trace-go.v1 v1.70.1 h1:ZIRxAKlr3xr6xbMUDs3IDa6xq+ISv9zxyjaDCfwDjMY=
-gopkg.in/DataDog/dd-trace-go.v1 v1.70.1/go.mod h1:PMOSkeY4VfXiuPvGodeNLCZCFYU2VfOvjVI6cX5bGrc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

.github/workflows/apps/govulncheck-contribs-v2.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+find ./contrib -mindepth 2 -type f -name go.mod -exec dirname {} \; | while read dir ; do
+  echo "Checking $dir"
+  # govulncheck doesn't support modules with only a go.mod in the root
+  go_files=$(find $dir -maxdepth 1 -type f -name '*.go' | wc -l)
+  [[ $go_files -eq 0 ]] && dir=$(realpath "$(ls -d $dir/*/ | head)")
+
+  govulncheck -C $dir .
+done

.github/workflows/apps/latest_major_version.go

@@ -8,13 +8,14 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"sort"
-	"github.com/Masterminds/semver/v3"
-	"golang.org/x/mod/modfile"
 	"net/http"
 	"os"
 	"regexp"
+	"sort"
 	"strings"
+
+	"github.com/Masterminds/semver/v3"
+	"golang.org/x/mod/modfile"
 )
 
 type Tag struct {

.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/apps/test-contrib-submodules.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+set +e
+
+# This script is used to test the contrib submodules in the apps directory.
+# It is run by the GitHub Actions CI workflow defined in
+# .github/workflows/unit-integration-tests.yml.
+
+[[ -d ./contrib ]] || exit 0
+
+CONTRIBS=$(find ./contrib -mindepth 2 -type f -name go.mod -exec dirname {} \;)
+
+report_error=0
+
+for contrib in $CONTRIBS; do
+  echo "Testing contrib module: $contrib"
+  contrib_id=$(echo $contrib | sed 's/^\.\///g;s/[\/\.]/_/g')
+  cd $contrib
+  [[ "$1" = "smoke" ]] && go get -u -t ./...
+  gotestsum --junitfile ${TEST_RESULTS}/gotestsum-report-$contrib_id.xml -- ./... -v -race -coverprofile=coverage-$contrib_id.txt -covermode=atomic
+  [[ $? -ne 0 ]] && report_error=1
+  cd -
+done
+
+exit $report_error

.github/workflows/appsec.yml

@@ -25,19 +25,21 @@ on:
 
 env:
   DD_APPSEC_WAF_TIMEOUT: 1m
-  TESTS: >-
+  PACKAGES: >-
     ./appsec/...
     ./internal/appsec/...
-    ./contrib/gin-gonic/gin/...
-    ./contrib/google.golang.org/grpc/...
-    ./contrib/net/http/...
-    ./contrib/gorilla/mux/...
-    ./contrib/go-chi/chi/...
-    ./contrib/go-chi/chi.v5/...
-    ./contrib/labstack/echo.v4/...
-    ./contrib/99designs/gqlgen/...
-    ./contrib/graphql-go/graphql/...
-    ./contrib/graph-gophers/graphql-go/...
+  SUBMODULES: >-
+    ./contrib/database/sql
+    ./contrib/gin-gonic/gin
+    ./contrib/google.golang.org/grpc
+    ./contrib/net/http
+    ./contrib/gorilla/mux
+    ./contrib/go-chi/chi
+    ./contrib/go-chi/chi.v5
+    ./contrib/labstack/echo.v4
+    ./contrib/99designs/gqlgen
+    ./contrib/graphql-go/graphql
+    ./contrib/graph-gophers/graphql-go
 
 concurrency:
   # Automatically cancel previous runs if a new one is triggered to conserve resources.
@@ -68,6 +70,8 @@ jobs:
       path: ${{ steps.cfg.outputs.path }}
     steps:
       - uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.ref || github.ref }}
 
       - name: Compute cache configuration
         id: cfg
@@ -105,6 +109,8 @@ jobs:
       fail-fast: true # saving some CI time - macos runners are too long to get
     steps:
       - uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.ref || github.ref }}
 
       - name: Restore Go modules cache
         uses: actions/cache/restore@v4
@@ -130,16 +136,30 @@ jobs:
         run: |
           set -euxo pipefail
           cgocheck="GOEXPERIMENT=cgocheck2"
+          report_error=0
           for cgo in "0" "1"; do
             for appsec_enabled_env in "" "DD_APPSEC_ENABLED=true" "DD_APPSEC_ENABLED=false"; do
                 for cgocheck_env in "" "$cgocheck"; do
-                  if ! env CGO_ENABLED=$cgo $appsec_enabled_env $cgocheck_env go test -v $TESTS; then
-                    echo "Failed: env CGO_ENABLED=$cgo $appsec_enabled_env $cgocheck_env go test -v $TESTS"
-                    exit 1
+                  if ! env CGO_ENABLED=$cgo $appsec_enabled_env $cgocheck_env go test -v $PACKAGES; then
+                    echo "Failed: env CGO_ENABLED=$cgo $appsec_enabled_env $cgocheck_env go test -v $PACKAGES"
                   fi
+
+                  for submodule in $SUBMODULES; do
+                    if [[ $cgocheck_env == "GOEXPERIMENT=cgocheck2" && $submodule == "./contrib/gin-gonic/gin" ]]; then
+                      echo "Skipped: env CGO_ENABLED=$cgo $appsec_enabled_env $cgocheck_env go test -v . (submodule: $submodule, reason: gin-gonic/gin depends on leodido/go-urn that causes an internal compiler when GOEXPERIMENT=cgocheck2)"
+                      continue
+                    fi
+                    cd $submodule
+                    if ! env CGO_ENABLED=$cgo $appsec_enabled_env $cgocheck_env go test -v .; then
+                      echo "Failed: env CGO_ENABLED=$cgo $appsec_enabled_env $cgocheck_env go test -v . (submodule: $submodule)"
+                      report_error=1
+                    fi
+                    cd -
+                  done
                 done
             done
           done
+          exit $report_error
 
   # Tests cases were appsec end up being disabled at compilation time
   disabled:
@@ -152,6 +172,8 @@ jobs:
         runs-on: [ macos-latest, windows-latest, ubuntu-latest-16-cores ]
     steps:
       - uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.ref || github.ref }}
 
       - name: Restore Go modules cache
         uses: actions/cache/restore@v4
@@ -178,10 +200,17 @@ jobs:
           set -euxo pipefail
           for appsec_enabled_env in "" "DD_APPSEC_ENABLED=true" "DD_APPSEC_ENABLED=false"; do
             for go_tags in "" "-tags datadog.no_waf"; do
-              if ! env $appsec_enabled_env go test -v $go_tags $TESTS; then
-                echo "Failed: env $appsec_enabled_env go test -v $go_tags $TESTS"
-                exit 1
+              if ! env $appsec_enabled_env go test -v $go_tags $PACKAGES; then
+                echo "Failed: env $appsec_enabled_env go test -v $go_tags $PACKAGES"
               fi
+
+              for submodule in $SUBMODULES; do
+                cd $submodule
+                if ! env $appsec_enabled_env go test -v $go_tags .; then
+                  echo "Failed: env $appsec_enabled_env go test -v $go_tags . (submodule: $submodule)"
+                fi
+                cd -
+              done
             done
           done
 
@@ -200,6 +229,8 @@ jobs:
       fail-fast: false
     steps:
       - uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.ref || github.ref }}
 
       - name: Restore Go modules cache
         uses: actions/cache/restore@v4
@@ -241,30 +272,67 @@ jobs:
             golang:${{ matrix.go-version }}-${{ matrix.distribution }}
       - name: Install pre-requisites on Alpine
         if: matrix.distribution == 'alpine'
-        run: sudo docker exec -i test.runner apk add gcc musl-dev libc6-compat
+        run: sudo docker exec -i test.runner apk add gcc musl-dev libc6-compat bash
       - name: Output go env
         run: sudo docker exec -i test.runner go env
 
       - name: NOCGO, undefined appsec state
-        run: sudo docker exec -i test.runner env CGO_ENABLED=0 go test -v $TESTS
+        run: |
+          sudo docker exec -i -e CGO_ENABLED=0 test.runner go test -v $PACKAGES
+          for submodule in $SUBMODULES; do
+            if ! sudo docker exec -i -e CGO_ENABLED=0 test.runner bash -c "cd $submodule && go test -v ."; then
+              echo "Failed: env CGO_ENABLED=0 bash -c \"cd $submodule && go test -v .\" (submodule: $submodule)"
+            fi
+          done
       - name: NOCGO, appsec disabled
-        run: sudo docker exec -i test.runner env CGO_ENABLED=0 DD_APPSEC_ENABLED=false go test -v $TESTS
+        run: |
+          sudo docker exec -i -e CGO_ENABLED=0 -e DD_APPSEC_ENABLED=false test.runner go test -v $PACKAGES
+          for submodule in $SUBMODULES; do
+            if ! sudo docker exec -i -e CGO_ENABLED=0 -e DD_APPSEC_ENABLED=false test.runner bash -c "cd $submodule && go test -v ."; then
+              echo "Failed: env CGO_ENABLED=0 DD_APPSEC_ENABLED=false bash -c \"cd $submodule && go test -v .\" (submodule: $submodule)"
+            fi
+          done
       - name: NOCGO, appsec enabled
-        run: sudo docker exec -i test.runner env CGO_ENABLED=0 DD_APPSEC_ENABLED=true go test -v $TESTS
+        run: |
+          sudo docker exec -i -e CGO_ENABLED=0 -e DD_APPSEC_ENABLED=true test.runner go test -v $PACKAGES
+          for submodule in $SUBMODULES; do
+            if ! sudo docker exec -i -e CGO_ENABLED=0 -e DD_APPSEC_ENABLED=true test.runner bash -c "cd $submodule && go test -v ."; then
+              echo "Failed: env CGO_ENABLED=0 DD_APPSEC_ENABLED=true bash -c \"cd $submodule && go test -v .\" (submodule: $submodule)"
+            fi
+          done
       - name: CGO, undefined appsec state
-        run: sudo docker exec -i test.runner env CGO_ENABLED=1 go test -v $TESTS
+        run: |
+          sudo docker exec -i -e CGO_ENABLED=1 test.runner go test -v $PACKAGES
+          for submodule in $SUBMODULES; do
+            if ! sudo docker exec -i -e CGO_ENABLED=1 test.runner bash -c "cd $submodule && go test -v ."; then
+              echo "Failed: env CGO_ENABLED=1 bash -c \"cd $submodule && go test -v .\" (submodule: $submodule)"
+            fi
+          done
       - name: CGO, appsec disabled
-        run: sudo docker exec -i test.runner env CGO_ENABLED=1 DD_APPSEC_ENABLED=false go test -v $TESTS
+        run: |
+          sudo docker exec -i -e CGO_ENABLED=1 -e DD_APPSEC_ENABLED=false test.runner go test -v $PACKAGES
+          for submodule in $SUBMODULES; do
+            if ! sudo docker exec -i -e CGO_ENABLED=1 -e DD_APPSEC_ENABLED=false test.runner bash -c "cd $submodule && go test -v ."; then
+              echo "Failed: env CGO_ENABLED=1 DD_APPSEC_ENABLED=false bash -c \"cd $submodule && go test -v .\" (submodule: $submodule)"
+            fi
+          done
       - name: CGO, appsec enabled
-        run: sudo docker exec -i test.runner env CGO_ENABLED=1 DD_APPSEC_ENABLED=true go test -v $TESTS
+        run: |
+          sudo docker exec -i -e CGO_ENABLED=1 -e DD_APPSEC_ENABLED=true test.runner go test -v $PACKAGES
+          for submodule in $SUBMODULES; do
+            if ! sudo docker exec -i -e CGO_ENABLED=1 -e DD_APPSEC_ENABLED=true test.runner bash -c "cd $submodule && go test -v ."; then
+              echo "Failed: env CGO_ENABLED=1 DD_APPSEC_ENABLED=true bash -c \"cd $submodule && go test -v .\" (submodule: $submodule)"
+            fi
+          done
 
       - name: Clean up
         if: always()
         run: sudo docker rm --force test.runner || echo "Could not remove container"
 
+  # TODO(darccio): revert to use main on release
   test-app-smoke-tests:
     name: Smoke Tests
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.owner == 'DataDog'
-    uses: DataDog/appsec-go-test-app/.github/workflows/smoke-tests.yml@main
+    uses: DataDog/appsec-go-test-app/.github/workflows/smoke-tests.yml@dario.castane/AIT-3705/dd-trace-go.v2
     with:
-      dd-trace-go-version: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
+      dd-trace-go-version: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || '' }}

.github/workflows/govulncheck.yml

@@ -37,7 +37,4 @@ jobs:
       - name: Run govulncheck
         run: govulncheck ./ddtrace/... ./appsec/... ./profiler/... ./internal/...
       - name: Run govulncheck-contribs
-        run: |
-          go list -f '{{.Dir}}' ./contrib/... | while read dir ; do
-            govulncheck -C $dir .
-          done
+        run: ./.github/workflows/apps/govulncheck-contribs-v2.sh

.github/workflows/orchestrion.yml

@@ -21,6 +21,8 @@ jobs:
   test:
     name: 'Run Tests'
     uses: DataDog/orchestrion/.github/workflows/workflow_call.yml@main # we don't want to pin our own action
+    # we don't want to run this job as Orchestrion doesn't support v2 yet
+    if: false
     with:
       dd-trace-go-ref: ${{ github.sha }}
-      runs-on: ubuntu-latest-16-cores
+      runs-on: ubuntu-latest-16-cores

.github/workflows/parametric-tests.yml

@@ -37,12 +37,12 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: 'DataDog/system-tests'
-          ref: ${{ inputs.ref }}
+          ref: refs/heads/dario.castane/AIT-3705/dd-trace-go.v2
 
       - name: Checkout dd-trace-go
         uses: actions/checkout@v3
         with:
-          ref: ${{ inputs.branch_ref || github.ref }}
+          ref: ${{ inputs.ref || github.ref }}
           path: 'binaries/dd-trace-go'
 
       - uses: actions/setup-go@v3

.github/workflows/smoke-tests.yml

@@ -58,13 +58,20 @@ jobs:
         run: |-
           go get -u -t $PACKAGES
           go mod tidy
+          for d in `find . -iname go.mod | xargs -n1 dirname`; do pushd $d; go mod tidy; popd; done;
       - name: Install requested go-libddwaf version
         if: github.event_name == 'workflow_call' && inputs.go-libddwaf-ref != ''
         run: |-
           go get -u -t github.com/DataDog/go-libddwaf/v3@${{ inputs.go-libddwaf-ref }}
           go mod tidy
       - name: Compile dd-trace-go
         run: go build $PACKAGES
+      - name: Test contribs (v2)
+        # It needs to run before "Test dd-trace-go" to avoid TestTelemetryEnabled tests to fail.
+        run: |
+          go install gotest.tools/gotestsum@latest
+          mkdir -p $TEST_RESULTS
+          ./.github/workflows/apps/test-contrib-submodules.sh smoke
       - name: Test dd-trace-go
         env:
           DD_APPSEC_WAF_TIMEOUT: 1h

.github/workflows/system-tests.yml

@@ -48,7 +48,6 @@ jobs:
         scenario:
           - DEFAULT
           - INTEGRATIONS
-          - INTEGRATIONS_AWS
           - CROSSED_TRACING_LIBRARIES
           - APPSEC_DISABLED
           - APPSEC_BLOCKING
@@ -122,7 +121,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: 'DataDog/system-tests'
-          ref: ${{ inputs.ref }}
+          ref: refs/heads/dario.castane/AIT-3705/dd-trace-go.v2
 
       - name: Checkout dd-trace-go
         uses: actions/checkout@v3