RUMM-2334 Fix data race in RUM scope

DataDog · Aug 30, 2022 · db2072a · db2072a
1 parent 0073de5
commit db2072a
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/Sources/Datadog/RUMMonitor.swift b/Sources/Datadog/RUMMonitor.swift
@@ -596,19 +596,15 @@ public class RUMMonitor: DDRUMMonitor, RUMCommandSubscriber {
     // MARK: - RUMCommandSubscriber
 
     func process(command: RUMCommand) {
-        guard let scope = core.v1.scope(for: RUMFeature.self) else {
-            return
-        }
-
-        queue.async {
-            let transformedCommand = self.transform(command: command)
+        core.v1.scope(for: RUMFeature.self)?.eventWriteContext { context, writer in
+            self.queue.async {
+                let transformedCommand = self.transform(command: command)
 
-            scope.eventWriteContext { context, writer in
                 _ = self.applicationScope.process(command: transformedCommand, context: context, writer: writer)
-            }
 
-            if let debugging = self.debugging {
-                debugging.debug(applicationScope: self.applicationScope)
+                if let debugging = self.debugging {
+                    debugging.debug(applicationScope: self.applicationScope)
+                }
             }
         }
     }