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

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

@@ -14,8 +14,11 @@ echo "  DD_APPSEC_ENABLED=$DD_APPSEC_ENABLED"
 echo "  DD_APPSEC_WAF_TIMEOUT=$DD_APPSEC_WAF_TIMEOUT"
 
 function gotestsum_runner() {
-  report=$1; shift; shift
+  report=$1; shift
+  wd=$1; shift
+  cd "$wd"
   gotestsum --junitfile "$report" -- -v "$@"
+  cd -
 }
 
 function docker_runner() {
@@ -45,5 +48,5 @@ SCOPES=("gin-gonic/gin" "google.golang.org/grpc" "net/http" "gorilla/mux" "go-ch
 for SCOPE in "${SCOPES[@]}"; do
   contrib=$(basename "$SCOPE")
   echo "Running appsec tests for contrib/$SCOPE"
-  $runner "$JUNIT_REPORT.$contrib.xml" "." "./contrib/$SCOPE/..."
+  $runner "$JUNIT_REPORT.$contrib.xml" "./v2/contrib/$SCOPE" "."
 done

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

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+find ./v2/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 ./v2/contrib ]] || exit 0
+
+CONTRIBS=$(find ./v2/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

@@ -90,6 +90,8 @@ jobs:
     runs-on: ${{ matrix.runs-on }}
     steps:
       - uses: actions/checkout@v3
+        with:
+          ref: ${{ inputs.ref || github.ref }}
       - uses: actions/setup-go@v3 # TODO: rely on v4 which now provides github caching by default
         with:
           go-version: stable
@@ -195,7 +197,8 @@ jobs:
       - 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
 
+  # TODO(darccio): revert to use main on release
   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 }}

.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

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

@@ -44,8 +44,16 @@ 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;
+          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
         run: go test $PACKAGES
 

.github/workflows/system-tests.yml

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

@@ -188,10 +188,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()
@@ -238,27 +236,10 @@ jobs:
 
       - name: Testing outlier google.golang.org/api
         run: |
+              cd ./v2/contrib/google.golang.org/api
               go get google.golang.org/[email protected] # 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 [email protected] alongside [email protected]
-              go mod vendor
-
-              # Checkout [email protected]
-              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 [email protected]
-              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

@@ -1,6 +1,8 @@
 # go
 bin/
 go.work*
+!/go.work
+!/go.work.sum
 
 # profiling
 *.test
@@ -15,7 +17,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|BenchmarkGraphQL"
+  BENCHMARK_TARGETS: "BenchmarkStartRequestSpan|BenchmarkHttpServeTrace|BenchmarkTracerAddSpans|BenchmarkStartSpan|BenchmarkSingleSpanRetention|BenchmarkOTelApiWithCustomTags|BenchmarkInjectW3C|BenchmarkExtractW3C|BenchmarkPartialFlushing|BenchmarkConfig|BenchmarkStartSpanConfig|BenchmarkGraphQL"
 
 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
 

MIGRATING.md

