fix: increase default timeout and change warning to info

segmentio · Aug 6, 2024 · 9af9759 · 9af9759
1 parent bdb5e33
commit 9af9759
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 25 deletions.
diff --git a/...les/AnalyticsReactNativeExample/ios/AnalyticsReactNativeExample.xcodeproj/project.pbxproj b/...les/AnalyticsReactNativeExample/ios/AnalyticsReactNativeExample.xcodeproj/project.pbxproj
@@ -486,7 +486,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = V8R4668S2H;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = AnalyticsReactNativeExample/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -514,7 +514,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = V8R4668S2H;
 				INFOPLIST_FILE = AnalyticsReactNativeExample/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -602,11 +602,7 @@
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
 				);
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					"-Wl",
-					"-ld_classic",
-				);
+				OTHER_LDFLAGS = "$(inherited)";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 			};
@@ -676,11 +672,7 @@
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
 				);
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					"-Wl",
-					"-ld_classic",
-				);
+				OTHER_LDFLAGS = "$(inherited)";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;

diff --git a/examples/AnalyticsReactNativeExample/ios/Podfile.lock b/examples/AnalyticsReactNativeExample/ios/Podfile.lock
@@ -499,11 +499,11 @@ PODS:
   - RNScreens (3.27.0):
     - RCT-Folly (= 2021.07.22.00)
     - React-Core
-  - segment-analytics-react-native (2.19.2):
+  - segment-analytics-react-native (2.19.3):
     - React-Core
     - sovran-react-native
   - SocketRocket (0.6.1)
-  - sovran-react-native (1.1.1):
+  - sovran-react-native (1.1.2):
     - React-Core
   - Yoga (1.14.0)
   - YogaKit (1.18.1):
@@ -752,12 +752,12 @@ SPEC CHECKSUMS:
   RNCMaskedView: 0e1bc4bfa8365eba5fbbb71e07fbdc0555249489
   RNGestureHandler: 32a01c29ecc9bb0b5bf7bc0a33547f61b4dc2741
   RNScreens: 3c2d122f5e08c192e254c510b212306da97d2581
-  segment-analytics-react-native: 962494a9edbe3f6c5829e3b471484c85c304601c
+  segment-analytics-react-native: a803de6a9406f7b18928d352962c2f49663a0869
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
-  sovran-react-native: e6a9c963a8a6b9ebc3563394c39c30f33ab1453f
+  sovran-react-native: 5f02bd2d111ffe226d00c7b0435290eae6f10934
   Yoga: eddf2bbe4a896454c248a8f23b4355891eb720a6
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 
 PODFILE CHECKSUM: 329f06ebb76294acf15c298d0af45530e2797740
 
-COCOAPODS: 1.15.2
+COCOAPODS: 1.11.3
diff --git a/packages/core/src/plugins/QueueFlushingPlugin.ts b/packages/core/src/plugins/QueueFlushingPlugin.ts
@@ -4,7 +4,6 @@ import { defaultConfig } from '../constants';
 import { UtilityPlugin } from '../plugin';
 import { PluginType, SegmentEvent } from '../types';
 import { createPromise } from '../util';
-import { ErrorType, SegmentError } from '../errors';
 
 /**
  * This plugin manages a queue where all events get added to after timeline processing.
@@ -30,7 +29,7 @@ export class QueueFlushingPlugin extends UtilityPlugin {
   constructor(
     onFlush: (events: SegmentEvent[]) => Promise<void>,
     storeKey = 'events',
-    restoreTimeout = 500
+    restoreTimeout = 1000
   ) {
     super();
     this.onFlush = onFlush;
@@ -78,12 +77,8 @@ export class QueueFlushingPlugin extends UtilityPlugin {
       await this.isRestored;
     } catch (e) {
       // If the queue is not restored before the timeout, we will notify but not block flushing events
-      this.analytics?.reportInternalError(
-        new SegmentError(
-          ErrorType.InitializationError,
-          'Queue timeout before completed restoration',
-          e
-        )
+      console.info(
+        'Flush triggered but queue restoration and settings loading not complete. Flush will be retried.'
       );
     }
     const events = (await this.queueStore?.getState(true))?.events ?? [];