@@ -446,7 +446,9 @@ class GitpodJsonRpcProxyFactory<T extends object> extends JsonRpcProxyFactory<T>
446
446
observeAPICallsDuration ( method , 200 , timer ( ) ) ;
447
447
return result ;
448
448
} catch ( e ) {
449
- const requestIdMessage = ` If this error is unexpected, please quote the request ID '${ requestId } ' when reaching out to Gitpod Support.` ;
449
+ // TODO(ak) this guard does not look correct
450
+ // it checks for a presence of `code`, but other errors also may have code, like all Node.js errors: https://nodejs.org/api/errors.html#errorcode
451
+ // instanceof ApplicationError should be more appropriate here
450
452
if ( ApplicationError . hasErrorCode ( e ) ) {
451
453
increaseApiCallCounter ( method , e . code ) ;
452
454
observeAPICallsDuration ( method , e . code , timer ( ) ) ;
@@ -463,13 +465,13 @@ class GitpodJsonRpcProxyFactory<T extends object> extends JsonRpcProxyFactory<T>
463
465
message : e . message ,
464
466
} ,
465
467
) ;
466
- throw new ResponseError ( e . code , e . message + requestIdMessage , e . data ) ;
468
+ throw new ResponseError ( e . code , e . message , e . data ) ;
467
469
} else {
468
470
TraceContext . setError ( ctx , e ) ; // this is a "real" error
469
471
470
472
const err = new ApplicationError (
471
473
ErrorCodes . INTERNAL_SERVER_ERROR ,
472
- `Internal server error: '${ e . message } '` + requestIdMessage ,
474
+ `Internal server error: '${ e . message } '` ,
473
475
) ;
474
476
increaseApiCallCounter ( method , err . code ) ;
475
477
observeAPICallsDuration ( method , err . code , timer ( ) ) ;
0 commit comments