rebase: network-spans branch with dev branch

Author: andrewdanieldev

examples/default/ios/Podfile.lock

@@ -1768,6 +1768,7 @@ DEPENDENCIES:
   - fmt (from `../node_modules/react-native/third-party-podspecs/fmt.podspec`)
   - 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-base/14.1.0/Instabug.podspec`)
   - instabug-reactnative-ndk (from `../node_modules/instabug-reactnative-ndk`)
   - OCMock
   - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
@@ -1847,7 +1848,6 @@ SPEC REPOS:
   trunk:
     - Google-Maps-iOS-Utils
     - GoogleMaps
-    - Instabug
     - OCMock
     - SocketRocket
 
@@ -1865,6 +1865,8 @@ EXTERNAL SOURCES:
   hermes-engine:
     :podspec: "../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec"
     :tag: hermes-2024-08-15-RNv0.75.1-4b3bf912cc0f705b51b71ce1a5b8bd79b93a451b
+  Instabug:
+    :podspec: https://ios-releases.instabug.com/custom/feature-support_cp_network_filtering_obfuscation-base/14.1.0/Instabug.podspec
   instabug-reactnative-ndk:
     :path: "../node_modules/instabug-reactnative-ndk"
   RCT-Folly:
@@ -2017,7 +2019,7 @@ SPEC CHECKSUMS:
   Google-Maps-iOS-Utils: f77eab4c4326d7e6a277f8e23a0232402731913a
   GoogleMaps: 032f676450ba0779bd8ce16840690915f84e57ac
   hermes-engine: ea92f60f37dba025e293cbe4b4a548fd26b610a0
-  Instabug: 8cbca8974168c815658133e2813f5ac3a36f8e20
+  Instabug: afe23192d5487aa2afd4f3baa76913cc2c421cda
   instabug-reactnative-ndk: d765ac289d56e8896398d02760d9abf2562fc641
   OCMock: 589f2c84dacb1f5aaf6e4cec1f292551fe748e74
   RCT-Folly: 4464f4d875961fce86008d45f4ecf6cef6de0740
@@ -2090,8 +2092,8 @@ SPEC CHECKSUMS:
   RNSVG: 8b1a777d54096b8c2a0fd38fc9d5a454332bbb4d
   RNVectorIcons: 6382277afab3c54658e9d555ee0faa7a37827136
   SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d
-  Yoga: 055f92ad73f8c8600a93f0e25ac0b2344c3b07e6
+  Yoga: aa3df615739504eebb91925fc9c58b4922ea9a08
 
-PODFILE CHECKSUM: 63bf073bef3872df95ea45e7c9c023a331ebb3c3
+PODFILE CHECKSUM: f382faa8fee81f859a17db3fbe928b4f7e7f2ea0
 
-COCOAPODS: 1.14.0
+COCOAPODS: 1.15.2

examples/default/src/App.tsx

@@ -2,18 +2,18 @@ import React, { useEffect, useState } from 'react';
 import { ActivityIndicator, StyleSheet } from 'react-native';
 
 import { GestureHandlerRootView } from 'react-native-gesture-handler';
-import { NavigationContainer, useNavigationContainerRef } from "@react-navigation/native";
+import { NavigationContainer, useNavigationContainerRef } from '@react-navigation/native';
+import type { SessionMetadata } from 'instabug-reactnative';
 import Instabug, {
   CrashReporting,
   InvocationEvent,
+  LaunchType,
   LogLevel,
   NetworkInterceptionMode,
   NetworkLogger,
   ReproStepsMode,
   SessionReplay,
-  LaunchType,
 } from 'instabug-reactnative';
-import type { SessionMetadata } from 'instabug-reactnative';
 import { NativeBaseProvider } from 'native-base';
 
 import { RootTabNavigator } from './navigation/RootTab';
@@ -71,7 +71,7 @@ export const App: React.FC = () => {
       });
       // NetworkLogger.setRequestFilterExpression('false');
     });
-  }, []);
+  });
 
   useEffect(() => {
     const unregisterListener = Instabug.setNavigationListener(navigationRef);

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

@@ -10,7 +10,6 @@ import { CustomButton } from '../../components/CustomButton';
 import axios from 'axios';
 import type { HomeStackParamList } from '../../navigation/HomeStack';
 import type { NativeStackScreenProps } from '@react-navigation/native-stack';
-import { ListTile } from '../../components/ListTile';
 
 export const NetworkScreen: React.FC<
   NativeStackScreenProps<HomeStackParamList, 'NetworkTraces'>
@@ -198,11 +197,11 @@ export const NetworkScreen: React.FC<
               title="Go HTTP Screen"
             />
 
-            <ListTile
+            <CustomButton
               title="Simulate Network Request With Header"
               onPress={() => simulateNetworkRequest()}
             />
-            <ListTile
+            <CustomButton
               title="Simulate Network Request"
               onPress={() => simulateNetworkRequestWithoutHeader()}
             />

test/modules/Instabug.spec.ts

@@ -3,14 +3,13 @@ import '../mocks/mockNetworkLogger';
 
 import { findNodeHandle, Platform, processColor } from 'react-native';
 import type { NavigationContainerRefWithCurrent } from '@react-navigation/native'; // Import the hook
-
 import { mocked } from 'jest-mock';
 import waitForExpect from 'wait-for-expect';
 
 import Report from '../../src/models/Report';
 import * as Instabug from '../../src/modules/Instabug';
 import * as NetworkLogger from '../../src/modules/NetworkLogger';
-import { NativeEvents, NativeInstabug, emitter } from '../../src/native/NativeInstabug';
+import { emitter, NativeEvents, NativeInstabug } from '../../src/native/NativeInstabug';
 import {
   ColorTheme,
   type InstabugConfig,
@@ -24,7 +23,6 @@ import {
 } from '../../src';
 import InstabugUtils from '../../src/utils/InstabugUtils';
 import type { FeatureFlag } from '../../src/models/FeatureFlag';
-import InstabugConstants from '../../src/utils/InstabugConstants';
 import { Logger } from '../../src/utils/logger';
 import { NativeNetworkLogger } from '../../src/native/NativeNetworkLogger';
 import InstabugConstants from '../../src/utils/InstabugConstants';

test/modules/NetworkLogger.spec.ts

@@ -399,6 +399,11 @@ describe('_registerNetworkLogsListener', () => {
       startTime: 0,
       serverErrorMessage: '',
       requestContentType: '',
+      isW3cHeaderFound: true,
+      networkStartTimeInSeconds: 0,
+      partialId: 0,
+      w3cCaughtHeader: '',
+      w3cGeneratedHeader: '',
     };
 
     expect(handlerMock).toHaveBeenCalledWith(expectedNetworkData);

test/utils/InstabugUtils.spec.ts

@@ -389,6 +389,11 @@ describe('test registerNetworkLogsListener usage', () => {
     startTime: 0,
     serverErrorMessage: '',
     requestContentType: 'application/json',
+    isW3cHeaderFound: true,
+    networkStartTimeInSeconds: 0,
+    partialId: 0,
+    w3cCaughtHeader: '',
+    w3cGeneratedHeader: '',
   };
 
   it('registerObfuscationListener should call NetworkLogger.registerNetworkLogsListener() with  NetworkListenerType = NetworkListenerType.obfuscation', () => {