Merge branch 'dev' into fit52/async-network-interceptor

# Conflicts: #	CHANGELOG.md #	android/build.gradle #	android/native.gradle #	android/src/main/java/com/instabug/reactlibrary/RNInstabugAPMModule.java #	android/src/test/java/com/instabug/reactlibrary/RNInstabugReactnativeModuleTest.java #	examples/default/ios/InstabugTests/InstabugSampleTests.m #	examples/default/ios/Podfile.lock #	examples/default/package.json #	examples/default/src/screens/apm/APMScreen.tsx #	examples/default/yarn.lock #	ios/native.rb #	package.json #	src/modules/NetworkLogger.ts #	src/utils/XhrNetworkInterceptor.ts #	test/mocks/mockInstabug.ts #	test/modules/NetworkLogger.spec.ts

Author: ahmedAlaaInstabug

CHANGELOG.md

@@ -1,11 +1,22 @@
 # Changelog
 
-## [Unreleased](https://github.com/Instabug/Instabug-React-Native/compare/v14.1.0...dev)
+## [Unreleased]
 
-## Fixed
+### Added
+
+- Add support for BugReporting user consents. ([#1383](https://github.com/Instabug/Instabug-React-Native/pull/1383))
+
+## [14.3.0](https://github.com/Instabug/Instabug-React-Native/compare/v14.1.0...14.3.0)
+
+### Added
+
+- Add support for enable/disable capturing network body. ([#1362](https://github.com/Instabug/Instabug-React-Native/pull/1362))
+
+### Changed
 
-- Intercept incomplete network Requests ([#1365](https://github.com/Instabug/Instabug-React-Native/pull/1365))
+- Bump Instabug iOS SDK to v14.3.0 ([#1367](https://github.com/Instabug/Instabug-React-Native/pull/1367)). [See release notes](https://github.com/Instabug/Instabug-iOS/releases/tag/14.3.0).
 
+- Bump Instabug Android SDK to v14.3.0 ([#1375](https://github.com/Instabug/Instabug-React-Native/pull/1375)). [See release notes](https://github.com/Instabug/Instabug-Android/releases/tag/v14.3.0).
 
 ## [14.1.0](https://github.com/Instabug/Instabug-React-Native/compare/v14.0.0...v14.1.0) (January 2, 2025)
 

RNInstabug.podspec

@@ -17,4 +17,5 @@ Pod::Spec.new do |s|
 
  s.dependency 'React-Core'
  use_instabug!(s)
+
 end

android/build.gradle

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

android/native.gradle

@@ -1,5 +1,5 @@
 project.ext.instabug = [
- version: '14.1.0'
+ version: '14.3.0.6752106-SNAPSHOT'
 ]
 
 dependencies {

android/src/main/java/com/instabug/apm/networking/ApmNetworkLoggerHelper.java

@@ -0,0 +1,89 @@
+package com.instabug.apm.networking;
+
+import androidx.annotation.Nullable;
+
+import com.facebook.react.bridge.ReadableMap;
+import com.instabug.apm.networking.mapping.NetworkRequestAttributes;
+import com.instabug.apm.networkinterception.cp.APMCPNetworkLog;
+
+public class ApmNetworkLoggerHelper {
+
+ /// Log network request to the Android SDK using a package private API [APMNetworkLogger.log]
+ static public void log(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 ReadableMap w3cAttributes,
+ @Nullable final String gqlQueryName,
+ @Nullable final String serverErrorMessage
+ ) {
+ try {
+ final APMNetworkLogger apmNetworkLogger = new APMNetworkLogger();
+ final boolean hasError = errorDomain != null && !errorDomain.isEmpty();
+ final String errorMessage = hasError ? errorDomain : null;
+ boolean isW3cHeaderFound = false;
+ Long partialId = null;
+ Long networkStartTimeInSeconds = null;
+
+
+ try {
+ if (!w3cAttributes.isNull("isW3cHeaderFound")) {
+ isW3cHeaderFound = w3cAttributes.getBoolean("isW3cHeaderFound");
+ }
+
+ if (!w3cAttributes.isNull("partialId")) {
+ partialId = (long) w3cAttributes.getDouble("partialId");
+ networkStartTimeInSeconds = (long) w3cAttributes.getDouble("networkStartTimeInSeconds");
+ }
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ APMCPNetworkLog.W3CExternalTraceAttributes w3cExternalTraceAttributes =
+ new APMCPNetworkLog.W3CExternalTraceAttributes(
+ isW3cHeaderFound,
+ partialId,
+ networkStartTimeInSeconds,
+ w3cAttributes.getString("w3cGeneratedHeader"),
+ w3cAttributes.getString("w3cCaughtHeader")
+ );
+ NetworkRequestAttributes requestAttributes = new NetworkRequestAttributes(
+ (long) requestStartTime * 1000,
+ (long) requestDuration,
+ requestHeaders,
+ requestBody,
+ (long) requestBodySize,
+ requestMethod,
+ requestUrl,
+ requestContentType,
+ responseHeaders,
+ responseBody,
+ (long) responseBodySize,
+ (int) statusCode,
+ responseContentType,
+ gqlQueryName,
+ errorMessage,
+ serverErrorMessage
+ );
+
+ apmNetworkLogger.log(
+ requestAttributes,
+ w3cExternalTraceAttributes
+ );
+ } catch (Throwable e) {
+ e.printStackTrace();
+ }
+
+ }
+
+}

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

@@ -60,6 +60,7 @@ static Map<String, Object> getAll() {
  putAll(locales);
  putAll(placeholders);
  putAll(launchType);
+ putAll(userConsentActionType);
  }};
  }
 
@@ -142,6 +143,12 @@ static Map<String, Object> getAll() {
  put("reproStepsDisabled", ReproMode.Disable);
  }};
 
+ static final ArgsMap<String> userConsentActionType = new ArgsMap<String>() {{
+ put("dropAutoCapturedMedia", com.instabug.bug.userConsent.ActionType.DROP_AUTO_CAPTURED_MEDIA);
+ put("dropLogs", com.instabug.bug.userConsent.ActionType.DROP_LOGS);
+ put("noChat", com.instabug.bug.userConsent.ActionType.NO_CHAT);
+ }};
+
  static final ArgsMap<Integer> sdkLogLevels = new ArgsMap<Integer>() {{
  put("sdkDebugLogsLevelNone", com.instabug.library.LogLevel.NONE);
  put("sdkDebugLogsLevelError", com.instabug.library.LogLevel.ERROR);