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

Use stdlib context instead of golang.org/x/net/context
go-kit · Feb 4, 2017 · c5e750d · c5e750d
2 parents 4eb1e49 + 1f1ad4d
commit c5e750d
Show file tree

Hide file tree

Showing 77 changed files with 111 additions and 122 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,6 @@ language: go
 script: go test -race -v ./...
 
 go:
-    - 1.5.4
-    - 1.6.3
-    - 1.7.1
+    - 1.7.4
+    - 1.8beta2
     - tip
diff --git a/auth/jwt/README.md b/auth/jwt/README.md
@@ -92,7 +92,7 @@ Example of use in a server:
 
 ```go
 import (
-	"golang.org/x/net/context"
+	"context"
 
 	"github.com/go-kit/kit/auth/jwt"
 	"github.com/go-kit/kit/log"

diff --git a/auth/jwt/middleware.go b/auth/jwt/middleware.go
@@ -1,10 +1,10 @@
 package jwt
 
 import (
+	"context"
 	"errors"
 
 	jwt "github.com/dgrijalva/jwt-go"
-	"golang.org/x/net/context"
 
 	"github.com/go-kit/kit/endpoint"
 )

diff --git a/auth/jwt/middleware_test.go b/auth/jwt/middleware_test.go
@@ -1,11 +1,10 @@
 package jwt
 
 import (
+	"context"
 	"testing"
 
 	jwt "github.com/dgrijalva/jwt-go"
-
-	"golang.org/x/net/context"
 )
 
 var (

diff --git a/auth/jwt/transport.go b/auth/jwt/transport.go
@@ -1,11 +1,11 @@
 package jwt
 
 import (
+	"context"
 	"fmt"
 	stdhttp "net/http"
 	"strings"
 
-	"golang.org/x/net/context"
 	"google.golang.org/grpc/metadata"
 
 	"github.com/go-kit/kit/transport/grpc"

diff --git a/auth/jwt/transport_test.go b/auth/jwt/transport_test.go
@@ -1,13 +1,12 @@
 package jwt
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 	"testing"
 
 	"google.golang.org/grpc/metadata"
-
-	"golang.org/x/net/context"
 )
 
 func TestToHTTPContext(t *testing.T) {

diff --git a/circle.yml b/circle.yml
@@ -1,6 +1,8 @@
 machine:
   pre:
     - curl -sSL https://s3.amazonaws.com/circle-downloads/install-circleci-docker.sh | bash -s -- 1.10.0
+    - sudo rm -rf /usr/local/go
+    - curl -sSL https://storage.googleapis.com/golang/go1.7.4.linux-amd64.tar.gz | sudo tar xz -C /usr/local
   services:
     - docker
 
@@ -14,6 +16,7 @@ test:
   pre:
     - mkdir -p /home/ubuntu/.go_workspace/src/github.com/go-kit
     - mv /home/ubuntu/kit /home/ubuntu/.go_workspace/src/github.com/go-kit
+    - ln -s /home/ubuntu/.go_workspace/src/github.com/go-kit/kit /home/ubuntu/kit
     - go get github.com/go-kit/kit/...
   override:
     - go test -v -race -tags integration github.com/go-kit/kit/...:

diff --git a/circuitbreaker/gobreaker.go b/circuitbreaker/gobreaker.go
@@ -1,8 +1,9 @@
 package circuitbreaker
 
 import (
+	"context"
+
 	"github.com/sony/gobreaker"
-	"golang.org/x/net/context"
 
 	"github.com/go-kit/kit/endpoint"
 )

diff --git a/circuitbreaker/handy_breaker.go b/circuitbreaker/handy_breaker.go
@@ -1,10 +1,10 @@
 package circuitbreaker
 
 import (
+	"context"
 	"time"
 
 	"github.com/streadway/handy/breaker"
-	"golang.org/x/net/context"
 
 	"github.com/go-kit/kit/endpoint"
 )

diff --git a/circuitbreaker/hystrix.go b/circuitbreaker/hystrix.go
@@ -1,8 +1,9 @@
 package circuitbreaker
 
 import (
+	"context"
+
 	"github.com/afex/hystrix-go/hystrix"
-	"golang.org/x/net/context"
 
 	"github.com/go-kit/kit/endpoint"
 )

diff --git a/circuitbreaker/util_test.go b/circuitbreaker/util_test.go
@@ -1,15 +1,14 @@
 package circuitbreaker_test
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"path/filepath"
 	"runtime"
 	"testing"
 	"time"
 
-	"golang.org/x/net/context"
-
 	"github.com/go-kit/kit/endpoint"
 )
 

diff --git a/endpoint/endpoint.go b/endpoint/endpoint.go
@@ -1,7 +1,7 @@
 package endpoint
 
 import (
-	"golang.org/x/net/context"
+	"context"
 )
 
 // Endpoint is the fundamental building block of servers and clients.

diff --git a/endpoint/endpoint_example_test.go b/endpoint/endpoint_example_test.go
@@ -1,10 +1,9 @@
 package endpoint_test
 
 import (
+	"context"
 	"fmt"
 
-	"golang.org/x/net/context"
-
 	"github.com/go-kit/kit/endpoint"
 )
 

diff --git a/examples/addsvc/cmd/addcli/main.go b/examples/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/examples/addsvc/cmd/addsvc/main.go b/examples/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/examples/addsvc/endpoints.go b/examples/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/examples/addsvc/service.go b/examples/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/examples/addsvc/transport_grpc.go b/examples/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/examples/addsvc/transport_http.go b/examples/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/examples/addsvc/transport_thrift.go b/examples/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/examples/apigateway/main.go b/examples/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/examples/profilesvc/cmd/profilesvc/main.go b/examples/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/examples/profilesvc/endpoints.go b/examples/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/examples/profilesvc/middlewares.go b/examples/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/examples/profilesvc/service.go b/examples/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/examples/profilesvc/transport.go b/examples/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/examples/shipping/booking/endpoint.go b/examples/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/examples/shipping/booking/transport.go b/examples/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/examples/shipping/handling/endpoint.go b/examples/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"
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,6 @@ language: go @@
     script: go test -race -v ./...
     go:
-        - 1.5.4
-        - 1.6.3
-        - 1.7.1
+        - 1.7.4
+        - 1.8beta2
         - tip