fix: update dd-trace-go/instrumentation/testutils/grpc dependency to v2.1.0-dev across multiple modules

darccio · darccio · commit e5cfb7b3dd02 · 2025-03-28T20:02:04.000+01:00
diff --git a/contrib/envoyproxy/go-control-plane/go.mod b/contrib/envoyproxy/go-control-plane/go.mod
@@ -84,6 +84,4 @@ require (
 
 replace github.com/DataDog/dd-trace-go/contrib/google.golang.org/grpc/v2 => ../../google.golang.org/grpc
 
-replace github.com/DataDog/dd-trace-go/instrumentation/testutils/grpc/v2 => ../../../instrumentation/testutils/grpc
-
 replace github.com/DataDog/dd-trace-go/v2 => ../../..
diff --git a/contrib/envoyproxy/go-control-plane/go.sum b/contrib/envoyproxy/go-control-plane/go.sum
@@ -18,8 +18,8 @@ github.com/DataDog/datadog-agent/pkg/version v0.64.0-rc.1 h1:eg+XW2CzOwFa//bjoXi
 github.com/DataDog/datadog-agent/pkg/version v0.64.0-rc.1/go.mod h1:DgOVsfSRaNV4GZNl/qgoZjG3hJjoYUNWPPhbfTfTqtY=
 github.com/DataDog/datadog-go/v5 v5.6.0 h1:2oCLxjF/4htd55piM75baflj/KoE6VYS7alEUqFvRDw=
 github.com/DataDog/datadog-go/v5 v5.6.0/go.mod h1:K9kcYBlxkcPP8tvvjZZKs/m1edNAUFzBbdpTUKfCsuw=
-github.com/DataDog/dd-trace-go/instrumentation/testutils/grpc/v2 v2.0.0-rc.9 h1:z9+fBFxYlqLASoYk8AnVmtxcWWeN+ddo8lRuQjsj9+Q=
-github.com/DataDog/dd-trace-go/instrumentation/testutils/grpc/v2 v2.0.0-rc.9/go.mod h1:HxVBX5Kj/nOJfRxXael21q0yEOmikeyUQWa747sn0Zg=
+github.com/DataDog/dd-trace-go/instrumentation/testutils/grpc/v2 v2.1.0-dev h1:6BeQ8qtvq8EQWU3s3Zje6cSL5raBCJKlsoQWapJjqa4=
+github.com/DataDog/dd-trace-go/instrumentation/testutils/grpc/v2 v2.1.0-dev/go.mod h1:CrfXzeeh160GMNcpGllK8Pldr8oIo8PFS5S48VaUrMw=
 github.com/DataDog/go-libddwaf/v3 v3.5.4 h1:cLV5lmGhrUBnHG50EUXdqPQAlJdVCp9n3aQ5bDWJEAg=
 github.com/DataDog/go-libddwaf/v3 v3.5.4/go.mod h1:HoLUHdj0NybsPBth/UppTcg8/DKA4g+AXuk8cZ6nuoo=
 github.com/DataDog/go-runtime-metrics-internal v0.0.4-0.20241206090539-a14610dc22b6 h1:bpitH5JbjBhfcTG+H2RkkiUXpYa8xSuIPnyNtTaSPog=
diff --git a/internal/orchestrion/_integration/go.mod b/internal/orchestrion/_integration/go.mod
@@ -443,6 +443,4 @@ replace github.com/DataDog/dd-trace-go/contrib/valkey-io/valkey-go/v2 => ../../.
 
 replace github.com/DataDog/dd-trace-go/orchestrion/all/v2 => ../../../orchestrion/all
 
-replace github.com/DataDog/dd-trace-go/instrumentation/testutils/grpc/v2 => ../../../instrumentation/testutils/grpc
-
 replace github.com/DataDog/dd-trace-go/v2 => ../../..
diff --git a/internal/orchestrion/_integration/go.sum b/internal/orchestrion/_integration/go.sum
@@ -657,8 +657,8 @@ github.com/DataDog/datadog-agent/pkg/version v0.64.0-rc.1 h1:eg+XW2CzOwFa//bjoXi
 github.com/DataDog/datadog-agent/pkg/version v0.64.0-rc.1/go.mod h1:DgOVsfSRaNV4GZNl/qgoZjG3hJjoYUNWPPhbfTfTqtY=
 github.com/DataDog/datadog-go/v5 v5.6.0 h1:2oCLxjF/4htd55piM75baflj/KoE6VYS7alEUqFvRDw=
 github.com/DataDog/datadog-go/v5 v5.6.0/go.mod h1:K9kcYBlxkcPP8tvvjZZKs/m1edNAUFzBbdpTUKfCsuw=
-github.com/DataDog/dd-trace-go/instrumentation/testutils/grpc/v2 v2.0.0-rc.9 h1:z9+fBFxYlqLASoYk8AnVmtxcWWeN+ddo8lRuQjsj9+Q=
-github.com/DataDog/dd-trace-go/instrumentation/testutils/grpc/v2 v2.0.0-rc.9/go.mod h1:HxVBX5Kj/nOJfRxXael21q0yEOmikeyUQWa747sn0Zg=
+github.com/DataDog/dd-trace-go/instrumentation/testutils/grpc/v2 v2.1.0-dev h1:6BeQ8qtvq8EQWU3s3Zje6cSL5raBCJKlsoQWapJjqa4=
+github.com/DataDog/dd-trace-go/instrumentation/testutils/grpc/v2 v2.1.0-dev/go.mod h1:CrfXzeeh160GMNcpGllK8Pldr8oIo8PFS5S48VaUrMw=
 github.com/DataDog/go-libddwaf/v3 v3.5.4 h1:cLV5lmGhrUBnHG50EUXdqPQAlJdVCp9n3aQ5bDWJEAg=
 github.com/DataDog/go-libddwaf/v3 v3.5.4/go.mod h1:HoLUHdj0NybsPBth/UppTcg8/DKA4g+AXuk8cZ6nuoo=
 github.com/DataDog/go-runtime-metrics-internal v0.0.4-0.20241206090539-a14610dc22b6 h1:bpitH5JbjBhfcTG+H2RkkiUXpYa8xSuIPnyNtTaSPog=
diff --git a/internal/traceprof/traceproftest/go.mod b/internal/traceprof/traceproftest/go.mod
@@ -82,8 +82,6 @@ require (
 
 replace github.com/DataDog/dd-trace-go/contrib/google.golang.org/grpc/v2 => ../../../contrib/google.golang.org/grpc
 
-replace github.com/DataDog/dd-trace-go/instrumentation/testutils/grpc/v2 => ../../../instrumentation/testutils/grpc
-
 replace github.com/DataDog/dd-trace-go/contrib/julienschmidt/httprouter/v2 => ../../../contrib/julienschmidt/httprouter
 
 replace github.com/DataDog/dd-trace-go/v2 => ../../..
diff --git a/internal/traceprof/traceproftest/go.sum b/internal/traceprof/traceproftest/go.sum
@@ -18,6 +18,8 @@ github.com/DataDog/datadog-agent/pkg/version v0.64.0-rc.1 h1:eg+XW2CzOwFa//bjoXi
 github.com/DataDog/datadog-agent/pkg/version v0.64.0-rc.1/go.mod h1:DgOVsfSRaNV4GZNl/qgoZjG3hJjoYUNWPPhbfTfTqtY=
 github.com/DataDog/datadog-go/v5 v5.6.0 h1:2oCLxjF/4htd55piM75baflj/KoE6VYS7alEUqFvRDw=
 github.com/DataDog/datadog-go/v5 v5.6.0/go.mod h1:K9kcYBlxkcPP8tvvjZZKs/m1edNAUFzBbdpTUKfCsuw=
+github.com/DataDog/dd-trace-go/instrumentation/testutils/grpc/v2 v2.1.0-dev h1:6BeQ8qtvq8EQWU3s3Zje6cSL5raBCJKlsoQWapJjqa4=
+github.com/DataDog/dd-trace-go/instrumentation/testutils/grpc/v2 v2.1.0-dev/go.mod h1:CrfXzeeh160GMNcpGllK8Pldr8oIo8PFS5S48VaUrMw=
 github.com/DataDog/go-libddwaf/v3 v3.5.4 h1:cLV5lmGhrUBnHG50EUXdqPQAlJdVCp9n3aQ5bDWJEAg=
 github.com/DataDog/go-libddwaf/v3 v3.5.4/go.mod h1:HoLUHdj0NybsPBth/UppTcg8/DKA4g+AXuk8cZ6nuoo=
 github.com/DataDog/go-runtime-metrics-internal v0.0.4-0.20241206090539-a14610dc22b6 h1:bpitH5JbjBhfcTG+H2RkkiUXpYa8xSuIPnyNtTaSPog=
diff --git a/orchestrion/all/go.mod b/orchestrion/all/go.mod
@@ -320,6 +320,5 @@ replace (
 	github.com/DataDog/dd-trace-go/contrib/sirupsen/logrus/v2 => ../../contrib/sirupsen/logrus
 	github.com/DataDog/dd-trace-go/contrib/twitchtv/twirp/v2 => ../../contrib/twitchtv/twirp
 	github.com/DataDog/dd-trace-go/contrib/valkey-io/valkey-go/v2 => ../../contrib/valkey-io/valkey-go
-	github.com/DataDog/dd-trace-go/instrumentation/testutils/grpc/v2 => ../../instrumentation/testutils/grpc
 	github.com/DataDog/dd-trace-go/v2 => ../..
 )
diff --git a/orchestrion/all/go.sum b/orchestrion/all/go.sum
@@ -41,8 +41,8 @@ github.com/DataDog/datadog-agent/pkg/version v0.64.0-rc.1 h1:eg+XW2CzOwFa//bjoXi
 github.com/DataDog/datadog-agent/pkg/version v0.64.0-rc.1/go.mod h1:DgOVsfSRaNV4GZNl/qgoZjG3hJjoYUNWPPhbfTfTqtY=
 github.com/DataDog/datadog-go/v5 v5.6.0 h1:2oCLxjF/4htd55piM75baflj/KoE6VYS7alEUqFvRDw=
 github.com/DataDog/datadog-go/v5 v5.6.0/go.mod h1:K9kcYBlxkcPP8tvvjZZKs/m1edNAUFzBbdpTUKfCsuw=
-github.com/DataDog/dd-trace-go/instrumentation/testutils/grpc/v2 v2.0.0-rc.9 h1:z9+fBFxYlqLASoYk8AnVmtxcWWeN+ddo8lRuQjsj9+Q=
-github.com/DataDog/dd-trace-go/instrumentation/testutils/grpc/v2 v2.0.0-rc.9/go.mod h1:HxVBX5Kj/nOJfRxXael21q0yEOmikeyUQWa747sn0Zg=
+github.com/DataDog/dd-trace-go/instrumentation/testutils/grpc/v2 v2.1.0-dev h1:6BeQ8qtvq8EQWU3s3Zje6cSL5raBCJKlsoQWapJjqa4=
+github.com/DataDog/dd-trace-go/instrumentation/testutils/grpc/v2 v2.1.0-dev/go.mod h1:CrfXzeeh160GMNcpGllK8Pldr8oIo8PFS5S48VaUrMw=
 github.com/DataDog/go-libddwaf/v3 v3.5.4 h1:cLV5lmGhrUBnHG50EUXdqPQAlJdVCp9n3aQ5bDWJEAg=
 github.com/DataDog/go-libddwaf/v3 v3.5.4/go.mod h1:HoLUHdj0NybsPBth/UppTcg8/DKA4g+AXuk8cZ6nuoo=
 github.com/DataDog/go-runtime-metrics-internal v0.0.4-0.20241206090539-a14610dc22b6 h1:bpitH5JbjBhfcTG+H2RkkiUXpYa8xSuIPnyNtTaSPog=
diff --git a/tools/v2check/_stage/go.mod b/tools/v2check/_stage/go.mod
@@ -3,7 +3,7 @@ module github.com/DataDog/dd-trace-go/tools/v2check/_stage
 go 1.23.0
 
 require (
-	github.com/DataDog/dd-trace-go/v2 v2.0.0-rc.9
+	github.com/DataDog/dd-trace-go/v2 v2.1.0-dev
 	gopkg.in/DataDog/dd-trace-go.v1 v1.71.1
 )
 
diff --git a/tools/v2check/go.mod b/tools/v2check/go.mod
@@ -3,7 +3,7 @@ module github.com/DataDog/dd-trace-go/tools/v2check
 go 1.23.0
 
 require (
-	github.com/DataDog/dd-trace-go/v2 v2.0.0-rc.9
+	github.com/DataDog/dd-trace-go/v2 v2.1.0-dev
 	golang.org/x/tools v0.30.0
 	gopkg.in/DataDog/dd-trace-go.v1 v1.71.1
 )

Original file line number	Diff line number	Diff line change
`@@ -320,6 +320,5 @@ replace (`
`320`	`320`	`github.com/DataDog/dd-trace-go/contrib/sirupsen/logrus/v2 => ../../contrib/sirupsen/logrus`
`321`	`321`	`github.com/DataDog/dd-trace-go/contrib/twitchtv/twirp/v2 => ../../contrib/twitchtv/twirp`
`322`	`322`	`github.com/DataDog/dd-trace-go/contrib/valkey-io/valkey-go/v2 => ../../contrib/valkey-io/valkey-go`
`323`		`- github.com/DataDog/dd-trace-go/instrumentation/testutils/grpc/v2 => ../../instrumentation/testutils/grpc`
`324`	`323`	`github.com/DataDog/dd-trace-go/v2 => ../..`
`325`	`324`	`)`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ module github.com/DataDog/dd-trace-go/tools/v2check/_stage`
`3`	`3`	`go 1.23.0`
`4`	`4`
`5`	`5`	`require (`
`6`		`- github.com/DataDog/dd-trace-go/v2 v2.0.0-rc.9`
	`6`	`+ github.com/DataDog/dd-trace-go/v2 v2.1.0-dev`
`7`	`7`	`gopkg.in/DataDog/dd-trace-go.v1 v1.71.1`
`8`	`8`	`)`
`9`	`9`