Merge pull request #1276 from bugsnag/PLAT-6752/callback-optimization

Optimize execution of callbacks
bugsnag · Jun 17, 2021 · e4cf4bc · e4cf4bc
2 parents e097884 + 2319487
commit e4cf4bc
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,9 @@
 * Cache value of app.backgroundWorkRestricted
   [#1275](https://github.com/bugsnag/bugsnag-android/pull/1275)
 
+* Optimize execution of callbacks
+  [#1276](https://github.com/bugsnag/bugsnag-android/pull/1276)
+
 ## 5.9.4 (2021-05-26)
 
 * Unity: add methods for setting autoNotify and autoDetectAnrs

diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/CallbackState.kt b/bugsnag-android-core/src/main/java/com/bugsnag/android/CallbackState.kt
@@ -33,6 +33,10 @@ internal data class CallbackState(
     }
 
     fun runOnErrorTasks(event: Event, logger: Logger): Boolean {
+        // optimization to avoid construction of iterator when no callbacks set
+        if (onErrorTasks.isEmpty()) {
+            return true
+        }
         onErrorTasks.forEach {
             try {
                 if (!it.onError(event)) {
@@ -46,6 +50,10 @@ internal data class CallbackState(
     }
 
     fun runOnBreadcrumbTasks(breadcrumb: Breadcrumb, logger: Logger): Boolean {
+        // optimization to avoid construction of iterator when no callbacks set
+        if (onBreadcrumbTasks.isEmpty()) {
+            return true
+        }
         onBreadcrumbTasks.forEach {
             try {
                 if (!it.onBreadcrumb(breadcrumb)) {
@@ -59,6 +67,10 @@ internal data class CallbackState(
     }
 
     fun runOnSessionTasks(session: Session, logger: Logger): Boolean {
+        // optimization to avoid construction of iterator when no callbacks set
+        if (onSessionTasks.isEmpty()) {
+            return true
+        }
         onSessionTasks.forEach {
             try {
                 if (!it.onSession(session)) {