contrib/google.golang.org/grpc: stop using deprecated packages (#1959)

Co-authored-by: Katie Hockman <katie@hockman.dev>
DataDog · Aug 31, 2023 · aa14b02 · aa14b02
1 parent 16c1f8b
commit aa14b02
Show file tree

Hide file tree

Showing 14 changed files with 399 additions and 206 deletions.
diff --git a/contrib/google.golang.org/grpc/appsec.go b/contrib/google.golang.org/grpc/appsec.go
@@ -6,6 +6,8 @@
 package grpc
 
 import (
+	"context"
+
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace"
 	"gopkg.in/DataDog/dd-trace-go.v1/internal/appsec/dyngo"
 	"gopkg.in/DataDog/dd-trace-go.v1/internal/appsec/dyngo/instrumentation"
@@ -15,7 +17,6 @@ import (
 	"gopkg.in/DataDog/dd-trace-go.v1/internal/log"
 
 	"github.com/DataDog/appsec-internal-go/netip"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"

diff --git a/contrib/google.golang.org/grpc/appsec_test.go b/contrib/google.golang.org/grpc/appsec_test.go
@@ -370,6 +370,7 @@ func (r *appsecRig) Close() {
 }
 
 type appsecFixtureServer struct {
+	UnimplementedFixtureServer
 	s fixtureServer
 }
 

diff --git a/contrib/google.golang.org/grpc/client.go b/contrib/google.golang.org/grpc/client.go
@@ -6,6 +6,7 @@
 package grpc
 
 import (
+	"context"
 	"net"
 
 	"gopkg.in/DataDog/dd-trace-go.v1/contrib/google.golang.org/internal/grpcutil"
@@ -14,7 +15,6 @@ import (
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"
 	"gopkg.in/DataDog/dd-trace-go.v1/internal/log"
 
-	context "golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/grpclog"
 	"google.golang.org/grpc/metadata"