Trying to fix CI.

Author: bsneed

Segment.xcodeproj/project.pbxproj

@@ -34,6 +34,7 @@
 		465879BA2686560C00180335 /* watchOSDelegation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 465879B82686560C00180335 /* watchOSDelegation.swift */; };
 		465879BB2686560C00180335 /* watchOSLifecycleMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 465879B92686560C00180335 /* watchOSLifecycleMonitor.swift */; };
 		4663C729267A799100ADDD1A /* QueueTimer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4663C728267A799100ADDD1A /* QueueTimer.swift */; };
+		466EC2CE28FB7D5D001B384E /* OutputFileStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 466EC2CD28FB7D5D001B384E /* OutputFileStream.swift */; };
 		46A018C225E5857D00F9CCD8 /* Context.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46A018C125E5857D00F9CCD8 /* Context.swift */; };
 		46A018D425E6C9C200F9CCD8 /* LinuxUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46A018D325E6C9C200F9CCD8 /* LinuxUtils.swift */; };
 		46A018DA25E97FDF00F9CCD8 /* AppleUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46A018D925E97FDF00F9CCD8 /* AppleUtils.swift */; };
@@ -125,6 +126,7 @@
 		465879B82686560C00180335 /* watchOSDelegation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = watchOSDelegation.swift; sourceTree = "<group>"; };
 		465879B92686560C00180335 /* watchOSLifecycleMonitor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = watchOSLifecycleMonitor.swift; sourceTree = "<group>"; };
 		4663C728267A799100ADDD1A /* QueueTimer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QueueTimer.swift; sourceTree = "<group>"; };
+		466EC2CD28FB7D5D001B384E /* OutputFileStream.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OutputFileStream.swift; sourceTree = "<group>"; };
 		46A018C125E5857D00F9CCD8 /* Context.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Context.swift; sourceTree = "<group>"; };
 		46A018D325E6C9C200F9CCD8 /* LinuxUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LinuxUtils.swift; sourceTree = "<group>"; };
 		46A018D925E97FDF00F9CCD8 /* AppleUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppleUtils.swift; sourceTree = "<group>"; };
@@ -356,6 +358,7 @@
 				A3AEE1492580208E002386EB /* iso8601.swift */,
 				46FE4CDF25A53FAD003A7362 /* Storage.swift */,
 				4621080B2605332D00EBC4A8 /* KeyPath.swift */,
+				466EC2CD28FB7D5D001B384E /* OutputFileStream.swift */,
 				46022770261F7A4800A9E913 /* Atomic.swift */,
 				46E382E62654429A00BA2502 /* Utils.swift */,
 				4663C728267A799100ADDD1A /* QueueTimer.swift */,
@@ -507,7 +510,7 @@
 			attributes = {
 				LastSwiftMigration = 9999;
 				LastSwiftUpdateCheck = 1220;
-				LastUpgradeCheck = 1310;
+				LastUpgradeCheck = 1340;
 			};
 			buildConfigurationList = OBJ_2 /* Build configuration list for PBXProject "Segment" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -570,6 +573,7 @@
 				9692726825A583A6009B5298 /* SegmentDestination.swift in Sources */,
 				4602276C261E7BF900A9E913 /* iOSDelegation.swift in Sources */,
 				46A018D425E6C9C200F9CCD8 /* LinuxUtils.swift in Sources */,
+				466EC2CE28FB7D5D001B384E /* OutputFileStream.swift in Sources */,
 				96C33A9C25880A5E00F3D538 /* SegmentLog.swift in Sources */,
 				46FE4C9725A3F35E003A7362 /* macOSLifecycleMonitor.swift in Sources */,
 				9620862C2575C0C800314F8D /* Events.swift in Sources */,
@@ -792,7 +796,7 @@
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) SWIFT_PACKAGE DEBUG";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
-				TVOS_DEPLOYMENT_TARGET = 11.0;
+				TVOS_DEPLOYMENT_TARGET = 12.0;
 				USE_HEADERMAP = NO;
 				WATCHOS_DEPLOYMENT_TARGET = 7.1;
 			};
@@ -865,7 +869,7 @@
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				SWIFT_VERSION = 5.0;
-				TVOS_DEPLOYMENT_TARGET = 11.0;
+				TVOS_DEPLOYMENT_TARGET = 12.0;
 				USE_HEADERMAP = NO;
 				WATCHOS_DEPLOYMENT_TARGET = 7.1;
 			};

Segment.xcodeproj/xcshareddata/xcschemes/Segment-Package.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1310"
+   LastUpgradeVersion = "1340"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Sources/Segment/Utilities/Storage.swift

@@ -248,7 +248,13 @@ extension Storage {
             start(file: storeFile)
             newFile = true
         } else if outputStream == nil {
-            Analytics.segmentLog(message: "Storage: Output stream is nil for \(storeFile)", kind: .error)
+            // this can happen if an instance was terminated before finishing a file.
+            do {
+                outputStream = try OutputFileStream(fileURL: storeFile)
+            } catch {
+                storageMonitor?(error)
+                Analytics.segmentLog(message: "Storage: Unable to open \(file), Error: \(error)", kind: .error)
+            }
         }
 
         // Verify file size isn't too large
@@ -308,6 +314,7 @@ extension Storage {
         }
         outputStream.close()
         self.outputStream = nil
+        print("stream closed for \(file)")
 
         let tempFile = file.appendingPathExtension(Storage.tempExtension)
         do {

Tests/Segment-Tests/StressTests.swift

@@ -22,7 +22,7 @@ class StressTests: XCTestCase {
         // register our network blocker
         guard URLProtocol.registerClass(BlockNetworkCalls.self) else { XCTFail(); return }
 
-        let analytics = Analytics(configuration: Configuration(writeKey: "test").storageMonitor({ error in
+        let analytics = Analytics(configuration: Configuration(writeKey: "stressTest").storageMonitor({ error in
             XCTFail("Storage Error: \(error)")
         }))
         analytics.storage.hardReset(doYouKnowHowToUseThis: true)
@@ -107,13 +107,13 @@ class StressTests: XCTestCase {
         }
     }
 
-    /*
-    func testStressXTimes() throws {
+    
+    /*func testStressXTimes() throws {
         for i in 0..<20 {
             print("Stress test #\(i):")
             try testStorageStress()
             print("\n")
         }
-    }
-     */
+    }*/
+     
 }