general: upgrade dd-trace-go to v2 (don't merge yet)

README.md

@@ -87,8 +87,8 @@ import (
 	"testing"
 
 	ddtesting "github.com/DataDog/dd-sdk-go-testing"
-	ddhttp "gopkg.in/DataDog/dd-trace-go.v1/contrib/net/http"
-	ddtracer "gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"
+	ddhttp "github.com/DataDog/dd-trace-go/v2/contrib/net/http"
+	ddtracer "github.com/DataDog/dd-trace-go/v2/ddtrace/tracer"
 )
 
 func TestMain(m *testing.M) {
@@ -127,7 +127,7 @@ func TestWithExternalCalls(t *testing.T) {
 		ctx, finish := ddtesting.StartTestWithContext(ctx, t)
 		defer finish()
 
-		span, _ := ddtracer.SpanFromContext(ctx)
+		span, _ := tracer.SpanFromContext(ctx)
 
 		customNamer := func(req *http.Request) string {
 			value := fmt.Sprintf("%s %s", req.Method, req.URL.Path)

ginkgo/ginkgo.go

@@ -7,8 +7,8 @@ import (
 
 	ddtesting "github.com/DataDog/dd-sdk-go-testing"
 	utils "github.com/DataDog/dd-sdk-go-testing/ginkgo/internal"
+	"github.com/DataDog/dd-trace-go/v2/ddtrace/tracer"
 	"github.com/onsi/ginkgo/v2"
-	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"
 )
 
 // https://pkg.go.dev/github.com/onsi/ginkgo/v2@v2.1.6/dsl/core

ginkgo/go.mod

@@ -4,39 +4,49 @@ go 1.19
 
 require (
 	github.com/DataDog/dd-sdk-go-testing v0.0.0-20221028172224-4669ac175d98
-	github.com/onsi/ginkgo v1.16.4
+	github.com/DataDog/dd-trace-go/v2 v2.0.0-20240119101501-b9bd457fb404
+	github.com/onsi/ginkgo v1.16.5
 	github.com/onsi/ginkgo/v2 v2.5.0
 	github.com/onsi/gomega v1.24.0
-	gopkg.in/DataDog/dd-trace-go.v1 v1.43.1
 )
 
 require (
-	github.com/DataDog/datadog-agent/pkg/obfuscate v0.40.0 // indirect
-	github.com/DataDog/datadog-go/v5 v5.1.1 // indirect
-	github.com/DataDog/sketches-go v1.4.1 // indirect
-	github.com/Microsoft/go-winio v0.6.0 // indirect
-	github.com/cespare/xxhash/v2 v2.1.2 // indirect
-	github.com/dgraph-io/ristretto v0.1.1 // indirect
-	github.com/dustin/go-humanize v1.0.0 // indirect
-	github.com/go-logr/logr v1.2.3 // indirect
-	github.com/golang/glog v1.0.0 // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
-	github.com/google/uuid v1.3.0 // indirect
+	github.com/DataDog/appsec-internal-go v1.4.0 // indirect
+	github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0 // indirect
+	github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.1 // indirect
+	github.com/DataDog/datadog-go/v5 v5.3.0 // indirect
+	github.com/DataDog/go-libddwaf/v2 v2.2.3 // indirect
+	github.com/DataDog/go-tuf v1.0.2-0.5.2 // indirect
+	github.com/DataDog/sketches-go v1.4.2 // indirect
+	github.com/Microsoft/go-winio v0.6.1 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/dustin/go-humanize v1.0.1 // indirect
+	github.com/ebitengine/purego v0.5.0 // indirect
+	github.com/go-logr/logr v1.3.0 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/uuid v1.3.1 // indirect
+	github.com/hashicorp/errwrap v1.1.0 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
-	github.com/philhofer/fwd v1.1.1 // indirect
+	github.com/outcaste-io/ristretto v0.2.3 // indirect
+	github.com/philhofer/fwd v1.1.2 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/tinylib/msgp v1.1.6 // indirect
-	go.uber.org/atomic v1.10.0 // indirect
-	go4.org/intern v0.0.0-20220617035311-6925f38cc365 // indirect
-	go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 // indirect
-	golang.org/x/mod v0.6.0 // indirect
-	golang.org/x/net v0.7.0 // indirect
-	golang.org/x/sys v0.5.0 // indirect
-	golang.org/x/text v0.7.0 // indirect
-	golang.org/x/time v0.2.0 // indirect
-	golang.org/x/tools v0.2.0 // indirect
+	github.com/secure-systems-lab/go-securesystemslib v0.7.0 // indirect
+	github.com/tinylib/msgp v1.1.8 // indirect
+	go.uber.org/atomic v1.11.0 // indirect
+	go4.org/intern v0.0.0-20230525184215-6c62f75575cb // indirect
+	go4.org/unsafe/assume-no-moving-gc v0.0.0-20231121144256-b99613f794b6 // indirect
+	golang.org/x/mod v0.12.0 // indirect
+	golang.org/x/net v0.17.0 // indirect
+	golang.org/x/sys v0.15.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
+	golang.org/x/time v0.3.0 // indirect
+	golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
+	google.golang.org/protobuf v1.30.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	inet.af/netaddr v0.0.0-20220811202034-502d2d690317 // indirect
+	inet.af/netaddr v0.0.0-20230525184311-b8eac61e914a // indirect
 )
+
+replace github.com/DataDog/dd-sdk-go-testing => github.com/darccio/dd-sdk-go-testing v0.0.0-20240122120557-ffa41e029828