replace use cases of thrift.WithProtocol with thrift.WithHeaders

Summary: replace use cases of thrift.WithProtocol with thrift.WithHeaders

Reviewed By: codyohl

Differential Revision: D59577467

fbshipit-source-id: 08b25a874d669ab260c60d188d00e8e9dd7ede38

Author: awalterschulze

thrift/lib/go/thrift/context.go

@@ -78,11 +78,6 @@ func ConnInfoFromContext(ctx context.Context) (ConnInfo, bool) {
 	return v, ok
 }
 
-// Deprecated: use thrift.WithHeaders(ctx, proto.GetResponseHeaders())
-func WithProtocol(ctx context.Context, proto Protocol) context.Context {
-	return context.WithValue(ctx, protocolKey, proto)
-}
-
 // Deprecated: Use thrift.GetHeaders
 func HeadersFromContext(ctx context.Context) map[string]string {
 	t, ok := ctx.Value(protocolKey).(Protocol)

thrift/lib/go/thrift/processor.go

@@ -71,6 +71,7 @@ func processContext(ctx context.Context, processor ProcessorContext, prot Protoc
 		}
 		return false, rerr
 	}
+	ctx = WithHeaders(ctx, prot.GetResponseHeaders())
 	var err ApplicationException
 	var pfunc ProcessorFunctionContext
 	if messageType != CALL && messageType != ONEWAY {

thrift/lib/go/thrift/simple_server.go

@@ -124,10 +124,6 @@ func (p *SimpleServer) processRequests(ctx context.Context, client net.Conn) err
 		return err
 	}
 
-	// Store the protocol on the context so handlers can query headers.
-	// See HeadersFromContext.
-	ctx = WithProtocol(ctx, protocol)
-
 	defer func() {
 		if err := recover(); err != nil {
 			p.log.Printf("panic in processor: %v: %s", err, debug.Stack())