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

# Conflicts:
#	examples/default/ios/InstabugExample.xcodeproj/project.pbxproj
#	examples/default/ios/Podfile
#	examples/default/ios/Podfile.lock
#	ios/RNInstabug/InstabugNetworkLoggerBridge.h
#	ios/RNInstabug/InstabugNetworkLoggerBridge.m
#	src/native/NativeNetworkLogger.ts

Author: andrewdanieldev

examples/default/ios/InstabugExample.xcodeproj/project.pbxproj

@@ -18,8 +18,7 @@ target 'InstabugExample' do
   # Flags change depending on the env values.
   flags = get_default_flags()
 
-#   pod 'Instabug', :podspec => 'https://ios-releases.instabug.com/custom/feature-support_cp_network_filtering_obfuscation-base/13.4.2/Instabug.podspec'
-  pod 'Instabug', :podspec => 'https://ios-releases.instabug.com/custom/feature-support_cp_network_filtering_obfuscation-release/13.4.3/Instabug.podspec'
+  pod 'Instabug', :podspec => 'https://ios-releases.instabug.com/custom/release-support_cp_network_filtering_obfuscation-add_reset_network_state/13.4.3/Instabug.podspec'
   use_react_native!(
     :path => config[:reactNativePath],
     # Hermes is now enabled by default. Disable by setting this flag to false.

examples/default/ios/Podfile

@@ -524,7 +524,7 @@ DEPENDENCIES:
   - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
   - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
   - hermes-engine (from `../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec`)
-  - Instabug (from `https://ios-releases.instabug.com/custom/feature-support_cp_network_filtering_obfuscation-release/13.4.3/Instabug.podspec`)
+  - Instabug (from `https://ios-releases.instabug.com/custom/release-support_cp_network_filtering_obfuscation-add_reset_network_state/13.4.3/Instabug.podspec`)
   - instabug-reactnative-ndk (from `../node_modules/instabug-reactnative-ndk`)
   - libevent (~> 2.1.12)
   - OCMock
@@ -600,7 +600,7 @@ EXTERNAL SOURCES:
     :podspec: "../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec"
     :tag: hermes-2023-03-20-RNv0.72.0-49794cfc7c81fb8f69fd60c3bbf85a7480cc5a77
   Instabug:
-    :podspec: https://ios-releases.instabug.com/custom/feature-support_cp_network_filtering_obfuscation-release/13.4.3/Instabug.podspec
+    :podspec: https://ios-releases.instabug.com/custom/release-support_cp_network_filtering_obfuscation-add_reset_network_state/13.4.3/Instabug.podspec
   instabug-reactnative-ndk:
     :path: "../node_modules/instabug-reactnative-ndk"
   RCT-Folly:
@@ -706,7 +706,7 @@ SPEC CHECKSUMS:
   Google-Maps-iOS-Utils: f77eab4c4326d7e6a277f8e23a0232402731913a
   GoogleMaps: 032f676450ba0779bd8ce16840690915f84e57ac
   hermes-engine: 10fbd3f62405c41ea07e71973ea61e1878d07322
-  Instabug: f582dcf7a4099acca604fa7ffa3bf4eda295317f
+  Instabug: 12ea6990039094c48a7c7e8103ba8679c0833f5e
   instabug-reactnative-ndk: 960119a69380cf4cbe47ccd007c453f757927d17
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   OCMock: 589f2c84dacb1f5aaf6e4cec1f292551fe748e74
@@ -758,6 +758,6 @@ SPEC CHECKSUMS:
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
   Yoga: 8796b55dba14d7004f980b54bcc9833ee45b28ce
 
-PODFILE CHECKSUM: afd54e1cb156d7b63f6e1beca2ba1f66fa30be0f
+PODFILE CHECKSUM: c4e288aeafe746a77427798d0e33069c948e4b76
 
 COCOAPODS: 1.15.2

examples/default/ios/Podfile.lock

@@ -5,7 +5,7 @@ import { Screen } from '../../components/Screen';
 import { ClipboardTextInput } from '../../components/ClipboardTextInput';
 import { useQuery } from 'react-query';
 import { HStack, VStack } from 'native-base';
-import { gql, request } from 'graphql-request';
+import { gql, GraphQLClient } from 'graphql-request';
 import { CustomButton } from '../../components/CustomButton';
 import axios from 'axios';
 import type { HomeStackParamList } from '../../navigation/HomeStack';
@@ -101,6 +101,12 @@ export const NetworkScreen: React.FC<
   }
 
   const fetchGraphQlData = async () => {
+    const client = new GraphQLClient('https://countries.trevorblades.com/graphql', {
+      headers: {
+        'ibg-graphql-header': 'AndrewQL', // change Query Name here
+      },
+    });
+
     const document = gql`
       query {
         country(code: "EG") {
@@ -110,10 +116,7 @@ export const NetworkScreen: React.FC<
       }
     `;
 
-    return request<{ country: { emoji: string; name: string } }>(
-      'https://countries.trevorblades.com/graphql',
-      document,
-    );
+    return client.request<{ country: { emoji: string; name: string } }>(document);
   };
 
   const { data, isError, isSuccess, isLoading, refetch } = useQuery('helloQuery', fetchGraphQlData);
