Merge pull request #852 from Microsoft/develop

Develop -> Master

AppCenter.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name              = 'AppCenter'
-  s.version           = '1.0.0'
+  s.version           = '1.0.1'
 
   s.summary           = 'Visual Studio App Center is your continuous integration, delivery and learning solution for iOS and macOS apps.'
   s.description       = <<-DESC

AppCenterCrashes/AppCenterCrashes/Internals/MSCrashesPrivate.h

@@ -116,11 +116,6 @@ typedef struct MSCrashesCallbacks {
  */
 @property(nonatomic) NSUncaughtExceptionHandler *exceptionHandler;
 
-/**
- * A flag that indicates that crashes are currently sent to the backend.
- */
-@property(nonatomic) BOOL sendingInProgress;
-
 /**
  * Temporary storage for crashes logs to handle user confirmation and callbacks.
  */

AppCenterCrashes/AppCenterCrashes/MSCrashes.mm

@@ -84,7 +84,7 @@ static void plcr_post_crash_callback(siginfo_t *info, ucontext_t *uap, void *con
 }
 
 static PLCrashReporterCallbacks plCrashCallbacks = {
-    .version = 0, .context = NULL, .handleSignal = plcr_post_crash_callback};
+  .version = 0, .context = NULL, .handleSignal = plcr_post_crash_callback};
 
 /**
  * C++ Exception Handler
@@ -113,6 +113,12 @@ @interface MSCrashes ()
  */
 @property BOOL didCrashInLastSession;
 
+/**
+ * Indicates if the delayedProcessingSemaphore will need to be released
+ * anymore. Useful for preventing overflows.
+ */
+@property BOOL shouldReleaseProcessingSemaphore;
+
 /**
  * Detail information about the last crash.
  */
@@ -153,7 +159,7 @@ + (void)generateTestCrash {
       }
     } else {
       MSLogWarning([MSCrashes logTag], @"GenerateTestCrash was just called in an App Store environment. The call will "
-                                       @"be ignored");
+                   @"be ignored");
     }
   }
 }
