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

.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/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,20 @@
+#!/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 {} \;)
+
+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
+  cd -
+done

.github/workflows/appsec.yml

@@ -22,19 +22,20 @@ 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/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.
@@ -62,6 +63,8 @@ jobs:
       path: ${{ steps.cfg.outputs.path }}
     steps:
       - uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.ref || github.ref }}
 
       - name: Compute cache configuration
         id: cfg
@@ -99,6 +102,8 @@ jobs:
       fail-fast: true # saving some CI time - macos runners 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,10 +135,17 @@ jobs:
           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
+                    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)"
+                    fi
+                    cd -
+                  done
                 done
             done
           done
@@ -149,6 +161,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
@@ -175,10 +189,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
 
@@ -202,6 +223,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
@@ -243,29 +266,66 @@ 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
-    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

@@ -31,8 +31,4 @@ jobs:
       - name: Run govulncheck
         run: govulncheck ./ddtrace/... ./appsec/... ./profiler/... ./internal/...
       - name: Run govulncheck-contribs
-        run: |
-          # Excluding legacy contrib grpc.v12
-          go list -f '{{.Dir}}' ./contrib/... | grep -v -e grpc.v12 | while read dir ; do
-            govulncheck -C $dir .
-          done
+        run: ./.github/workflows/apps/govulncheck-contribs-v2.sh

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

@@ -53,7 +53,7 @@ jobs:
       - name: "Runner ${{ matrix.runner-index }}: Test Core and Contrib (No Integration Tests)"
         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: Upload the results to Datadog CI App
         if: always()

.github/workflows/parametric-tests.yml

@@ -33,7 +33,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

.github/workflows/smoke-tests.yml

@@ -54,13 +54,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/v2@${{ 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

@@ -108,7 +108,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

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

@@ -36,13 +36,15 @@ jobs:
         with:
           ref: ${{ inputs.ref || github.ref }}
 
-      - name: golangci-lint
-        uses: reviewdog/action-golangci-lint@v2
-        with:
-          go_version: ${{ inputs.go-version }}
-          golangci_lint_version: v1.52.2
-          fail_on_error: true
-          reporter: github-pr-review
+      ## Disabled for v2 until the main PR is merged,
+      ## as it's too large for reviewdog: https://github.com/DataDog/dd-trace-go/actions/runs/8423412332/job/23064985838#step:3:94
+      # - name: golangci-lint
+      #   uses: reviewdog/action-golangci-lint@v2
+      #   with:
+      #     go_version: ${{ inputs.go-version }}
+      #     golangci_lint_version: v1.52.2
+      #     fail_on_error: true
+      #     reporter: github-pr-review
 
   test-contrib:
     runs-on:
@@ -191,10 +193,8 @@ jobs:
           go-version: ${{ inputs.go-version }}
 
       - name: Test Contrib
-        run: |
-            mkdir -p $TEST_RESULTS
-            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
+        if: always()
+        run: ./.github/workflows/apps/test-contrib-submodules.sh
 
       - name: Upload the results to Datadog CI App
         if: always()
@@ -241,35 +241,10 @@ jobs:
 
       - name: Testing outlier google.golang.org/api
         run: |
+              cd ./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
-        run: |
-              # This hacky approach is necessary because running the tests regularly
-              # do not allow using grpc-go@v1.2.0 alongside sketches-go@v1.1.0.
-              # sketches-go@v1.0.0 is no longer possible to test because internal/datastreams/propagator.go
-              # expects sketches-go to have the package `github.com/DataDog/sketches-go/ddsketch/encoding` which
-              # is only present from v1.1.0 onwards.
-              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.1.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.1.0 && cd ../../../..
-
-              # Revert to old metadata functions as FromIncomingContext and NewOutgoingContext are not present in v1.2.0.
-              # These functions were updated to current versions to avoid compilation errors in the development environments.
-              sed  -i 's/metadata\.FromIncomingContext/metadata.FromContext/g' ./contrib/google.golang.org/grpc.v12/*
-              sed  -i 's/metadata\.NewOutgoingContext/metadata.NewContext/g' ./contrib/google.golang.org/grpc.v12/*
-
-              go test -mod=vendor -v ./contrib/google.golang.org/grpc.v12/...
+              go test -v ./...
 
   test-core:
     runs-on: