Merge pull request go-kit#421 from go-kit/stdlib-context

Use stdlib context instead of golang.org/x/net/context
jamesgist · Feb 4, 2017 · 4366e8c · 4366e8c
2 parents db87ca8 + 434ab6c
commit 4366e8c
Show file tree

Hide file tree

Showing 30 changed files with 40 additions and 45 deletions.
diff --git a/addsvc/cmd/addcli/main.go b/addsvc/cmd/addcli/main.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"context"
 	"flag"
 	"fmt"
 	"os"
@@ -12,7 +13,6 @@ import (
 	"github.com/lightstep/lightstep-tracer-go"
 	stdopentracing "github.com/opentracing/opentracing-go"
 	zipkin "github.com/openzipkin/zipkin-go-opentracing"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"sourcegraph.com/sourcegraph/appdash"
 	appdashot "sourcegraph.com/sourcegraph/appdash/opentracing"

diff --git a/addsvc/cmd/addsvc/main.go b/addsvc/cmd/addsvc/main.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"context"
 	"flag"
 	"fmt"
 	"net"
@@ -16,7 +17,6 @@ import (
 	stdopentracing "github.com/opentracing/opentracing-go"
 	zipkin "github.com/openzipkin/zipkin-go-opentracing"
 	stdprometheus "github.com/prometheus/client_golang/prometheus"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"sourcegraph.com/sourcegraph/appdash"
 	appdashot "sourcegraph.com/sourcegraph/appdash/opentracing"

diff --git a/addsvc/endpoints.go b/addsvc/endpoints.go
@@ -6,11 +6,10 @@ package addsvc
 // formats. It also includes endpoint middlewares.
 
 import (
+	"context"
 	"fmt"
 	"time"
 
-	"golang.org/x/net/context"
-
 	"github.com/go-kit/kit/endpoint"
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/metrics"

diff --git a/addsvc/service.go b/addsvc/service.go
@@ -4,11 +4,10 @@ package addsvc
 // implementation. It also includes service middlewares.
 
 import (
+	"context"
 	"errors"
 	"time"
 
-	"golang.org/x/net/context"
-
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/metrics"
 )

diff --git a/addsvc/transport_grpc.go b/addsvc/transport_grpc.go
@@ -4,8 +4,10 @@ package addsvc
 // It utilizes the transport/grpc.Server.
 
 import (
+	"context"
+
 	stdopentracing "github.com/opentracing/opentracing-go"
-	"golang.org/x/net/context"
+	oldcontext "golang.org/x/net/context"
 
 	"github.com/go-kit/kit/examples/addsvc/pb"
 	"github.com/go-kit/kit/log"
@@ -41,15 +43,15 @@ type grpcServer struct {
 	concat grpctransport.Handler
 }
 
-func (s *grpcServer) Sum(ctx context.Context, req *pb.SumRequest) (*pb.SumReply, error) {
+func (s *grpcServer) Sum(ctx oldcontext.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 context.Context, req *pb.ConcatRequest) (*pb.ConcatReply, error) {
+func (s *grpcServer) Concat(ctx oldcontext.Context, req *pb.ConcatRequest) (*pb.ConcatReply, error) {
 	_, rep, err := s.concat.ServeGRPC(ctx, req)
 	if err != nil {
 		return nil, err

diff --git a/addsvc/transport_http.go b/addsvc/transport_http.go
@@ -5,13 +5,13 @@ package addsvc
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"errors"
 	"io/ioutil"
 	"net/http"
 
 	stdopentracing "github.com/opentracing/opentracing-go"
-	"golang.org/x/net/context"
 
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/tracing/opentracing"

diff --git a/addsvc/transport_thrift.go b/addsvc/transport_thrift.go
@@ -7,7 +7,7 @@ package addsvc
 // yet. See https://github.com/go-kit/kit/issues/184.
 
 import (
-	"golang.org/x/net/context"
+	"context"
 
 	"github.com/go-kit/kit/endpoint"
 	thriftadd "github.com/go-kit/kit/examples/addsvc/thrift/gen-go/addsvc"

diff --git a/apigateway/main.go b/apigateway/main.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"flag"
 	"fmt"
@@ -18,7 +19,6 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/hashicorp/consul/api"
 	stdopentracing "github.com/opentracing/opentracing-go"
-	"golang.org/x/net/context"
 
 	"github.com/go-kit/kit/endpoint"
 	"github.com/go-kit/kit/examples/addsvc"

diff --git a/profilesvc/cmd/profilesvc/main.go b/profilesvc/cmd/profilesvc/main.go
@@ -1,15 +1,14 @@
 package main
 
 import (
+	"context"
 	"flag"
 	"fmt"
 	"net/http"
 	"os"
 	"os/signal"
 	"syscall"
 
-	"golang.org/x/net/context"
-
 	"github.com/go-kit/kit/examples/profilesvc"
 	"github.com/go-kit/kit/log"
 )

diff --git a/profilesvc/endpoints.go b/profilesvc/endpoints.go
@@ -1,11 +1,10 @@
 package profilesvc
 
 import (
+	"context"
 	"net/url"
 	"strings"
 
-	"golang.org/x/net/context"
-
 	"github.com/go-kit/kit/endpoint"
 	httptransport "github.com/go-kit/kit/transport/http"
 )

diff --git a/profilesvc/middlewares.go b/profilesvc/middlewares.go
@@ -1,10 +1,9 @@
 package profilesvc
 
 import (
+	"context"
 	"time"
 
-	"golang.org/x/net/context"
-
 	"github.com/go-kit/kit/log"
 )
 

diff --git a/profilesvc/service.go b/profilesvc/service.go
@@ -1,10 +1,9 @@
 package profilesvc
 
 import (
+	"context"
 	"errors"
 	"sync"
-
-	"golang.org/x/net/context"
 )
 
 // Service is a simple CRUD interface for user profiles.

diff --git a/profilesvc/transport.go b/profilesvc/transport.go
@@ -4,15 +4,14 @@ package profilesvc
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"errors"
 	"io/ioutil"
 	"net/http"
-
 	"net/url"
 
 	"github.com/gorilla/mux"
-	"golang.org/x/net/context"
 
 	"github.com/go-kit/kit/log"
 	httptransport "github.com/go-kit/kit/transport/http"

diff --git a/shipping/booking/endpoint.go b/shipping/booking/endpoint.go
@@ -1,10 +1,9 @@
 package booking
 
 import (
+	"context"
 	"time"
 
-	"golang.org/x/net/context"
-
 	"github.com/go-kit/kit/endpoint"
 
 	"github.com/go-kit/kit/examples/shipping/cargo"

diff --git a/shipping/booking/transport.go b/shipping/booking/transport.go
@@ -1,13 +1,13 @@
 package booking
 
 import (
+	"context"
 	"encoding/json"
 	"errors"
 	"net/http"
 	"time"
 
 	"github.com/gorilla/mux"
-	"golang.org/x/net/context"
 
 	kitlog "github.com/go-kit/kit/log"
 	kithttp "github.com/go-kit/kit/transport/http"

diff --git a/shipping/handling/endpoint.go b/shipping/handling/endpoint.go
@@ -1,10 +1,9 @@
 package handling
 
 import (
+	"context"
 	"time"
 
-	"golang.org/x/net/context"
-
 	"github.com/go-kit/kit/endpoint"
 
 	"github.com/go-kit/kit/examples/shipping/cargo"

diff --git a/shipping/handling/transport.go b/shipping/handling/transport.go
@@ -1,12 +1,12 @@
 package handling
 
 import (
+	"context"
 	"encoding/json"
 	"net/http"
 	"time"
 
 	"github.com/gorilla/mux"
-	"golang.org/x/net/context"
 
 	kitlog "github.com/go-kit/kit/log"
 	kithttp "github.com/go-kit/kit/transport/http"

diff --git a/shipping/inspection/inspection.go b/shipping/inspection/inspection.go
@@ -1,7 +1,9 @@
 // Package inspection provides means to inspect cargos.
 package inspection
 
-import "github.com/go-kit/kit/examples/shipping/cargo"
+import (
+	"github.com/go-kit/kit/examples/shipping/cargo"
+)
 
 // EventHandler provides means of subscribing to inspection events.
 type EventHandler interface {

diff --git a/shipping/location/location.go b/shipping/location/location.go
@@ -1,7 +1,9 @@
 // Package location provides the Location aggregate.
 package location
 
-import "errors"
+import (
+	"errors"
+)
 
 // UNLocode is the United Nations location code that uniquely identifies a
 // particular location.

diff --git a/shipping/main.go b/shipping/main.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"context"
 	"flag"
 	"fmt"
 	"net/http"
@@ -11,7 +12,6 @@ import (
 	"time"
 
 	stdprometheus "github.com/prometheus/client_golang/prometheus"
-	"golang.org/x/net/context"
 
 	"github.com/go-kit/kit/log"
 	kitprometheus "github.com/go-kit/kit/metrics/prometheus"

diff --git a/shipping/routing/proxying.go b/shipping/routing/proxying.go
@@ -1,13 +1,12 @@
 package routing
 
 import (
+	"context"
 	"encoding/json"
 	"net/http"
 	"net/url"
 	"time"
 
-	"golang.org/x/net/context"
-
 	"github.com/go-kit/kit/circuitbreaker"
 	"github.com/go-kit/kit/endpoint"
 	kithttp "github.com/go-kit/kit/transport/http"

diff --git a/shipping/routing/routing.go b/shipping/routing/routing.go
@@ -3,7 +3,9 @@
 // bounded context.
 package routing
 
-import "github.com/go-kit/kit/examples/shipping/cargo"
+import (
+	"github.com/go-kit/kit/examples/shipping/cargo"
+)
 
 // Service provides access to an external routing service.
 type Service interface {

diff --git a/shipping/tracking/endpoint.go b/shipping/tracking/endpoint.go
@@ -1,7 +1,7 @@
 package tracking
 
 import (
-	"golang.org/x/net/context"
+	"context"
 
 	"github.com/go-kit/kit/endpoint"
 )

diff --git a/shipping/tracking/transport.go b/shipping/tracking/transport.go
@@ -1,12 +1,12 @@
 package tracking
 
 import (
+	"context"
 	"encoding/json"
 	"errors"
 	"net/http"
 
 	"github.com/gorilla/mux"
-	"golang.org/x/net/context"
 
 	kitlog "github.com/go-kit/kit/log"
 	kithttp "github.com/go-kit/kit/transport/http"

diff --git a/stringsvc1/main.go b/stringsvc1/main.go
@@ -1,14 +1,13 @@
 package main
 
 import (
+	"context"
 	"encoding/json"
 	"errors"
 	"log"
 	"net/http"
 	"strings"
 
-	"golang.org/x/net/context"
-
 	"github.com/go-kit/kit/endpoint"
 	httptransport "github.com/go-kit/kit/transport/http"
 )

diff --git a/stringsvc2/main.go b/stringsvc2/main.go
@@ -1,11 +1,11 @@
 package main
 
 import (
+	"context"
 	"net/http"
 	"os"
 
 	stdprometheus "github.com/prometheus/client_golang/prometheus"
-	"golang.org/x/net/context"
 
 	"github.com/go-kit/kit/log"
 	kitprometheus "github.com/go-kit/kit/metrics/prometheus"

diff --git a/stringsvc2/transport.go b/stringsvc2/transport.go
@@ -1,11 +1,10 @@
 package main
 
 import (
+	"context"
 	"encoding/json"
 	"net/http"
 
-	"golang.org/x/net/context"
-
 	"github.com/go-kit/kit/endpoint"
 )
 

diff --git a/stringsvc3/main.go b/stringsvc3/main.go
@@ -1,12 +1,12 @@
 package main
 
 import (
+	"context"
 	"flag"
 	"net/http"
 	"os"
 
 	stdprometheus "github.com/prometheus/client_golang/prometheus"
-	"golang.org/x/net/context"
 
 	"github.com/go-kit/kit/log"
 	kitprometheus "github.com/go-kit/kit/metrics/prometheus"