@@ -127,7 +130,6 @@ export const NetworkScreen: React.FC<
   }
 
   async function makeSequentialApiCalls(urls: string[]): Promise<any[]> {
-    // const fetchPromises = urls.map((url) => fetch(url).then((response) => response.json()));
     const results: any[] = [];
 
     try {
@@ -182,7 +184,7 @@ export const NetworkScreen: React.FC<
               title="Send Sequantail Requests"
             />
 
-            <CustomButton onPress={() => refetch} title="Reload GraphQL" />
+            <CustomButton onPress={() => refetch()} title="Reload GraphQL" />
             <View>
               {isLoading && <Text>Loading...</Text>}
               {isSuccess && <Text>GraphQL Data: {data.country.emoji}</Text>}

examples/default/src/screens/apm/NetworkScreen.tsx

@@ -31,4 +31,8 @@ typedef NS_ENUM(NSInteger, NetworkListenerType) {
 - (void) updateNetworkLogSnapshot: (NSString * _Nonnull)jsonString;
 
 - (void) setNetworkLoggingRequestFilterPredicateIOS:(NSString * _Nonnull) callbackID : (BOOL)value;
+
+- (void)forceStartNetworkLoggingIOS;
+
+- (void)forceStopNetworkLoggingIOS;
 @end

ios/RNInstabug/InstabugNetworkLoggerBridge.h

@@ -212,4 +212,14 @@ - (NSDictionary *)createNetworkRequestDictForRequest:(NSURLRequest *)request cal
     };
 }
 
+RCT_EXPORT_METHOD(forceStartNetworkLoggingIOS) {
+    [IBGNetworkLogger forceStartNetworkLogging];
+}
+
+RCT_EXPORT_METHOD(forceStopNetworkLoggingIOS) {
+    [IBGNetworkLogger forceStopNetworkLogging];
+}
+
+
+
 @end

ios/RNInstabug/InstabugNetworkLoggerBridge.m

@@ -30,6 +30,8 @@ NS_ASSUME_NONNULL_BEGIN
                    timestamp:(NSNumber * _Nullable)timestamp
      generatedW3CTraceparent:(NSString * _Nullable)generatedW3CTraceparent
       caughtedW3CTraceparent:(NSString * _Nullable)caughtedW3CTraceparent;
++ (void)forceStartNetworkLogging;
++ (void)forceStopNetworkLogging;
 
 + (void)setCPRequestAsyncObfuscationHandler:(void (^)(NSURLRequest * requestToBeObfuscated, void (^ completion)(NSURLRequest * obfuscatedRequest)))asyncObfuscationHandler;
 + (void)setCPRequestFilteringHandler:(void (^)(NSURLRequest * request, void (^completion)(BOOL keep)))requestFilteringHandler;

ios/RNInstabug/Util/IBGNetworkLogger+CP.h

@@ -73,13 +73,22 @@ function reportCurrentViewForAndroid(screenName: string | null) {
 }
 
 function _logFlags() {
-  console.log(
-    `Andrew: init -> {
+  if (Platform.OS === 'android') {
+    console.log(
+      `Andrew: APM Flags -> {
      isNativeInterceptionFeatureEnabled: ${isNativeInterceptionFeatureEnabled},
      hasAPMNetworkPlugin: ${hasAPMNetworkPlugin},
      shouldEnableNativeInterception: ${shouldEnableNativeInterception}
     }`,
-  );
+    );
+  } else {
+    console.log(
+      `Andrew: APM Flags -> {
+     isNativeInterceptionFeatureEnabled: ${isNativeInterceptionFeatureEnabled},
+     shouldEnableNativeInterception: ${shouldEnableNativeInterception}
+    }`,
+    );
+  }
 }
 
 /**
@@ -101,19 +110,19 @@ export const init = async (config: InstabugConfig) => {
   // Add app state listener to handle background/foreground transitions
   addAppStateListener(async (nextAppState) => handleAppStateChange(nextAppState, config));
 
+  // Perform platform-specific checks and update interception mode
+  handleNetworkInterceptionMode(config);
+
+  // Log the current APM network flags and initialize Instabug
+  _logFlags();
+
   //Set APM networking flags for the first time
   setApmNetworkFlagsIfChanged({
     isNativeInterceptionFeatureEnabled: isNativeInterceptionFeatureEnabled,
     hasAPMNetworkPlugin: hasAPMNetworkPlugin,
     shouldEnableNativeInterception: shouldEnableNativeInterception,
   });
 
-  // Perform platform-specific checks and update interception mode
-  handleNetworkInterceptionMode(config);
-
-  // Log the current APM network flags and initialize Instabug
-  _logFlags();
-
   // call Instabug native init method
   initializeNativeInstabug(config);
 
@@ -140,16 +149,20 @@ const handleAppStateChange = async (nextAppState: AppStateStatus, config: Instab
   // Checks if  the app has come to the foreground
   if (['inactive', 'background'].includes(_currentAppState) && nextAppState === 'active') {
     // Update the APM network flags
-    const updatedFlags = await fetchApmNetworkFlags();
-    const isUpdated = setApmNetworkFlagsIfChanged(updatedFlags);
+    const isUpdated = await fetchApmNetworkFlags();
 
     if (isUpdated) {
+      console.log('Andrew: App has come to the foreground!');
       console.log('Andrew: APM network flags updated.');
       handleNetworkInterceptionMode(config);
-      initializeNativeInstabug(config);
+      handleIOSNativeInterception(config);
+      _logFlags();
+      setApmNetworkFlagsIfChanged({
+        isNativeInterceptionFeatureEnabled,
+        hasAPMNetworkPlugin,
+        shouldEnableNativeInterception,
+      });
     }
-    _logFlags();
-    console.log('Andrew: App has come to the foreground!');
   }
 
   _currentAppState = nextAppState;
@@ -160,16 +173,25 @@ const handleAppStateChange = async (nextAppState: AppStateStatus, config: Instab
  * Fetches the current APM network flags.
  */
 const fetchApmNetworkFlags = async () => {
-  isNativeInterceptionFeatureEnabled = await NativeNetworkLogger.isNativeInterceptionEnabled();
+  let isUpdated = false;
+  const newNativeInterceptionFeatureEnabled =
+    await NativeNetworkLogger.isNativeInterceptionEnabled();
+  if (isNativeInterceptionFeatureEnabled !== newNativeInterceptionFeatureEnabled) {
+    isNativeInterceptionFeatureEnabled = newNativeInterceptionFeatureEnabled;
+    isUpdated = true;
+  }
   if (Platform.OS === 'android') {
-    hasAPMNetworkPlugin = await NativeNetworkLogger.hasAPMNetworkPlugin();
+    const newHasAPMNetworkPlugin = await NativeNetworkLogger.hasAPMNetworkPlugin();
+    if (hasAPMNetworkPlugin !== newHasAPMNetworkPlugin) {
+      hasAPMNetworkPlugin = newHasAPMNetworkPlugin;
+      isUpdated = true;
+    }
   }
 
-  return {
-    isNativeInterceptionFeatureEnabled,
-    hasAPMNetworkPlugin,
-    shouldEnableNativeInterception,
-  };
+  console.log(
+    `Andrew: fetchApmNetworkFlags {isNativeInterceptionFeatureEnabled: ${isNativeInterceptionFeatureEnabled}, hasAPMNetworkPlugin: ${hasAPMNetworkPlugin}}`,
+  );
+  return isUpdated;
 };
 
 /**
@@ -195,7 +217,8 @@ const handleNetworkInterceptionMode = (config: InstabugConfig) => {
 };
 
 /**
- * Handles the JS interception logic for Android.
+ * Handles the network interception logic for Android if the user set
+ * network interception mode with [NetworkInterceptionMode.javascript].
  */
 function handleAndroidJSInterception() {
   if (isNativeInterceptionFeatureEnabled && hasAPMNetworkPlugin) {
@@ -207,7 +230,8 @@ function handleAndroidJSInterception() {
 }
 
 /**
- * Handles the native interception logic for Android.
+ * Handles the network interception logic for Android if the user set
+ * network interception mode with [NetworkInterceptionMode.native].
  */
 function handleAndroidNativeInterception() {
   if (isNativeInterceptionFeatureEnabled) {
@@ -231,7 +255,30 @@ function handleAndroidNativeInterception() {
 }
 
 /**
- * Handles the interception mode logic for Android.
+ * Control either to enable or disable the native interception logic for iOS.
+ */
+function handleIOSNativeInterception(config: InstabugConfig) {
+  if (Platform.OS === 'ios') {
+    console.log(
+      `Andrew: handleIOSNativeInterception(${
+        shouldEnableNativeInterception &&
+        config.networkInterceptionMode === NetworkInterceptionMode.native
+      })`,
+    );
+
+    if (
+      shouldEnableNativeInterception &&
+      config.networkInterceptionMode === NetworkInterceptionMode.native
+    ) {
+      NativeNetworkLogger.forceStartNetworkLoggingIOS(); // Enable native iOS automatic network logging.
+    } else {
+      NativeNetworkLogger.forceStopNetworkLoggingIOS(); // Disable native iOS automatic network logging.
+    }
+  }
+}
+
+/**
+ * Handles the network interception mode logic for Android.
  * By deciding which interception mode should be enabled (Native or JavaScript).
  */
 const handleInterceptionModeForAndroid = (config: InstabugConfig) => {

src/modules/Instabug.ts

@@ -10,15 +10,17 @@ export enum NetworkListenerType {
 export interface NetworkLoggerNativeModule extends NativeModule {
   isNativeInterceptionEnabled(): Promise<boolean>;
 
-  isAPMNetworkEnabled(): Promise<boolean>; // Android only
-
-  hasAPMNetworkPlugin(): Promise<boolean>; // Android only
-
   registerNetworkLogsListener(type: NetworkListenerType): void;
 
   updateNetworkLogSnapshot(networkData: string): void;
 
+  hasAPMNetworkPlugin(): Promise<boolean>; // Android only
+
   setNetworkLoggingRequestFilterPredicateIOS(id: string, value: boolean): void; // iOS only
+
+  forceStartNetworkLoggingIOS(): void; // iOS only;
+
+  forceStopNetworkLoggingIOS(): void; // iOS only;
 }
 
 export const NativeNetworkLogger = NativeModules.IBGNetworkLogger;