Merge pull request go-kit#585 from basvanbeek/master

updated thrift to latest Go library adding support for context

addsvc/cmd/addsvc/addsvc.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"context"
 	"flag"
 	"fmt"
 	"net"
@@ -140,7 +139,7 @@ func main() {
 		endpoints    = addendpoint.New(service, logger, duration, tracer)
 		httpHandler  = addtransport.NewHTTPHandler(endpoints, tracer, logger)
 		grpcServer   = addtransport.NewGRPCServer(endpoints, tracer, logger)
-		thriftServer = addtransport.NewThriftServer(context.Background(), endpoints)
+		thriftServer = addtransport.NewThriftServer(endpoints)
 	)
 
 	// Now we're to the part of the func main where we want to start actually

addsvc/pkg/addtransport/thrift.go

@@ -22,26 +22,25 @@ type thriftServer struct {
 }
 
 // NewThriftServer makes a set of endpoints available as a Thrift service.
-func NewThriftServer(ctx context.Context, endpoints addendpoint.Set) addthrift.AddService {
+func NewThriftServer(endpoints addendpoint.Set) addthrift.AddService {
 	return &thriftServer{
-		ctx:       ctx,
 		endpoints: endpoints,
 	}
 }
 
-func (s *thriftServer) Sum(a int64, b int64) (*addthrift.SumReply, error) {
+func (s *thriftServer) Sum(ctx context.Context, a int64, b int64) (*addthrift.SumReply, error) {
 	request := addendpoint.SumRequest{A: int(a), B: int(b)}
-	response, err := s.endpoints.SumEndpoint(s.ctx, request)
+	response, err := s.endpoints.SumEndpoint(ctx, request)
 	if err != nil {
 		return nil, err
 	}
 	resp := response.(addendpoint.SumResponse)
 	return &addthrift.SumReply{Value: int64(resp.V), Err: err2str(resp.Err)}, nil
 }
 
-func (s *thriftServer) Concat(a string, b string) (*addthrift.ConcatReply, error) {
+func (s *thriftServer) Concat(ctx context.Context, a string, b string) (*addthrift.ConcatReply, error) {
 	request := addendpoint.ConcatRequest{A: a, B: b}
-	response, err := s.endpoints.ConcatEndpoint(s.ctx, request)
+	response, err := s.endpoints.ConcatEndpoint(ctx, request)
 	if err != nil {
 		return nil, err
 	}
@@ -100,7 +99,7 @@ func NewThriftClient(client *addthrift.AddServiceClient) addservice.Service {
 func MakeThriftSumEndpoint(client *addthrift.AddServiceClient) endpoint.Endpoint {
 	return func(ctx context.Context, request interface{}) (interface{}, error) {
 		req := request.(addendpoint.SumRequest)
-		reply, err := client.Sum(int64(req.A), int64(req.B))
+		reply, err := client.Sum(ctx, int64(req.A), int64(req.B))
 		if err == addservice.ErrIntOverflow {
 			return nil, err // special case; see comment on ErrIntOverflow
 		}
@@ -114,7 +113,7 @@ func MakeThriftSumEndpoint(client *addthrift.AddServiceClient) endpoint.Endpoint
 func MakeThriftConcatEndpoint(client *addthrift.AddServiceClient) endpoint.Endpoint {
 	return func(ctx context.Context, request interface{}) (interface{}, error) {
 		req := request.(addendpoint.ConcatRequest)
-		reply, err := client.Concat(req.A, req.B)
+		reply, err := client.Concat(ctx, req.A, req.B)
 		return addendpoint.ConcatResponse{V: reply.Value, Err: err}, nil
 	}
 }