fix(Logging): configure logging after auth to fix a race condition

aws-amplify · Oct 18, 2024 · 894619f · 894619f
1 parent 619867b
commit 894619f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/Amplify/Core/Configuration/AmplifyConfiguration.swift b/Amplify/Core/Configuration/AmplifyConfiguration.swift
@@ -135,12 +135,9 @@ extension Amplify {
             }
         }
 
-        // Always configure logging first since Auth dependings on logging
-        try configure(CategoryType.logging.category, using: resolvedConfiguration)
-
         // Always configure Hub and Auth next, so they are available to other categories.
         // Auth is a special case for other plugins which depend on using Auth when being configured themselves.
-        let manuallyConfiguredCategories = [CategoryType.hub, .auth]
+        let manuallyConfiguredCategories = [CategoryType.hub, .auth, .logging]
         for categoryType in manuallyConfiguredCategories {
             try configure(categoryType.category, using: resolvedConfiguration)
         }

diff --git a/Amplify/Core/Configuration/AmplifyOutputsData.swift b/Amplify/Core/Configuration/AmplifyOutputsData.swift
@@ -334,12 +334,9 @@ extension Amplify {
     /// - Tag: Amplify.configure
     @_spi(InternalAmplifyConfiguration)
     public static func configure(_ configuration: AmplifyOutputsData) throws {
-        // Always configure logging first since Auth dependings on logging
-        try configure(CategoryType.logging.category, using: configuration)
-
         // Always configure Hub and Auth next, so they are available to other categories.
         // Auth is a special case for other plugins which depend on using Auth when being configured themselves.
-        let manuallyConfiguredCategories = [CategoryType.hub, .auth]
+        let manuallyConfiguredCategories = [CategoryType.hub, .auth, .logging]
         for categoryType in manuallyConfiguredCategories {
             try configure(categoryType.category, using: configuration)
         }

diff --git a/AmplifyPlugins/Logging/Sources/AWSCloudWatchLoggingPlugin/AWSCloudWatchLoggingPlugin.swift b/AmplifyPlugins/Logging/Sources/AWSCloudWatchLoggingPlugin/AWSCloudWatchLoggingPlugin.swift
@@ -155,9 +155,7 @@ public class AWSCloudWatchLoggingPlugin: LoggingCategoryPlugin {
             localStore.reset()
         }
 
-        DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(500)) {
-            self.loggingClient.takeUserIdentifierFromCurrentUser()
-        }
+        self.loggingClient.takeUserIdentifierFromCurrentUser()
     }
 }