feat: capture client error in the network interceptor

.gitignore

@@ -1,6 +1,8 @@
 # Distribution
 dist/
 bin/
+upload/*
+!upload/package.json
 
 # NodeJS
 node_modules/

CHANGELOG.md

@@ -1,5 +1,33 @@
 # Changelog
 
+## [Unreleased](https://github.com/Instabug/Instabug-React-Native/compare/v13.3.0...dev)
+
+### Added
+
+- Add support for Expo Router navigation tracking ([#1270](https://github.com/Instabug/Instabug-React-Native/pull/1270)).
+- Enhance the network interceptor to capture some client error messages ([#1257](https://github.com/Instabug/Instabug-React-Native/pull/1257)).
+
+## [13.3.0](https://github.com/Instabug/Instabug-React-Native/compare/v13.2.0...v13.3.0) (August 4, 2024)
+
+### Added
+
+- Add support for Feature Flags APIs `Instabug.addFeatureFlags`, `Instabug.removeFeatureFlags` and `Instabug.clearAllFeatureFlags` ([#1230](https://github.com/Instabug/Instabug-React-Native/pull/1230)).
+- Export `uploadSourcemaps` and `uploadSoFiles` utilities in the `instabug-reactnative/upload` sub-package for usage in custom Node.js upload scripts ([#1252](https://github.com/Instabug/Instabug-React-Native/pull/1252)).
+
+### Changed
+
+- Bump Instabug Android SDK to v13.3.0 ([#1261](https://github.com/Instabug/Instabug-React-Native/pull/1261)). [See release notes](https://github.com/Instabug/Instabug-Android/releases/tag/v13.3.0).
+- Bump Instabug iOS SDK to v13.3.0 ([#1262](https://github.com/Instabug/Instabug-React-Native/pull/1262)). [See release notes](https://github.com/Instabug/Instabug-iOS/releases/tag/13.3.0).
+
+### Deprecated
+
+- Deprecate Experiments APIs `Instabug.addExperiments`, `Instabug.removeExperiments` and `Instabug.clearAllExperiments` in favor of the new Feature Flags APIs ([#1230](https://github.com/Instabug/Instabug-React-Native/pull/1230)).
+
+### Fixed
+
+- Fix APM network logging on Android ([#1253](https://github.com/Instabug/Instabug-React-Native/pull/1253)).
+- Fix an OOM (out-of-memory) crash while saving network logs on Android ([#1244](https://github.com/Instabug/Instabug-React-Native/pull/1244)).
+
 ## [13.2.0](https://github.com/Instabug/Instabug-React-Native/compare/v13.1.1...v13.2.0) (July 7, 2024)
 
 ### Changed
@@ -52,17 +80,17 @@
 - Bump Instabug iOS SDK to v13.0.0 ([#1189](https://github.com/Instabug/Instabug-React-Native/pull/1189)). [See release notes](https://github.com/instabug/instabug-ios/releases/tag/13.0.0).
 - Bump Instabug Android SDK to v13.0.0 ([#1188](https://github.com/Instabug/Instabug-React-Native/pull/1188)). [See release notes](https://github.com/Instabug/android/releases/tag/v13.0.0).
 
+### Deprecated
+
+- Deprecate Execution Traces APIs `APM.startExecutionTrace`, `Trace.end` and `Trace.setAttribute` in favor of the new App Flows APIs ([#1138](https://github.com/Instabug/Instabug-React-Native/pull/1138)).
+
 ## [12.9.0](https://github.com/Instabug/Instabug-React-Native/compare/v12.8.0...12.9.0)(April 2, 2024)
 
 ### Added
 
 - Adds symbol files upload script ([#1137](https://github.com/Instabug/Instabug-React-Native/pull/1137))
 - Support enabling NDK crash capturing on Android ([#1132](https://github.com/Instabug/Instabug-React-Native/pull/1132)).
 
-### Deprecated
-
-- Deprecate Execution Traces APIs `APM.startExecutionTrace`, `Trace.end` and `Trace.setAttribute` in favor of the new App Flows APIs ([#1138](https://github.com/Instabug/Instabug-React-Native/pull/1138)).
-
 ### Changed
 
 - Bump Instabug Android SDK to v12.9.0 ([#1168](https://github.com/Instabug/Instabug-React-Native/pull/1168)). [See release notes](https://github.com/Instabug/android/releases/tag/v12.9.0).

android/build.gradle

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

android/native.gradle

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

android/src/main/AndroidManifest.xml

@@ -1,4 +1,4 @@
-<manifest package="com.instabug.reactlibrary"
+<manifest 
   xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>

android/src/main/java/com/instabug/reactlibrary/RNInstabugAPMModule.java

@@ -5,13 +5,16 @@
 import android.util.Log;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.instabug.apm.APM;
 import com.instabug.apm.model.ExecutionTrace;
 import com.instabug.apm.networking.APMNetworkLogger;
+import com.instabug.apm.networkinterception.cp.APMCPNetworkLog;
 import com.instabug.reactlibrary.utils.MainThreadHandler;
 
 import org.json.JSONException;
@@ -312,56 +315,59 @@ public void run() {
         });
     }
 
-    /**
-    *  Send Apm network log by Reflection
-    */
     @ReactMethod
