Replace "x/net/context" import with "context" (go-kit#810)

jcchavezs · Dec 7, 2018 · f688401 · f688401
1 parent e0e1b24
commit f688401
Show file tree

Hide file tree

Showing 6 changed files with 234 additions and 126 deletions.
diff --git a/examples/addsvc/pb/addsvc.pb.go b/examples/addsvc/pb/addsvc.pb.go
diff --git a/examples/addsvc/pkg/addtransport/grpc.go b/examples/addsvc/pkg/addtransport/grpc.go
@@ -10,7 +10,6 @@ import (
 	stdopentracing "github.com/opentracing/opentracing-go"
 	stdzipkin "github.com/openzipkin/zipkin-go"
 	"github.com/sony/gobreaker"
-	oldcontext "golang.org/x/net/context"
 	"golang.org/x/time/rate"
 
 	"github.com/go-kit/kit/circuitbreaker"
@@ -65,15 +64,15 @@ func NewGRPCServer(endpoints addendpoint.Set, otTracer stdopentracing.Tracer, zi
 	}
 }
 
-func (s *grpcServer) Sum(ctx oldcontext.Context, req *pb.SumRequest) (*pb.SumReply, error) {
+func (s *grpcServer) Sum(ctx context.Context, req *pb.SumRequest) (*pb.SumReply, error) {
 	_, rep, err := s.sum.ServeGRPC(ctx, req)
 	if err != nil {
 		return nil, err
 	}
 	return rep.(*pb.SumReply), nil
 }
 
-func (s *grpcServer) Concat(ctx oldcontext.Context, req *pb.ConcatRequest) (*pb.ConcatReply, error) {
+func (s *grpcServer) Concat(ctx context.Context, req *pb.ConcatRequest) (*pb.ConcatReply, error) {
 	_, rep, err := s.concat.ServeGRPC(ctx, req)
 	if err != nil {
 		return nil, err

diff --git a/sd/etcd/client_test.go b/sd/etcd/client_test.go
@@ -5,8 +5,7 @@ import (
 	"reflect"
 	"testing"
 	"time"
-
-	"golang.org/x/net/context"
+	"context"
 
 	etcd "go.etcd.io/etcd/client"
 )