update server to go-kit 0.4.0

cmd/scepserver/scepserver.go

@@ -76,8 +76,8 @@ func main() {
 	var logger log.Logger
 	{
 		logger = log.NewLogfmtLogger(os.Stderr)
-		logger = log.NewContext(logger).With("ts", log.DefaultTimestampUTC)
-		logger = log.NewContext(logger).With("caller", log.DefaultCaller)
+		logger = log.With(logger, "ts", log.DefaultTimestampUTC)
+		logger = log.With(logger, "caller", log.DefaultCaller)
 	}
 
 	var err error
@@ -112,12 +112,12 @@ func main() {
 			logger.Log("err", err)
 			os.Exit(1)
 		}
-		svc = scepserver.NewLoggingService(log.NewContext(logger).With("component", "service"), svc)
+		svc = scepserver.NewLoggingService(log.With(logger, "component", "service"), svc)
 	}
 
 	var h http.Handler // http handler
 	{
-		h = scepserver.ServiceHandler(ctx, svc, log.NewContext(logger).With("component", "http"))
+		h = scepserver.ServiceHandler(ctx, svc, log.With(logger, "component", "http"))
 	}
 
 	// start http server

glide.yaml

@@ -1,7 +1,7 @@
 package: github.com/micromdm/scep
 import:
 - package: github.com/go-kit/kit
-  version: ^0.2.0
+  version: ^0.4.0
   subpackages:
   - endpoint
   - log

server/transport.go

@@ -2,6 +2,7 @@ package scepserver
 
 import (
 	"bytes"
+	"context"
 	"errors"
 	"fmt"
 	"io/ioutil"
@@ -10,7 +11,6 @@ import (
 	"github.com/go-kit/kit/endpoint"
 	kitlog "github.com/go-kit/kit/log"
 	kithttp "github.com/go-kit/kit/transport/http"
-	"golang.org/x/net/context"
 )
 
 // ServiceHandler is an HTTP Handler for a SCEP endpoint.
@@ -21,7 +21,6 @@ func ServiceHandler(ctx context.Context, svc Service, logger kitlog.Logger) http
 	}
 
 	scepHandler := kithttp.NewServer(
-		ctx,
 		makeSCEPEndpoint(svc),
 		decodeSCEPRequest,
 		encodeSCEPResponse,