Merge remote-tracking branch 'origin/dev' into feat/network-spans-feature-flags

# Conflicts:
#	examples/default/ios/Podfile.lock

Author: AndrewAminInstabug

CHANGELOG.md

@@ -1,20 +1,23 @@
 # Changelog
 
-## [Unreleased](https://github.com/Instabug/Instabug-React-Native/compare/v13.3.0...dev)
+## [13.4.0](https://github.com/Instabug/Instabug-React-Native/compare/v13.3.0...v13.4.0) (October 2, 2024)
 
 ### Added
 
 - Add support for Expo Router navigation tracking ([#1270](https://github.com/Instabug/Instabug-React-Native/pull/1270)).
 - Enhance the network interceptor to capture more client error messages ([#1257](https://github.com/Instabug/Instabug-React-Native/pull/1257)).
 
-### Fixed
+### Changed
 
-- Drop non-error objects reported as crashes since they don't have a stack trace ([#1279](https://github.com/Instabug/Instabug-React-Native/pull/1279)).
-- Fix APM network logging on iOS when the response body is missing or empty. ([#1273](https://github.com/Instabug/Instabug-React-Native/pull/1273)).
+- Bump Instabug iOS SDK to v13.4.2 ([#1285](https://github.com/Instabug/Instabug-React-Native/pull/1285)). See release notes for [13.4.0](https://github.com/Instabug/Instabug-iOS/releases/tag/13.4.0), [13.4.1](https://github.com/Instabug/Instabug-iOS/releases/tag/13.4.1) and [13.4.2](https://github.com/Instabug/Instabug-iOS/releases/tag/13.4.2).
+- Bump Instabug Android SDK to v13.4.1 ([#1285](https://github.com/Instabug/Instabug-React-Native/pull/1285)). See release notes for [13.4.0](https://github.com/Instabug/Instabug-Android/releases/tag/v13.4.0) and [13.4.1](https://github.com/Instabug/Instabug-Android/releases/tag/v13.4.1).
 
 ### Fixed
 
+- Fix an issue with JavaScript fatal crashes on iOS causing them to be reported as native iOS crashes instead. ([#1290](https://github.com/Instabug/Instabug-React-Native/pull/1290)).
 - Correctly resolve the flavor path when uploading sourcemaps on Android. ([#1225](https://github.com/Instabug/Instabug-React-Native/pull/1225)).
+- Drop non-error objects reported as crashes since they don't have a stack trace ([#1279](https://github.com/Instabug/Instabug-React-Native/pull/1279)).
+- Fix APM network logging on iOS when the response body is missing or empty. ([#1273](https://github.com/Instabug/Instabug-React-Native/pull/1273)).
 
 ## [13.3.0](https://github.com/Instabug/Instabug-React-Native/compare/v13.2.0...v13.3.0) (August 4, 2024)
 

android/build.gradle

@@ -57,7 +57,7 @@ android {
         minSdkVersion getExtOrDefault('minSdkVersion').toInteger()
         targetSdkVersion getExtOrDefault('targetSdkVersion').toInteger()
         versionCode 1
-        versionName "13.3.0"
+        versionName "13.4.0"
         multiDexEnabled true
         ndk {
             abiFilters "armeabi-v7a", "x86"

android/native.gradle

@@ -1,5 +1,5 @@
 project.ext.instabug = [
-    version: '13.3.0'
+    version: '13.4.1'
 ]
 
 dependencies {

examples/default/ios/InstabugTests/InstabugCrashReportingTests.m

@@ -26,6 +26,22 @@ - (void)testSetEnabled {
   XCTAssertFalse(IBGCrashReporting.enabled);
 }
 
+- (void)testSendJSCrash {
+  NSDictionary *stackTrace = @{};
+
+  XCTestExpectation *expectation = [self expectationWithDescription:@"Expected resolve to be called."];
+
+  RCTPromiseResolveBlock resolve = ^(id result) {
+    [expectation fulfill];
+  };
+  RCTPromiseRejectBlock reject = ^(NSString *code, NSString *message, NSError *error) {};
+  
+  [self.bridge sendJSCrash:stackTrace resolver:resolve rejecter:reject];
+
+  [self waitForExpectations:@[expectation] timeout:1];
+  OCMVerify([self.mCrashReporting cp_reportFatalCrashWithStackTrace:stackTrace]);
+}
+
 - (void)testSendNonFatalErrorJsonCrash {
   NSDictionary<NSString *,NSString * > *jsonCrash = @{};
   NSString *fingerPrint = @"fingerprint";

examples/default/ios/InstabugTests/InstabugSampleTests.m

@@ -365,7 +365,12 @@ - (void)testNetworkLogIOS {
                                          startTime:startTime * 1000
                                           duration:duration * 1000
                                       gqlQueryName:gqlQueryName
-                                serverErrorMessage:serverErrorMessage]);
+                                serverErrorMessage:serverErrorMessage
+                                      isW3cCaughted:nil
+                                          partialID:nil
+                                          timestamp:nil
+                            generatedW3CTraceparent:nil
+                             caughtedW3CTraceparent:nil]);
 }
 
 - (void)testSetFileAttachment {

ios/RNInstabug/InstabugCrashReportingBridge.m

@@ -29,12 +29,9 @@ + (BOOL)requiresMainQueueSetup
 RCT_EXPORT_METHOD(sendJSCrash:(NSDictionary *)stackTrace
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject) {
-    dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0ul);
+    dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0ul);
     dispatch_async(queue, ^{
-        SEL reportCrashWithStackTraceSEL = NSSelectorFromString(@"reportCrashWithStackTrace:handled:");
-        if ([[Instabug class] respondsToSelector:reportCrashWithStackTraceSEL]) {
-            [[Instabug class] performSelector:reportCrashWithStackTraceSEL withObject:stackTrace withObject:@(NO)];
-        }
+        [IBGCrashReporting cp_reportFatalCrashWithStackTrace:stackTrace];
         resolve([NSNull null]);
     });
 }
@@ -45,8 +42,6 @@ + (BOOL)requiresMainQueueSetup
                   rejecter:(RCTPromiseRejectBlock)reject) {
     dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0ul);
     dispatch_async(queue, ^{
-        
-     
         [IBGCrashReporting cp_reportNonFatalCrashWithStackTrace:stackTrace level:nonFatalExceptionLevel groupingString:fingerprint userAttributes:userAttributes];
 
         resolve([NSNull null]);

ios/RNInstabug/InstabugReactBridge.m

@@ -314,7 +314,12 @@ - (dispatch_queue_t)methodQueue {
                                  startTime:startTime * 1000
                                   duration:duration * 1000
                               gqlQueryName:gqlQueryName
-                        serverErrorMessage:serverErrorMessage];
+                        serverErrorMessage:serverErrorMessage
+                             isW3cCaughted:nil
+                                 partialID:nil
+                                 timestamp:nil
+                   generatedW3CTraceparent:nil
+                    caughtedW3CTraceparent:nil];
 }
 
 RCT_EXPORT_METHOD(addPrivateView: (nonnull NSNumber *)reactTag) {

ios/RNInstabug/Util/IBGNetworkLogger+CP.h

@@ -9,22 +9,27 @@ NS_ASSUME_NONNULL_BEGIN
 @property (class, atomic, assign) BOOL isNativeNetworkInterceptionFeatureEnabled;
 
 + (void)disableAutomaticCapturingOfNetworkLogs;
-+ (void)addNetworkLogWithUrl:(NSString *)url
-                      method:(NSString *)method
-                 requestBody:(NSString *)request
++ (void)addNetworkLogWithUrl:(NSString *_Nonnull)url
+                      method:(NSString *_Nonnull)method
+                 requestBody:(NSString *_Nonnull)request
              requestBodySize:(int64_t)requestBodySize
-                responseBody:(NSString *)response
+                responseBody:(NSString *_Nonnull)response
             responseBodySize:(int64_t)responseBodySize
                 responseCode:(int32_t)code
-              requestHeaders:(NSDictionary *)requestHeaders
-             responseHeaders:(NSDictionary *)responseHeaders
-                 contentType:(NSString *)contentType
-                 errorDomain:(NSString *)errorDomain
+              requestHeaders:(NSDictionary *_Nonnull)requestHeaders
+             responseHeaders:(NSDictionary *_Nonnull)responseHeaders
+                 contentType:(NSString *_Nonnull)contentType
+                 errorDomain:(NSString *_Nullable)errorDomain
                    errorCode:(int32_t)errorCode
                    startTime:(int64_t)startTime
                     duration:(int64_t) duration
                 gqlQueryName:(NSString * _Nullable)gqlQueryName
-          serverErrorMessage:(NSString * _Nullable)serverErrorMessage;
+          serverErrorMessage:(NSString * _Nullable)serverErrorMessage
+               isW3cCaughted:(NSNumber * _Nullable)isW3cCaughted
+                   partialID:(NSNumber * _Nullable)partialID
+                   timestamp:(NSNumber * _Nullable)timestamp
+     generatedW3CTraceparent:(NSString * _Nullable)generatedW3CTraceparent
+      caughtedW3CTraceparent:(NSString * _Nullable)caughtedW3CTraceparent;
 
 @end
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "instabug-reactnative",
   "description": "React Native plugin for integrating the Instabug SDK",
-  "version": "13.3.0",
+  "version": "13.4.0",
   "author": "Instabug (https://instabug.com)",
   "repository": "github:Instabug/Instabug-React-Native",
   "homepage": "https://www.instabug.com/platforms/react-native",