bug fix

Author: wenxi-zeng

Analytics-CSharp/Segment/Analytics/Analytics.cs

@@ -49,7 +49,7 @@ public Analytics(Configuration configuration)
             }
 
             store = new Store(configuration.userSynchronizeDispatcher, configuration.exceptionHandler);
-            storage = new Storage(store, configuration.writeKey, configuration.persistentDataPath, fileIODispatcher);
+            storage = new Storage(store, configuration.writeKey, configuration.persistentDataPath, fileIODispatcher, configuration.exceptionHandler);
             timeline = new Timeline();
 
             // Start everything

Analytics-CSharp/Segment/Analytics/Internal/ForTests.cs

@@ -27,13 +27,13 @@ internal Analytics(Configuration configuration,
             )
         {
             this.configuration = configuration;
-            this.analyticsScope = analyticsScope ?? new Scope();
+            this.analyticsScope = analyticsScope ?? new Scope(configuration.exceptionHandler);
             IDispatcher dispatcher = new SynchronizeDispatcher();
             this.fileIODispatcher = fileIODispatcher ?? dispatcher;
             this.networkIODispatcher = networkIODispatcher ?? dispatcher;
             this.analyticsDispatcher = analyticsDispatcher ?? dispatcher;
-            this.store = store ?? new Store(true);
-            this.storage = storage ?? new Storage(this.store, configuration.writeKey, configuration.persistentDataPath, this.fileIODispatcher);
+            this.store = store ?? new Store(true, configuration.exceptionHandler);
+            this.storage = storage ?? new Storage(this.store, configuration.writeKey, configuration.persistentDataPath, this.fileIODispatcher, configuration.exceptionHandler);
             this.timeline = timeline ?? new Timeline();
 
             Startup(httpClient);

Analytics-CSharp/Segment/Analytics/Utilities/Storage.cs

@@ -25,12 +25,12 @@ internal class Storage : ISubscriber
 
         public const long MaxBatchSize = 475_000;
 
-        public Storage(Store store, string writeKey, string rootDir, IDispatcher ioDispatcher = default)
+        public Storage(Store store, string writeKey, string rootDir, IDispatcher ioDispatcher = default, ICoroutineExceptionHandler exceptionHandler = default)
         {
             _store = store;
             _writeKey = writeKey;
             _userPrefs = new UserPrefs(rootDir + Path.DirectorySeparatorChar + 
-                                       "segment.prefs" + Path.DirectorySeparatorChar + writeKey);
+                                       "segment.prefs" + Path.DirectorySeparatorChar + writeKey, exceptionHandler);
             _storageDirectory = rootDir + Path.DirectorySeparatorChar +
                                     "segment.data" + Path.DirectorySeparatorChar +
                                     writeKey + Path.DirectorySeparatorChar +

Analytics-CSharp/Segment/Analytics/Utilities/UserPrefs.cs

@@ -37,7 +37,7 @@ public class UserPrefs
 
         private readonly IDispatcher _dispatcher;
 
-        public UserPrefs(string file)
+        public UserPrefs(string file, ICoroutineExceptionHandler exceptionHandler = null)
         {
             cache = new Dictionary<string, object>();
             mutex = new object();
@@ -52,7 +52,7 @@ public UserPrefs(string file)
             // uses a new scope for UserPrefs, so interruption does not propagate to analytics scope
             // in addition, file I/O in this class are all blocking. need to have its own threads
             // to prevent blocking analytics threads
-            _scope = new Scope();
+            _scope = new Scope(exceptionHandler);
             _dispatcher = new Dispatcher(new LimitedConcurrencyLevelTaskScheduler(Environment.ProcessorCount));
             StartLoadFromDisk();
         }

Tests/StateTest.cs

@@ -37,7 +37,7 @@ public SystemTest()
                 userSynchronizeDispatcher: true,
                 defaultSettings: _settings
             );
-            _storage = new Mock<Storage>(_store, "123", "tests", new SynchronizeDispatcher());
+            _storage = new Mock<Storage>(_store, "123", "tests", new SynchronizeDispatcher(), null);
         }
 
         [Fact]
@@ -137,7 +137,7 @@ public UserInfoTest()
                 autoAddSegmentDestination: false,
                 userSynchronizeDispatcher: true
             );
-            _storage = new Mock<Storage>(_store, "123", "tests", new SynchronizeDispatcher());
+            _storage = new Mock<Storage>(_store, "123", "tests", new SynchronizeDispatcher(), null);
         }
 
         [Fact]

Tests/Utilities/EventPipelineTest.cs

@@ -45,7 +45,7 @@ public EventPipelineTest()
                 .Setup(httpclient => httpclient.Upload(It.IsAny<string>()))
                 .ReturnsAsync(true);
 
-            _storage = new Mock<Storage>(new Store(true), "123", "tests", new SynchronizeDispatcher());
+            _storage = new Mock<Storage>(new Store(true), "123", "tests", new SynchronizeDispatcher(), null);
             _analytics = new Analytics(config,
                 httpClient: _mockHttpClient.Object,
                 storage: _storage.Object);