Use stdlib context instead of golang.org/x/net/context

make-bin · Feb 4, 2017 · 4a29204 · 4a29204
1 parent 4eb1e49
commit 4a29204
Show file tree

Hide file tree

Showing 76 changed files with 90 additions and 105 deletions.
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/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
@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"time"
 
-	"golang.org/x/net/context"
+	"context"
 
 	"github.com/go-kit/kit/endpoint"
 	"github.com/go-kit/kit/log"

diff --git a/examples/addsvc/pb/addsvc.pb.go b/examples/addsvc/pb/addsvc.pb.go
diff --git a/examples/addsvc/service.go b/examples/addsvc/service.go
@@ -7,7 +7,7 @@ import (
 	"errors"
 	"time"
 
-	"golang.org/x/net/context"
+	"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,8 @@ package addsvc
 // It utilizes the transport/grpc.Server.
 
 import (
+	"context"
 	stdopentracing "github.com/opentracing/opentracing-go"
-	"golang.org/x/net/context"
 
 	"github.com/go-kit/kit/examples/addsvc/pb"
 	"github.com/go-kit/kit/log"

diff --git a/examples/addsvc/transport_http.go b/examples/addsvc/transport_http.go
@@ -10,8 +10,8 @@ import (
 	"io/ioutil"
 	"net/http"
 
+	"context"
 	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"

diff --git a/examples/shipping/handling/transport.go b/examples/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/examples/shipping/inspection/inspection.go b/examples/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/examples/shipping/location/location.go b/examples/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/examples/shipping/main.go b/examples/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"