@@ -213,8 +219,9 @@ - (instancetype)init {
     _logBufferDir = [MSCrashesUtil logBufferDir];
     _analyzerInProgressFile = [_crashesDir URLByAppendingPathComponent:kMSAnalyzerFilename];
     _didCrashInLastSession = NO;
-    _delayedProcessingSemaphore = dispatch_semaphore_create(1);
+    _delayedProcessingSemaphore = dispatch_semaphore_create(0);
     _automaticProcessing = YES;
+    _shouldReleaseProcessingSemaphore = YES;
 #if !TARGET_OS_TV
     _enableMachExceptionHandler = YES;
 #endif
@@ -246,7 +253,7 @@ - (instancetype)init {
 
 - (void)applyEnabledState:(BOOL)isEnabled {
   [super applyEnabledState:isEnabled];
-
+  
   // Enabling.
   if (isEnabled) {
     id<MSCrashHandlerSetupDelegate> crashSetupDelegate = [MSWrapperCrashesHelper getCrashHandlerSetupDelegate];
@@ -294,11 +301,14 @@ - (void)applyEnabledState:(BOOL)isEnabled {
     if (self.crashFiles.count > 0) {
       [self startDelayedCrashProcessing];
     }
+    else {
+      dispatch_semaphore_signal(self.delayedProcessingSemaphore);
+    }
 
     // More details on log if a debugger is attached.
     if ([MSAppCenter isDebuggerAttached]) {
       MSLogInfo([MSCrashes logTag], @"Crashes service has been enabled but the service cannot detect crashes due to "
-                                     "running the application with a debugger attached.");
+                "running the application with a debugger attached.");
     } else {
       MSLogInfo([MSCrashes logTag], @"Crashes service has been enabled.");
     }
@@ -433,12 +443,12 @@ - (void)onEnqueuingLog:(id<MSLog>)log withInternalId:(NSString *)internalId {
 
       // Overwrite the oldest buffered log.
       msCrashesLogBuffer[indexToDelete].buffer =
-          std::string(&reinterpret_cast<const char *>(serializedLog.bytes)[0],
-                      &reinterpret_cast<const char *>(serializedLog.bytes)[serializedLog.length]);
+      std::string(&reinterpret_cast<const char *>(serializedLog.bytes)[0],
+                  &reinterpret_cast<const char *>(serializedLog.bytes)[serializedLog.length]);
       msCrashesLogBuffer[indexToDelete].internalId = internalId.UTF8String;
       NSTimeInterval now = [[NSDate date] timeIntervalSince1970];
       msCrashesLogBuffer[indexToDelete].timestamp =
-          [[NSString stringWithFormat:@"%f", now] cStringUsingEncoding:NSUTF8StringEncoding];
+      [[NSString stringWithFormat:@"%f", now] cStringUsingEncoding:NSUTF8StringEncoding];
       MSLogVerbose([MSCrashes logTag], @"Overwrote buffered log at index %ld.", indexToDelete);
 
       // We're done, no need to iterate any more. But no need to `return;` as we're at the end of the buffer.
@@ -541,9 +551,9 @@ - (void)configureCrashReporterWithUncaughtExceptionHandlerEnabled:(BOOL)enableUn
 #endif
   PLCrashReporterSymbolicationStrategy symbolicationStrategy = PLCrashReporterSymbolicationStrategyNone;
   MSPLCrashReporterConfig *config =
-      [[MSPLCrashReporterConfig alloc] initWithSignalHandlerType:signalHandlerType
-                                           symbolicationStrategy:symbolicationStrategy
-                          shouldRegisterUncaughtExceptionHandler:enableUncaughtExceptionHandler];
+  [[MSPLCrashReporterConfig alloc] initWithSignalHandlerType:signalHandlerType
+                                       symbolicationStrategy:symbolicationStrategy
+                      shouldRegisterUncaughtExceptionHandler:enableUncaughtExceptionHandler];
   self.plCrashReporter = [[MSPLCrashReporter alloc] initWithConfiguration:config];
 
   /*
@@ -595,7 +605,6 @@ - (void)configureCrashReporterWithUncaughtExceptionHandlerEnabled:(BOOL)enableUn
 #pragma mark - Crash processing
 
 - (void)startDelayedCrashProcessing {
-
   /*
    * FIXME: If application is crashed and relaunched from multitasking view, the SDK starts faster than normal launch
    * and application state is not updated from inactive to active at this time. Give more delay here for a workaround
@@ -607,21 +616,30 @@ - (void)startDelayedCrashProcessing {
    */
 
   // This must be performed asynchronously to prevent a deadlock with 'unprocessedCrashReports'.
-  dispatch_semaphore_wait(self.delayedProcessingSemaphore, DISPATCH_TIME_FOREVER);
   dispatch_time_t delay = dispatch_time(DISPATCH_TIME_NOW, (1 * NSEC_PER_SEC));
   dispatch_after(delay, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
     [self startCrashProcessing];
-    dispatch_semaphore_signal(self.delayedProcessingSemaphore);
+
+    // Only release once to avoid releasing an unbounded number of times.
+    @synchronized(self) {
+      if (self.shouldReleaseProcessingSemaphore) {
+        dispatch_semaphore_signal(self.delayedProcessingSemaphore);
+        self.shouldReleaseProcessingSemaphore = NO;
+      }
+    }
   });
 }
 
 - (void)startCrashProcessing {
-
   // FIXME: There is no life cycle for app extensions yet so force start crash processing until then.
-  if ([MSUtility applicationState] != MSApplicationStateActive &&
-      [MSUtility applicationState] != MSApplicationStateUnknown) {
-    return;
-  }
+  // Also force start crash processing when automatic processing is disabled. Though it sounds
+  // counterintuitive, this is important because there are scenarios in some wrappers (i.e. RN) where
+  // the application state is not ready by the time crash processing needs to happen.
+  if (self.automaticProcessing &&
+      ([MSUtility applicationState] != MSApplicationStateActive &&
+       [MSUtility applicationState] != MSApplicationStateUnknown)) {
+        return;
+      }
   MSLogDebug([MSCrashes logTag], @"Start delayed CrashManager processing");
 
   // Was our own exception handler successfully added?
@@ -637,13 +655,13 @@ - (void)startCrashProcessing {
      */
     if (self.exceptionHandler != currentHandler) {
       MSLogWarning([MSCrashes logTag], @"Another exception handler was added. If "
-                                       @"this invokes any kind of exit() after processing the "
-                                       @"exception, which causes any subsequent error handler "
-                                       @"not to be invoked, these crashes will NOT be reported "
-                                       @"to App Center!");
+                   @"this invokes any kind of exit() after processing the "
+                   @"exception, which causes any subsequent error handler "
+                   @"not to be invoked, these crashes will NOT be reported "
+                   @"to App Center!");
     }
   }
-  if (!self.sendingInProgress && self.crashFiles.count > 0) {
+  if (self.crashFiles.count > 0) {
     [self processCrashReports];
   }
 }
@@ -869,7 +887,7 @@ - (void)handleLatestCrashReport {
 
     // Try loading the crash report
     NSData *crashData =
-        [[NSData alloc] initWithData:[self.plCrashReporter loadPendingCrashReportDataAndReturnError:&error]];
+    [[NSData alloc] initWithData:[self.plCrashReporter loadPendingCrashReportDataAndReturnError:&error]];
     if (crashData == nil) {
       MSLogError([MSCrashes logTag], @"Couldn't load crash report: %@", error.localizedDescription);
     } else {
@@ -890,7 +908,6 @@ - (void)handleLatestCrashReport {
     // Purge the report marker at the end of the routine.
     [self removeAnalyzerFile];
   }
-
   [self.plCrashReporter purgePendingCrashReport];
 }
 
@@ -900,10 +917,10 @@ - (NSMutableArray *)persistedCrashReports {
 
   if ([self.crashesDir checkResourceIsReachableAndReturnError:nil]) {
     NSArray *files =
-        [self.fileManager contentsOfDirectoryAtURL:self.crashesDir
-                        includingPropertiesForKeys:@[ NSURLNameKey, NSURLFileSizeKey, NSURLIsRegularFileKey ]
-                                           options:NSDirectoryEnumerationOptions(0)
-                                             error:&error];
+    [self.fileManager contentsOfDirectoryAtURL:self.crashesDir
+                    includingPropertiesForKeys:@[ NSURLNameKey, NSURLFileSizeKey, NSURLIsRegularFileKey ]
+                                       options:NSDirectoryEnumerationOptions(0)
+                                         error:&error];
     if (!files) {
       MSLogError([MSCrashes logTag], @"Couldn't get files in the directory \"%@\": %@", self.crashesDir,
                  error.localizedDescription);
@@ -1196,3 +1213,4 @@ - (void)trackModelException:(MSException *)exception {
 }
 
 @end
+

AppCenterCrashes/AppCenterCrashesTests/MSCrashesTests.mm

@@ -714,6 +714,7 @@ - (void)testSendOrAwaitWhenAlwaysSendIsFalseAndNotifyDontSend {
   MSCrashes *crashes = OCMPartialMock([MSCrashes new]);
   id<MSLogManager> logManagerMock = OCMProtocolMock(@protocol(MSLogManager));
   [crashes setAutomaticProcessing:NO];
+  [crashes applyEnabledState:YES];
   OCMStub([crashes shouldAlwaysSend]).andReturn(NO);
   __block int numInvocations = 0;
   [self setProcessLogImplementation:(^(NSInvocation *) {
@@ -787,6 +788,7 @@ - (void)testGetUnprocessedCrashReports {
   MSCrashes *crashes = OCMPartialMock([MSCrashes new]);
   id<MSLogManager> logManagerMock = OCMProtocolMock(@protocol(MSLogManager));
   [crashes setAutomaticProcessing:NO];
+
   NSArray *reports = [self startCrashes:crashes withReports:YES withLogManager:logManagerMock];
 
   // When
@@ -833,7 +835,7 @@ - (void)testStartingCrashesWithoutAutomaticProcessing {
 
 #pragma mark Helper
 
-/*
+/**
  * Start Crashes (self.sut) with zero or one crash files on disk.
  */
 - (NSMutableArray<MSErrorReport *> *)startCrashes:(MSCrashes *)crashes
@@ -849,14 +851,26 @@ - (void)testStartingCrashesWithoutAutomaticProcessing {
       [reports addObject:[MSErrorLogFormatter errorReportFromCrashReport:report]];
     }
   }
-  [crashes startWithLogManager:logManager appSecret:kMSTestAppSecret];
-  if (startWithReports) {
-    assertThat(crashes.crashFiles, hasCountOf(1));
-  }
+
+  XCTestExpectation *expectation = [self expectationWithDescription:@"Start the Crashes module"];
+  dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+    [crashes startWithLogManager:logManager appSecret:kMSTestAppSecret];
+    [expectation fulfill];
+  });
+  [self waitForExpectationsWithTimeout:1.0
+                               handler:^(NSError *error) {
+                                 if (startWithReports) {
+                                   assertThat(crashes.crashFiles, hasCountOf(1));
+                                 }
+                                 if (error) {
+                                   XCTFail(@"Expectation Failed with error: %@", error);
+                                 }
+                               }];
+
   return reports;
 }
 
-/*
+/**
  * Attaches the given block to the given logManager's "processLog" method when invoked with Crash's groupId.
  */
 - (void)setProcessLogImplementation:(void (^)(NSInvocation *))invocation

CHANGELOG.md

@@ -1,14 +1,22 @@
 # App Center SDK for iOS and macOS Change Log
 
+## Version 1.0.1
+
+This version contains a bugfix that is specifically for the App Center SDK for React Native.
+
+### AppCenterCrashes
+
+* **[Fix]** Fixes an issue that impacted the App Center SDK for React Native.
+
 ## Version 1.0.0
 
 ### General Availability (GA) Announcement.
-This version contains **breaking changes** due to the renaming from Mobile Center to App Center. When you update to this release, existing telemetry and crash log information will not be migrated and will be discarded. This version introduces macOS support (preview).
+This version contains **breaking changes** due to the renaming from Mobile Center to App Center. In the unlikely event there was data on the device not sent prior to the update, that data will be discarded. This version introduces macOS support (preview).
 
 ### AppCenter
 
 * **[Feature]** Now supports macOS (preview).
-* **[Fix]** Don't send  startService log while SDK is disabled.
+* **[Fix]** Don't send startService log while SDK is disabled.
 
 ### AppCenterAnalytics
 

Config/Version.xcconfig

@@ -1,2 +1,2 @@
 BUILD_NUMBER = 1
-VERSION_STRING = 1.0.0
+VERSION_STRING = 1.0.1

Documentation/iOS/AppCenter/.jazzy.yaml

@@ -5,7 +5,7 @@ sdk: iphonesimulator
 theme: ../../Themes/apple
 
 module: AppCenter
-module_version: 1.0.0
+module_version: 1.0.1
 author: Microsoft Corp
 author_url: http://www.microsoft.com
 

Documentation/iOS/AppCenterAnalytics/.jazzy.yaml

@@ -5,7 +5,7 @@ sdk: iphonesimulator
 theme: ../../Themes/apple
 
 module: AppCenterAnalytics
-module_version: 1.0.0
+module_version: 1.0.1
 author: Microsoft Corp
 author_url: http://www.microsoft.com
 

Documentation/iOS/AppCenterCrashes/.jazzy.yaml

@@ -5,7 +5,7 @@ sdk: iphonesimulator
 theme: ../../Themes/apple
 
 module: AppCenterCrashes
-module_version: 1.0.0
+module_version: 1.0.1
 author: Microsoft Corp
 author_url: http://www.microsoft.com
 

Documentation/iOS/AppCenterDistribute/.jazzy.yaml

@@ -5,7 +5,7 @@ sdk: iphonesimulator
 theme: ../../Themes/apple
 
 module: AppCenterDistribute
-module_version: 1.0.0
+module_version: 1.0.1
 author: Microsoft Corp
 author_url: http://www.microsoft.com
 

Documentation/iOS/AppCenterPush/.jazzy.yaml

@@ -5,7 +5,7 @@ sdk: iphonesimulator
 theme: ../../Themes/apple
 
 module: AppCenterPush
-module_version: 1.0.0
+module_version: 1.0.1
 author: Microsoft Corp
 author_url: http://www.microsoft.com
 

Documentation/macOS/AppCenter/.jazzy.yaml

@@ -5,7 +5,7 @@ sdk: macosx
 theme: ../../Themes/apple
 
 module: AppCenter
-module_version: 1.0.0
+module_version: 1.0.1
 author: Microsoft Corp
 author_url: http://www.microsoft.com
 

Documentation/macOS/AppCenterAnalytics/.jazzy.yaml

@@ -5,7 +5,7 @@ sdk: macosx
 theme: ../../Themes/apple
 
 module: AppCenterAnalytics
-module_version: 1.0.0
+module_version: 1.0.1
 author: Microsoft Corp
 author_url: http://www.microsoft.com
 

Documentation/macOS/AppCenterCrashes/.jazzy.yaml

@@ -5,7 +5,7 @@ sdk: macosx
 theme: ../../Themes/apple
 
 module: AppCenterCrashes
-module_version: 1.0.0
+module_version: 1.0.1
 author: Microsoft Corp
 author_url: http://www.microsoft.com
 

Documentation/macOS/AppCenterPush/.jazzy.yaml

@@ -5,7 +5,7 @@ sdk: macosx
 theme: ../../Themes/apple
 
 module: AppCenterPush
-module_version: 1.0.0
+module_version: 1.0.1
 author: Microsoft Corp
 author_url: http://www.microsoft.com
 

Documentation/tvOS/AppCenter/.jazzy.yaml

@@ -5,7 +5,7 @@ sdk: appletvsimulator
 theme: ../../Themes/apple
 
 module: AppCenter
-module_version: 1.0.0
+module_version: 1.0.1
 author: Microsoft Corp
 author_url: http://www.microsoft.com