remove closure

Author: THardy98

core/src/telemetry/metrics.rs

@@ -593,17 +593,13 @@ pub(super) const TASK_SLOTS_AVAILABLE_NAME: &str = "worker_task_slots_available"
 pub(super) const TASK_SLOTS_USED_NAME: &str = "worker_task_slots_used";
 pub(super) const STICKY_CACHE_SIZE_NAME: &str = "sticky_cache_size";
 
-/// Calls the provided metric function only if the failure is not a benign application failure.
-pub(crate) fn record_failure_metric(
+/// Track a failure metric if the failure is not a benign application failure.
+pub(crate) fn should_record_failure_metric(
     failure: &Option<Failure>,
-    metric_fn: impl FnOnce(),
-) {
-    let is_benign = failure
+) -> bool {
+    !failure
         .as_ref()
-        .map_or(false, |f| f.is_benign_application_failure());
-    if !is_benign {
-        metric_fn();
-    }
+        .map_or(false, |f| f.is_benign_application_failure())
 }
 
 /// Helps define buckets once in terms of millis, but also generates a seconds version

core/src/worker/activities.rs

@@ -13,7 +13,7 @@ use crate::{
         UsedMeteredSemPermit,
     },
     pollers::{BoxedActPoller, PermittedTqResp, TrackedPermittedTqResp, new_activity_task_poller},
-    telemetry::metrics::{MetricsContext, activity_type, eager, workflow_type, record_failure_metric},
+    telemetry::metrics::{MetricsContext, activity_type, eager, workflow_type, should_record_failure_metric},
     worker::{
         activities::activity_heartbeat_manager::ActivityHeartbeatError, client::WorkerClient,
     },
@@ -349,7 +349,9 @@ impl WorkerActivityTasks {
                             .err()
                     }
                     aer::Status::Failed(ar::Failure { failure }) => {
-                        record_failure_metric(&failure, || act_metrics.act_execution_failed());
+                        if should_record_failure_metric(&failure) {
+                            act_metrics.act_execution_failed();
+                        }
                         client
                             .fail_activity_task(task_token.clone(), failure)
                             .await

core/src/worker/activities/local_activities.rs

@@ -3,7 +3,7 @@ use crate::{
     abstractions::{MeteredPermitDealer, OwnedMeteredSemPermit, UsedMeteredSemPermit, dbg_panic},
     protosext::ValidScheduleLA,
     retry_logic::RetryPolicyExt,
-    telemetry::metrics::{activity_type, workflow_type, record_failure_metric},
+    telemetry::metrics::{activity_type, workflow_type, should_record_failure_metric},
     worker::workflow::HeartbeatTimeoutMsg,
 };
 use futures_util::{
@@ -583,7 +583,9 @@ impl LocalActivityManager {
             la_metrics.la_exec_latency(runtime);
             let outcome = match &status {
                 LocalActivityExecutionResult::Failed(fail) => {
-                    record_failure_metric(&fail.failure, || la_metrics.la_execution_failed());
+                    if should_record_failure_metric(&fail.failure) {
+                        la_metrics.la_execution_failed()
+                    }
                     Outcome::FailurePath {
                         backoff: calc_backoff!(fail),
                     }

core/src/worker/workflow/managed_run.rs

@@ -1126,7 +1126,9 @@ impl ManagedRun {
                         self.metrics.wf_completed();
                     }
                     Some(CmdAttribs::FailWorkflowExecutionCommandAttributes(attrs)) => {
-                        metrics::record_failure_metric(&attrs.failure, || self.metrics.wf_failed());
+                        if metrics::should_record_failure_metric(&attrs.failure) {
+                            self.metrics.wf_failed();
+                        }
                     }
                     Some(CmdAttribs::ContinueAsNewWorkflowExecutionCommandAttributes(_)) => {
                         self.metrics.wf_continued_as_new();