@@ -473,12 +473,7 @@ impl InstanceCommon {
473473
474474 WORKER_METRICS
475475 . wasm_instance_errors
476- . with_label_values (
477- & caller_identity,
478- & self . info . module_hash ,
479- & caller_connection_id,
480- procedure_name,
481- )
476+ . with_label_values ( & self . info . database_identity , & self . info . module_hash , procedure_name)
482477 . inc ( ) ;
483478
484479 // TODO(procedure-energy):
@@ -593,12 +588,7 @@ impl InstanceCommon {
593588 Err ( ExecutionError :: Recoverable ( err) | ExecutionError :: Trap ( err) ) => {
594589 inst. log_traceback ( "reducer" , reducer_name, & err) ;
595590
596- self . handle_outer_error (
597- & result. stats . energy ,
598- & caller_identity,
599- & Some ( caller_connection_id) ,
600- reducer_name,
601- )
591+ self . handle_outer_error ( & result. stats . energy , reducer_name)
602592 }
603593 Err ( ExecutionError :: User ( err) ) => {
604594 log_reducer_error ( inst. replica_ctx ( ) , timestamp, reducer_name, & err) ;
@@ -652,21 +642,10 @@ impl InstanceCommon {
652642 ( res, trapped)
653643 }
654644
655- fn handle_outer_error (
656- & mut self ,
657- energy : & EnergyStats ,
658- caller_identity : & Identity ,
659- caller_connection_id : & Option < ConnectionId > ,
660- reducer_name : & str ,
661- ) -> EventStatus {
645+ fn handle_outer_error ( & mut self , energy : & EnergyStats , reducer_name : & str ) -> EventStatus {
662646 WORKER_METRICS
663647 . wasm_instance_errors
664- . with_label_values (
665- caller_identity,
666- & self . info . module_hash ,
667- & caller_connection_id. unwrap_or ( ConnectionId :: ZERO ) ,
668- reducer_name,
669- )
648+ . with_label_values ( & self . info . database_identity , & self . info . module_hash , reducer_name)
670649 . inc ( ) ;
671650
672651 if energy. remaining . get ( ) == 0 {
@@ -775,15 +754,13 @@ impl InstanceCommon {
775754 Err ( ExecutionError :: Recoverable ( err) | ExecutionError :: Trap ( err) ) => {
776755 inst. log_traceback ( "view" , view_name, & err) ;
777756
778- self . handle_outer_error ( & result. stats . energy , & caller_identity, & caller_connection_id, view_name)
779- . into ( )
757+ self . handle_outer_error ( & result. stats . energy , view_name) . into ( )
780758 }
781759 // TODO: maybe do something else with user errors?
782760 Err ( ExecutionError :: User ( err) ) => {
783761 inst. log_traceback ( "view" , view_name, & anyhow:: anyhow!( err) ) ;
784762
785- self . handle_outer_error ( & result. stats . energy , & caller_identity, & caller_connection_id, view_name)
786- . into ( )
763+ self . handle_outer_error ( & result. stats . energy , view_name) . into ( )
787764 }
788765 Ok ( res) => {
789766 let db = & inst. replica_ctx ( ) . relational_db ;
0 commit comments