fix failing tests

server.go

@@ -522,12 +522,9 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 // traceInfo returns a traceInfo and associates it with stream, if tracing is enabled.
 // If tracing is not enabled, it returns nil.
 func (s *Server) traceInfo(st transport.ServerTransport, stream *transport.Stream) (trInfo *traceInfo) {
-	if !EnableTracing {
-		return nil
-	}
 	tr, ok := trace.FromContext(stream.Context())
 	if !ok {
-		grpclog.Fatalf("cannot get trace from context while EnableTracing == true")
+		return nil
 	}
 
 	trInfo = &traceInfo{

transport/handler_server_test.go

@@ -300,7 +300,10 @@ func TestHandlerTransport_HandleStreams(t *testing.T) {
 		st.bodyw.Close() // no body
 		st.ht.WriteStatus(s, codes.OK, "")
 	}
-	st.ht.HandleStreams(func(s *Stream) { go handleStream(s) })
+	st.ht.HandleStreams(
+		func(s *Stream) { go handleStream(s) },
+		func(ctx context.Context, method string) context.Context { return ctx },
+	)
 	wantHeader := http.Header{
 		"Date":         nil,
 		"Content-Type": {"application/grpc"},
@@ -327,7 +330,10 @@ func handleStreamCloseBodyTest(t *testing.T, statusCode codes.Code, msg string)
 	handleStream := func(s *Stream) {
 		st.ht.WriteStatus(s, statusCode, msg)
 	}
-	st.ht.HandleStreams(func(s *Stream) { go handleStream(s) })
+	st.ht.HandleStreams(
+		func(s *Stream) { go handleStream(s) },
+		func(ctx context.Context, method string) context.Context { return ctx },
+	)
 	wantHeader := http.Header{
 		"Date":         nil,
 		"Content-Type": {"application/grpc"},
@@ -375,7 +381,10 @@ func TestHandlerTransport_HandleStreams_Timeout(t *testing.T) {
 		}
 		ht.WriteStatus(s, codes.DeadlineExceeded, "too slow")
 	}
-	ht.HandleStreams(func(s *Stream) { go runStream(s) })
+	ht.HandleStreams(
+		func(s *Stream) { go runStream(s) },
+		func(ctx context.Context, method string) context.Context { return ctx },
+	)
 	wantHeader := http.Header{
 		"Date":         nil,
 		"Content-Type": {"application/grpc"},

transport/transport_test.go

@@ -197,22 +197,33 @@ func (s *server) start(t *testing.T, port int, maxStreams uint32, ht hType) {
 		h := &testStreamHandler{transport.(*http2Server)}
 		switch ht {
 		case suspended:
-			go transport.HandleStreams(h.handleStreamSuspension)
+			go transport.HandleStreams(h.handleStreamSuspension,
+				func(ctx context.Context, method string) context.Context {
+					return ctx
+				})
 		case misbehaved:
 			go transport.HandleStreams(func(s *Stream) {
 				go h.handleStreamMisbehave(t, s)
+			}, func(ctx context.Context, method string) context.Context {
+				return ctx
 			})
 		case encodingRequiredStatus:
 			go transport.HandleStreams(func(s *Stream) {
 				go h.handleStreamEncodingRequiredStatus(t, s)
+			}, func(ctx context.Context, method string) context.Context {
+				return ctx
 			})
 		case invalidHeaderField:
 			go transport.HandleStreams(func(s *Stream) {
 				go h.handleStreamInvalidHeaderField(t, s)
+			}, func(ctx context.Context, method string) context.Context {
+				return ctx
 			})
 		default:
 			go transport.HandleStreams(func(s *Stream) {
 				go h.handleStream(t, s)
+			}, func(ctx context.Context, method string) context.Context {
+				return ctx
 			})
 		}
 	}