glide up

vendor/github.com/go-kit/kit/sd/consul/client.go

@@ -1,8 +1,6 @@
 package consul
 
-import (
-	consul "github.com/hashicorp/consul/api"
-)
+import consul "github.com/hashicorp/consul/api"
 
 // Client is a wrapper around the Consul API.
 type Client interface {

vendor/github.com/go-kit/kit/sd/consul/client_test.go

@@ -1,13 +1,13 @@
 package consul
 
 import (
-	"context"
 	"errors"
 	"io"
 	"reflect"
 	"testing"
 
 	stdconsul "github.com/hashicorp/consul/api"
+	"golang.org/x/net/context"
 
 	"github.com/go-kit/kit/endpoint"
 )

vendor/github.com/go-kit/kit/sd/consul/integration_test.go

@@ -14,9 +14,11 @@ import (
 )
 
 func TestIntegration(t *testing.T) {
-	consulAddr := os.Getenv("CONSUL_ADDR")
+	// Connect to Consul.
+	// docker run -p 8500:8500 progrium/consul -server -bootstrap
+	consulAddr := os.Getenv("CONSUL_ADDRESS")
 	if consulAddr == "" {
-		t.Fatal("CONSUL_ADDR is not set")
+		t.Fatal("CONSUL_ADDRESS is not set")
 	}
 	stdClient, err := stdconsul.NewClient(&stdconsul.Config{
 		Address: consulAddr,
@@ -46,7 +48,7 @@ func TestIntegration(t *testing.T) {
 	subscriber := NewSubscriber(
 		client,
 		factory,
-		log.With(logger, "component", "subscriber"),
+		log.NewContext(logger).With("component", "subscriber"),
 		r.Name,
 		r.Tags,
 		true,
@@ -64,7 +66,7 @@ func TestIntegration(t *testing.T) {
 	}
 
 	// Build a registrar for r.
-	registrar := NewRegistrar(client, r, log.With(logger, "component", "registrar"))
+	registrar := NewRegistrar(client, r, log.NewContext(logger).With("component", "registrar"))
 	registrar.Register()
 	defer registrar.Deregister()
 

vendor/github.com/go-kit/kit/sd/consul/registrar.go

@@ -21,7 +21,7 @@ func NewRegistrar(client Client, r *stdconsul.AgentServiceRegistration, logger l
 	return &Registrar{
 		client:       client,
 		registration: r,
-		logger:       log.With(logger, "service", r.Name, "tags", fmt.Sprint(r.Tags), "address", r.Address),
+		logger:       log.NewContext(logger).With("service", r.Name, "tags", fmt.Sprint(r.Tags), "address", r.Address),
 	}
 }
 

vendor/github.com/go-kit/kit/sd/consul/subscriber.go

@@ -36,7 +36,7 @@ func NewSubscriber(client Client, factory sd.Factory, logger log.Logger, service
 	s := &Subscriber{
 		cache:       cache.New(factory, logger),
 		client:      client,
-		logger:      log.With(logger, "service", service, "tags", fmt.Sprint(tags)),
+		logger:      log.NewContext(logger).With("service", service, "tags", fmt.Sprint(tags)),
 		service:     service,
 		tags:        tags,
 		passingOnly: passingOnly,

vendor/github.com/go-kit/kit/sd/consul/subscriber_test.go

@@ -1,10 +1,10 @@
 package consul
 
 import (
-	"context"
 	"testing"
 
 	consul "github.com/hashicorp/consul/api"
+	"golang.org/x/net/context"
 
 	"github.com/go-kit/kit/log"
 )