address review feedback

googleapis · Apr 15, 2024 · 200897b · 200897b
1 parent a37310e
commit 200897b
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/server/services/echo_service.go b/server/services/echo_service.go
@@ -50,19 +50,19 @@ func (s *echoServerImpl) Echo(ctx context.Context, in *pb.EchoRequest) (*pb.Echo
 		return nil, err
 	}
 	md, ok := metadata.FromIncomingContext(ctx)
-	if !ok {
-		return nil, err
-	}
-	echoHeaders(ctx)
-	echoTrailers(ctx)
 	requestHeaders := make(map[string]*pb.EchoResponse_RepeatedValues)
-	headersToTrack := in.GetHttpRequestHeaderToEcho()
-	for k, v := range md {
-		if strContains(headersToTrack, k) {
-			requestHeaders[k] = &pb.EchoResponse_RepeatedValues{HeaderValues: v}
+	if ok {
+		headersToTrack := in.GetHttpRequestHeaderToEcho()
+		for k, v := range md {
+			if strContains(headersToTrack, k) {
+				requestHeaders[k] = &pb.EchoResponse_RepeatedValues{HeaderValues: v}
+			}
 		}
 	}
 
+	echoHeaders(ctx)
+	echoTrailers(ctx)
+
 	return &pb.EchoResponse{Content: in.GetContent(), Severity: in.GetSeverity(), RequestId: in.GetRequestId(), OtherRequestId: in.GetOtherRequestId(), HttpRequestHeaderValue: requestHeaders}, nil
 }