Report grpc canceled timeouts as cancelled status and not error (#99981)

2025-02-04 13:31:03 +01:00
parent d06d646aa1
commit 6e7e389ee2
2 changed files with 10 additions and 1 deletions
@@ -33,7 +33,9 @@ func RequestStatusFromError(err error) RequestStatus {
 	status := RequestStatusOK
 	if err != nil {
 		status = RequestStatusError
-		if errors.Is(err, context.Canceled) || grpcstatus.Code(err) == grpccodes.Canceled {
+		if errors.Is(err, context.Canceled) {
+			status = RequestStatusCancelled
+		} else if s, ok := grpcstatus.FromError(err); ok && s.Code() == grpccodes.Canceled {
 			status = RequestStatusCancelled
 		}
 	}