-    public void networkLog(String networkData) throws JSONException {
-        try{
-            APMNetworkLogger apmNetworkLogger = new APMNetworkLogger();
-            JSONObject jsonObject = new JSONObject(networkData);
-            final String requestUrl = (String) jsonObject.get("url");
-            final String requestBody = (String) jsonObject.get("requestBody");
-            final String responseBody = (String) jsonObject.get("responseBody");
-            final String requestMethod = (String) jsonObject.get("method");
-            //--------------------------------------------
-            final String requestContentType = (String) jsonObject.get("requestContentType");
-            final String responseContentType = (String) jsonObject.get("contentType");
-            //--------------------------------------------
-            final long requestBodySize = ((Number) jsonObject.get("requestBodySize")).longValue();
-            final long responseBodySize = ((Number) jsonObject.get("responseBodySize")).longValue();
-            //--------------------------------------------
-            final String errorDomain = (String) jsonObject.get("errorDomain");
-            final Integer statusCode = (Integer) jsonObject.get("responseCode");
-            final long requestDuration = ((Number) jsonObject.get("duration")).longValue();
-            final long requestStartTime = ((Number) jsonObject.get("startTime")).longValue() * 1000;
-            final String requestHeaders = (String) jsonObject.get("requestHeaders").toString();
-            final String responseHeaders = (String) jsonObject.get("responseHeaders").toString();
-            final String errorMessage;
-            if(errorDomain.equals("")) {
-                errorMessage = null;
-            } else {
-                errorMessage = errorDomain;
-            }
-            //--------------------------------------------
-            String gqlQueryName = null;
-            if(jsonObject.has("gqlQueryName")){
-                gqlQueryName = (String) jsonObject.get("gqlQueryName");
-            }
-            final String serverErrorMessage = (String) jsonObject.get("serverErrorMessage");
+    private void networkLogAndroid(final double requestStartTime,
+                                   final double requestDuration,
+                                   final String requestHeaders,
+                                   final String requestBody,
+                                   final double requestBodySize,
+                                   final String requestMethod,
+                                   final String requestUrl,
+                                   final String requestContentType,
+                                   final String responseHeaders,
+                                   final String responseBody,
+                                   final double responseBodySize,
+                                   final double statusCode,
+                                   final String responseContentType,
+                                   @Nullable final String errorDomain,
+                                   @Nullable final String gqlQueryName,
+                                   @Nullable final String serverErrorMessage) {
+        try {
+            APMNetworkLogger networkLogger = new APMNetworkLogger();
+
+            final boolean hasError = errorDomain != null && !errorDomain.isEmpty();
+            final String errorMessage = hasError ? errorDomain : null;
 
             try {
-                Method method = getMethod(Class.forName("com.instabug.apm.networking.APMNetworkLogger"), "log", long.class, long.class, String.class, String.class, long.class, String.class, String.class, String.class, String.class, String.class, long.class, int.class, String.class, String.class, String.class, String.class);
+                Method method = getMethod(Class.forName("com.instabug.apm.networking.APMNetworkLogger"), "log", long.class, long.class, String.class, String.class, long.class, String.class, String.class, String.class, String.class, String.class, long.class, int.class, String.class, String.class, String.class, String.class, APMCPNetworkLog.W3CExternalTraceAttributes.class);
                 if (method != null) {
-                    method.invoke(apmNetworkLogger, requestStartTime, requestDuration, requestHeaders, requestBody, requestBodySize, requestMethod, requestUrl, requestContentType, responseHeaders, responseBody, responseBodySize, statusCode, responseContentType, errorMessage, gqlQueryName, serverErrorMessage);
+                        method.invoke(
+                                networkLogger,
+                                (long) requestStartTime * 1000,
+                                (long) requestDuration,
+                                requestHeaders,
+                                requestBody,
+                                (long)  requestBodySize,
+                                requestMethod,
+                                requestUrl,
+                                requestContentType,
+                                responseHeaders,
+                                responseBody,
+                                (long)responseBodySize,
+                                (int) statusCode,
+                                responseContentType,
+                                errorMessage,
+                                gqlQueryName,
+                                serverErrorMessage,
+                                null
+                        );
                 } else {
-                    Log.e("IB-CP-Bridge", "apmNetworkLogByReflection was not found by reflection");
+                    Log.e("IB-CP-Bridge", "APMNetworkLogger.log was not found by reflection");
                 }
             } catch (Throwable e) {
                 e.printStackTrace();
             }
-        }
-        catch(Throwable e) {
+        } catch(Throwable e) {
             e.printStackTrace();
         }
     }