Merge remote-tracking branch 'origin/dev' into feat/support-expo-updates

Author: kholood-ea

.circleci/config.yml

@@ -401,22 +401,33 @@ jobs:
       prepare_steps:
         type: steps
         default: []
+      api_endpoint:
+        type: string
+      dashboard_token_env:
+        type: string
     working_directory: ~/project
     executor:
       name: node/default
     steps:
       - advanced-checkout/shallow-checkout
+      - run: git clone [email protected]:Instabug/Escape.git
+      - run:
+          working_directory: Escape
+          command: swift build -c release
+      - run:
+          working_directory: Escape/.build/release
+          command: cp -f Escape /usr/local/bin/escape
       - steps: << parameters.prepare_steps >>
       - install_node_modules
       - run:
           name: Build the SDK
           command: yarn build
       - run:
-          name: Authorize with NPM
-          command: echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc
-      - run:
-          name: Publish new enterprise version
-          command: npm publish
+          name: Publish Custom Package with Escape
+          command: Escape react-native publish-custompackage
+          environment:
+            DASHBOARD_TOKEN: << parameters.dashboard_token_env >>
+            DASHBOARD_API_ENDPOINT: << parameters.api_endpoint >>
 
   publish:
     macos:
@@ -438,8 +449,11 @@ jobs:
           working_directory: project
           command: yarn build
       - run:
+          name: Publish Official Package with Escape
           working_directory: project
           command: Escape react-native publish
+          environment:
+            DASHBOARD_API_ENDPOINT: api.instabug.com
   publish_new_namespace:
     working_directory: ~/project
     executor:
@@ -562,6 +576,8 @@ workflows:
                 npm_package: '@instabug/react-native-nn'
                 android_package: nn
                 api_endpoint: st001009nn.instabug.com
+          api_endpoint: st001009nn.instabug.com
+          dashboard_token_env: ${NN_TOKEN}
 
       - hold_release_injazat:
           requires: *release_dependencies
@@ -581,6 +597,8 @@ workflows:
                 npm_package: '@instabug/react-native-injazat'
                 android_package: injazat
                 api_endpoint: st001013mec1.instabug.com
+          api_endpoint: st001013mec1.instabug.com
+          dashboard_token_env: ${INJAZAT_TOKEN}
 
       # Dream11 tests
       - hold_test_dream11:
@@ -622,3 +640,5 @@ workflows:
               only: dream11
           prepare_steps:
             - prepare_dream11
+          api_endpoint: st001012dream11.instabug.com
+          dashboard_token_env: ${DREAM11_TOKEN}

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## [Unreleased](https://github.com/Instabug/Instabug-React-Native/compare/v14.3.0...dev)
+## [15.0.1](https://github.com/Instabug/Instabug-React-Native/compare/v14.3.0...v15.0.1)
 
 ### Added
 