@@ -4,9 +4,9 @@ This document outlines migrating from an older version of the Datadog tracer (0.
 
 Datadog's v1 version of the Go tracer provides not only an overhauled core that comes with huge performance improvements, but also the promise of a new and stable API to be relied on. It is the result of continuous feedback from customers, the community, as well as our extensive internal usage.
 
-As is common and recommended in the Go community, the best way to approach migrating to this new API is by using the [gradual code repair](https://talks.golang.org/2016/refactor.article) method. We have done the same internally and it has worked just great! For this exact reason we have provided a new, [semver](https://semver.org/) friendly import path to help with using both tracers in parallel, without conflict, for the duration of the migration. This new path is `gopkg.in/DataDog/dd-trace-go.v1`.
+As is common and recommended in the Go community, the best way to approach migrating to this new API is by using the [gradual code repair](https://talks.golang.org/2016/refactor.article) method. We have done the same internally and it has worked just great! For this exact reason we have provided a new, [semver](https://semver.org/) friendly import path to help with using both tracers in parallel, without conflict, for the duration of the migration. This new path is `github.com/DataDog/dd-trace-go/v2`.
 
-Our [godoc page](https://godoc.org/gopkg.in/DataDog/dd-trace-go.v1/ddtrace) should deem helpful during this process. We also have the [official documentation](https://docs.datadoghq.com/tracing/setup/go/), which contains a couple of examples.
+Our [godoc page](https://godoc.org/github.com/DataDog/dd-trace-go/v2/ddtrace) should deem helpful during this process. We also have the [official documentation](https://docs.datadoghq.com/tracing/setup/go/), which contains a couple of examples.
 
 This document will further outline some _before_ and _after_ examples.
 
@@ -32,15 +32,15 @@ tracer.Start(
 defer tracer.Stop()
 ```
 
-Notice that the tracer object is no longer returned. Consult the documentation to see [all possible parameters](https://godoc.org/gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer#StartOption) to the `Start` call.
+Notice that the tracer object is no longer returned. Consult the documentation to see [all possible parameters](https://godoc.org/github.com/DataDog/dd-trace-go/v2/ddtrace/tracer#StartOption) to the `Start` call.
 
 ## Service Information
 
-The [`tracer.SetServiceInfo`](https://godoc.org/github.com/DataDog/dd-trace-go/tracer#Tracer.SetServiceInfo) method has been deprecated. The service information is now set automatically based on the value of the [`ext.SpanType`](https://godoc.org/gopkg.in/DataDog/dd-trace-go.v1/ddtrace/ext#SpanType) tag that was set on the root span of a trace.
+The [`tracer.SetServiceInfo`](https://godoc.org/github.com/DataDog/dd-trace-go/tracer#Tracer.SetServiceInfo) method has been deprecated. The service information is now set automatically based on the value of the [`ext.SpanType`](https://godoc.org/github.com/DataDog/dd-trace-go/v2/ddtrace/ext#SpanType) tag that was set on the root span of a trace.
 
 ## Spans
 
-Starting spans is now possible with [functional options](https://godoc.org/gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer#StartSpanOption). Which means that all span properties (or none) can be set when starting a span dynamically. Before:
+Starting spans is now possible with [functional options](https://godoc.org/github.com/DataDog/dd-trace-go/v2/ddtrace/tracer#StartSpanOption). Which means that all span properties (or none) can be set when starting a span dynamically. Before:
 
 ```go
 span := tracer.NewRootSpan("web.request", "my_service", "resource_name")
@@ -52,27 +52,27 @@ Becomes:
 span := tracer.StartSpan("web.request", tracer.ServiceName("my_service"), tracer.ResourceName("resource_name"))
 ```
 
-We've done this because in many cases the extra parameters could become tedious, given that service names can be inherited and resource names can default to the operation name. This also allows us to have one single, more dynamic API for starting both root and child spans. Check out all possible [StartSpanOption](https://godoc.org/gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer#StartSpanOption) values to get an idea.
+We've done this because in many cases the extra parameters could become tedious, given that service names can be inherited and resource names can default to the operation name. This also allows us to have one single, more dynamic API for starting both root and child spans. Check out all possible [StartSpanOption](https://godoc.org/github.com/DataDog/dd-trace-go/v2/ddtrace/tracer#StartSpanOption) values to get an idea.
 
 ### Children
 
 Here is an example for spawning a child of the previously declared span:
 ```go
 child := tracer.StartSpan("process.user", tracer.ChildOf(span.Context()))
 ```
-You will notice that the new tracer also introduces the concept of [SpanContext](https://godoc.org/gopkg.in/DataDog/dd-trace-go.v1/ddtrace#SpanContext), which is different from Go's context and is used to carry information needed to spawn children of a specific span and can be propagated cross-process. To learn more about distributed tracing check the package-level [documentation](https://godoc.org/gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer#ChildOf) of the `tracer` package.
+You will notice that the new tracer also introduces the concept of [SpanContext](https://godoc.org/github.com/DataDog/dd-trace-go/v2/ddtrace#SpanContext), which is different from Go's context and is used to carry information needed to spawn children of a specific span and can be propagated cross-process. To learn more about distributed tracing check the package-level [documentation](https://godoc.org/github.com/DataDog/dd-trace-go/v2/ddtrace/tracer#ChildOf) of the `tracer` package.
 
 ### Using Go's context
 
 It is also possible to create children of spans that live inside Go's [context](https://golang.org/pkg/context/):
 ```go
 child, ctx := tracer.StartSpanFromContext(ctx, "process.user", tracer.Tag("key", "value"))
 ```
-This will create a child of the span which exists inside the passed context and return it, along with a new context which contains the new span. To add or retrieve a span from a context use the [`ContextWithSpan`](https://godoc.org/gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer#ContextWithSpan) or [`SpanFromContext`](https://godoc.org/gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer#SpanFromContext) functions.
+This will create a child of the span which exists inside the passed context and return it, along with a new context which contains the new span. To add or retrieve a span from a context use the [`ContextWithSpan`](https://godoc.org/github.com/DataDog/dd-trace-go/v2/ddtrace/tracer#ContextWithSpan) or [`SpanFromContext`](https://godoc.org/github.com/DataDog/dd-trace-go/v2/ddtrace/tracer#SpanFromContext) functions.
 
 ### Setting errors
 
-The [`SetError`](https://godoc.org/github.com/DataDog/dd-trace-go/tracer#Span.SetError) has been deprecated in favour of the [`ext.Error`](https://godoc.org/gopkg.in/DataDog/dd-trace-go.v1/ddtrace/ext#Error) tag value which matches other tracing libraries in the wild. Whereas before we had:
+The [`SetError`](https://godoc.org/github.com/DataDog/dd-trace-go/tracer#Span.SetError) has been deprecated in favour of the [`ext.Error`](https://godoc.org/github.com/DataDog/dd-trace-go/v2/ddtrace/ext#Error) tag value which matches other tracing libraries in the wild. Whereas before we had:
 
 ```go
 span.SetError(err)
@@ -88,7 +88,7 @@ Note that this tag can accept value of the types `error`, `string` and `bool` as
 
 ### Finishing
 
-The [`FinishWithErr`](https://godoc.org/github.com/DataDog/dd-trace-go/tracer#Span.FinishWithErr) and [`FinishWithTime`](https://godoc.org/github.com/DataDog/dd-trace-go/tracer#Span.FinishWithTime) methods have been removed in favour of a set of [`FinishOption`](https://godoc.org/gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer#FinishOption). For example, this would now become:
+The [`FinishWithErr`](https://godoc.org/github.com/DataDog/dd-trace-go/tracer#Span.FinishWithErr) and [`FinishWithTime`](https://godoc.org/github.com/DataDog/dd-trace-go/tracer#Span.FinishWithTime) methods have been removed in favour of a set of [`FinishOption`](https://godoc.org/github.com/DataDog/dd-trace-go/v2/ddtrace/tracer#FinishOption). For example, this would now become:
 
 ```go
 span.Finish(tracer.WithError(err), tracer.FinishTime(t))
@@ -100,5 +100,5 @@ Providing a `nil` value as an error is perfectly fine and will not mark the span
 
 The new version of the tracer also comes with a lot of new features, such as support for distributed tracing and distributed sampling priority. 
 
-* package level documentation of the [`tracer` package](https://godoc.org/gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer) for a better overview.
+* package level documentation of the [`tracer` package](https://godoc.org/github.com/DataDog/dd-trace-go/v2/ddtrace/tracer) for a better overview.
 * [official documentation](https://docs.datadoghq.com/tracing/setup/go/)