@@ -14,12 +14,22 @@
 
 - Add support for network spans. ([#1394](https://github.com/Instabug/Instabug-React-Native/pull/1394))
 
+- Add respect to backend network body limit. ([#1397](https://github.com/Instabug/Instabug-React-Native/pull/1397))
+
+### Changed
+
+- Bump Instabug iOS SDK to v15.1.1 ([#1402](https://github.com/Instabug/Instabug-React-Native/pull/1402)). [See release notes](https://github.com/Instabug/Instabug-iOS/releases/tag/15.1.1).
+
+- Bump Instabug Android SDK to v15.0.1 ([#1402](https://github.com/Instabug/Instabug-React-Native/pull/1402)). [See release notes](https://github.com/Instabug/Instabug-Android/releases/tag/v15.0.1).
+
 ### Fixed
 
 - Not sending the inComplete xhrRequest. ([#1365](https://github.com/Instabug/Instabug-React-Native/pull/1365))
 
 - Added more search capabilities to the find-token.sh script. e.g., searching in .env file for react config. [#1366](https://github.com/Instabug/Instabug-React-Native/pull/1366)
 
+- Updated the CHANGELOG on the dashboard for the enterprise users. [#1404](https://github.com/Instabug/Instabug-React-Native/pull/1404)
+
 ## [14.3.0](https://github.com/Instabug/Instabug-React-Native/compare/v14.1.0...14.3.0)
 
 ### Added

RNInstabug.podspec

@@ -16,7 +16,6 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m,mm}"
 
   s.dependency 'React-Core'
-  # use_instabug!(s)
-  s.dependency 'Instabug'
+  use_instabug!(s)
 
 end

android/build.gradle

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

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

@@ -13,7 +13,7 @@ final class Constants {
     final static String IBG_ON_FEATURES_UPDATED_CALLBACK = "IBGOnFeatureUpdatedCallback";
     final static String IBG_NETWORK_LOGGER_HANDLER = "IBGNetworkLoggerHandler";
 
-    final static String IBG_ON_NEW_W3C_FLAGS_UPDATE_RECEIVED_CALLBACK = "IBGOnNewW3CFlagsUpdateReceivedCallback";
+    final static String IBG_ON_FEATURE_FLAGS_UPDATE_RECEIVED_CALLBACK = "IBGOnNewFeatureFlagsUpdateReceivedCallback";
 
     final static String IBG_SESSION_REPLAY_ON_SYNC_CALLBACK_INVOCATION = "IBGSessionReplayOnSyncCallback";
 

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

@@ -1186,10 +1186,10 @@ public void run() {
     }
 
     /**
-     * Register a listener for W3C flags value change
+     * Register a listener for feature flags value change
      */
     @ReactMethod
-    public void registerW3CFlagsChangeListener() {
+    public void registerFeatureFlagsChangeListener() {
 
         MainThreadHandler.runOnMainThread(new Runnable() {
             @Override
@@ -1202,8 +1202,9 @@ public void invoke(@NonNull CoreFeaturesState featuresState) {
                             params.putBoolean("isW3ExternalTraceIDEnabled", featuresState.isW3CExternalTraceIdEnabled());
                             params.putBoolean("isW3ExternalGeneratedHeaderEnabled", featuresState.isAttachingGeneratedHeaderEnabled());
                             params.putBoolean("isW3CaughtHeaderEnabled", featuresState.isAttachingCapturedHeaderEnabled());
+                            params.putInt("networkBodyLimit",featuresState.getNetworkLogCharLimit());
 
-                            sendEvent(Constants.IBG_ON_NEW_W3C_FLAGS_UPDATE_RECEIVED_CALLBACK, params);
+                            sendEvent(Constants.IBG_ON_FEATURE_FLAGS_UPDATE_RECEIVED_CALLBACK, params);
                         }
                     });
                 } catch (Exception e) {
@@ -1333,7 +1334,7 @@ public void run() {
            }
        });
    }
-     /**
+
     /**
      * Sets the auto mask screenshots types.
      *
@@ -1358,4 +1359,23 @@ public void run() {
 
         });
     }
+
+    /**
+     * Get network body size limit
+     */
+    @ReactMethod
+    public void getNetworkBodyMaxSize(Promise promise) {
+
+        MainThreadHandler.runOnMainThread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    promise.resolve(InternalCore.INSTANCE.get_networkLogCharLimit());
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    promise.resolve(false);
+                }
+            }
+        });
+    }
 }

android/src/test/java/com/instabug/reactlibrary/RNInstabugReactnativeModuleTest.java

@@ -702,9 +702,22 @@ public void testEnableAutoMasking(){
             String maskTextInputs = "textInputs";
             String maskMedia = "media";
             String maskNone = "none";
-    
+
             rnModule.enableAutoMasking(JavaOnlyArray.of(maskLabel, maskMedia, maskTextInputs,maskNone));
-    
+
             mockInstabug.verify(() -> Instabug.setAutoMaskScreenshotsTypes(MaskingType.LABELS,MaskingType.MEDIA,MaskingType.TEXT_INPUTS,MaskingType.MASK_NOTHING));
     }
+
+    @Test
+    public void testGetNetworkBodyMaxSize_resolvesPromiseWithExpectedValue() {
+        Promise promise = mock(Promise.class);
+        InternalCore internalAPM = mock(InternalCore.class);
+        int expected = 10240;
+        when(internalAPM.get_networkLogCharLimit()).thenReturn(expected);
+
+        rnModule.getNetworkBodyMaxSize(promise);
+
+        verify(promise).resolve(expected);
+    }
+
 }

examples/default/android/build.gradle

@@ -24,7 +24,7 @@ buildscript {
         classpath("com.android.tools.build:gradle:8.1.0")
         classpath("com.facebook.react:react-native-gradle-plugin")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
-        classpath("com.instabug.library:instabug-plugin:14.3.1.6745207-SNAPSHOT")
+        classpath("com.instabug.library:instabug-plugin:15.0.1")
     }
 }
 

examples/default/ios/InstabugTests/InstabugSampleTests.m

@@ -656,4 +656,23 @@ - (void)testSetNetworkLogBodyEnabled {
     OCMVerify([mock setLogBodyEnabled:isEnabled]);
 }
 
+- (void)testGetNetworkBodyMaxSize {
+    id mock = OCMClassMock([IBGNetworkLogger class]);
+    double expectedValue = 10240.0;
+
+    OCMStub([mock getNetworkBodyMaxSize]).andReturn(expectedValue);
+
+    XCTestExpectation *expectation = [self expectationWithDescription:@"Call resolve block"];
+    RCTPromiseResolveBlock resolve = ^(NSNumber *result) {
+        XCTAssertEqual(result.doubleValue, expectedValue);
+        [expectation fulfill];
+    };
+
+    [self.instabugBridge getNetworkBodyMaxSize:resolve :nil];
+    [self waitForExpectationsWithTimeout:1.0 handler:nil];
+
+    OCMVerify(ClassMethod([mock getNetworkBodyMaxSize]));
+}
+
+
 @end

examples/default/ios/Podfile

@@ -15,9 +15,9 @@ target 'InstabugExample' do
   config = use_native_modules!
   rn_maps_path = '../node_modules/react-native-maps'
   pod 'react-native-google-maps', :path => rn_maps_path
+
   # add this line
-  pod 'Instabug', :podspec => 'https://ios-releases.instabug.com/custom/feature-expose_network_limit-expose_body_limit/15.0.1/Instabug.podspec'
-  # Flags change depending on the env values.
+  pod 'Instabug', :podspec => 'https://ios-releases.instabug.com/custom/feature-support_expo_updates-remove_caching/15.1.1/Instabug.podspec'  # Flags change depending on the env values.
   flags = get_default_flags()
 
   use_react_native!(