Merge remote-tracking branch 'origin/dev' into feat/dev-into-network-spans

Author: AndrewAminInstabug

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

@@ -43,7 +43,7 @@ public String getName() {
     }
 
     /**
-     * Sets the printed logs priority. Filter to one of the following levels.
+     * Pauses the current thread for 3 seconds.
      */
     @ReactMethod
     public void ibgSleep() {
@@ -57,6 +57,7 @@ public void run() {
 
     /**
      * Enables or disables APM.
+     *
      * @param isEnabled boolean indicating enabled or disabled.
      */
     @ReactMethod
@@ -75,6 +76,7 @@ public void run() {
 
     /**
      * Enables or disables app launch tracking.
+     *
      * @param isEnabled boolean indicating enabled or disabled.
      */
     @ReactMethod
@@ -92,7 +94,7 @@ public void run() {
     }
 
     /**
-     * Ends app launch
+     * This method is used to signal the end of the app launch process.
      */
     @ReactMethod
     public void endAppLaunch() {
@@ -110,6 +112,7 @@ public void run() {
 
     /**
      * Enables or disables auto UI tracing
+     *
      * @param isEnabled boolean indicating enabled or disabled.
      */
     @ReactMethod
@@ -281,6 +284,7 @@ public void run() {
 
     /**
      * Starts a UI trace
+     *
      * @param name string name of the UI trace.
      */
     @ReactMethod
@@ -298,7 +302,7 @@ public void run() {
     }
 
     /**
-     * Ends the current running UI trace
+     * This method is used to terminate the currently active UI trace.
      */
     @ReactMethod
     public void endUITrace() {
@@ -314,6 +318,73 @@ public void run() {
         });
     }
 
+ /**
+  * The `networkLogAndroid` function logs network-related information using APMNetworkLogger in a React
+  * Native module.
+  *
+  * @param requestStartTime The `requestStartTime` parameter in the `networkLogAndroid` method
+  * represents the timestamp when the network request started. It is of type `double` and is passed as
+  * a parameter to log network-related information.
+  * @param requestDuration The `requestDuration` parameter in the `networkLogAndroid` method represents
+  * the duration of the network request in milliseconds. It indicates the time taken for the request to
+  * complete from the moment it was initiated until the response was received. This parameter helps in
+  * measuring the performance of network requests and identifying any potential
+  * @param requestHeaders requestHeaders is a string parameter that contains the headers of the network
+  * request. It typically includes information such as the content type, authorization token, and any
+  * other headers that were sent with the request.
+  * @param requestBody The `requestBody` parameter in the `networkLogAndroid` method represents the
+  * body of the HTTP request being logged. It contains the data that is sent as part of the request to
+  * the server. This could include form data, JSON payload, XML data, or any other content that is
+  * being transmitted
+  * @param requestBodySize The `requestBodySize` parameter in the `networkLogAndroid` method represents
+  * the size of the request body in bytes. It is a double value that indicates the size of the request
+  * body being sent in the network request. This parameter is used to log information related to the
+  * network request, including details
+  * @param requestMethod The `requestMethod` parameter in the `networkLogAndroid` method represents the
+  * HTTP method used in the network request, such as GET, POST, PUT, DELETE, etc. It indicates the type
+  * of operation that the client is requesting from the server.
+  * @param requestUrl The `requestUrl` parameter in the `networkLogAndroid` method represents the URL
+  * of the network request being logged. It typically contains the address of the server to which the
+  * request is being made, along with any additional path or query parameters required for the request.
+  * This URL is essential for identifying the
+  * @param requestContentType The `requestContentType` parameter in the `networkLogAndroid` method
+  * represents the content type of the request being made. This could be values like
+  * "application/json", "application/xml", "text/plain", etc., indicating the format of the data being
+  * sent in the request body. It helps in specifying
+  * @param responseHeaders The `responseHeaders` parameter in the `networkLogAndroid` method represents
+  * the headers of the response received from a network request. These headers typically include
+  * information such as content type, content length, server information, and any other metadata
+  * related to the response. The `responseHeaders` parameter is expected to
+  * @param responseBody The `responseBody` parameter in the `networkLogAndroid` method represents the
+  * body of the response received from a network request. It contains the data or content sent back by
+  * the server in response to the request made by the client. This could be in various formats such as
+  * JSON, XML, HTML
+  * @param responseBodySize The `responseBodySize` parameter in the `networkLogAndroid` method
+  * represents the size of the response body in bytes. It is a double value that indicates the size of
+  * the response body received from the network request. This parameter is used to log information
+  * related to the network request and response, including
+  * @param statusCode The `statusCode` parameter in the `networkLogAndroid` method represents the HTTP
+  * status code of the network request/response. It indicates the status of the HTTP response, such as
+  * success (200), redirection (3xx), client errors (4xx), or server errors (5xx). This parameter is
+  * @param responseContentType The `responseContentType` parameter in the `networkLogAndroid` method
+  * represents the content type of the response received from the network request. It indicates the
+  * format of the data in the response, such as JSON, XML, HTML, etc. This information is useful for
+  * understanding how to parse and handle the
+  * @param errorDomain The `errorDomain` parameter in the `networkLogAndroid` method is used to specify
+  * the domain of an error, if any occurred during the network request. If there was no error, this
+  * parameter will be `null`.
+  * @param w3cAttributes The `w3cAttributes` parameter in the `networkLogAndroid` method is a
+  * ReadableMap object that contains additional attributes related to W3C external trace. It may
+  * include the following key-value pairs:
+  * @param gqlQueryName The `gqlQueryName` parameter in the `networkLogAndroid` method represents the
+  * name of the GraphQL query being executed. It is a nullable parameter, meaning it can be null if no
+  * GraphQL query name is provided. This parameter is used to log information related to GraphQL
+  * queries in the network logging
+  * @param serverErrorMessage The `serverErrorMessage` parameter in the `networkLogAndroid` method is
+  * used to pass any error message received from the server during network communication. This message
+  * can provide additional details about any errors that occurred on the server side, helping in
+  * debugging and troubleshooting network-related issues.
+  */
     @ReactMethod
     private void networkLogAndroid(final double requestStartTime,
                                    final double requestDuration,

examples/default/ios/Podfile.lock

@@ -1319,7 +1319,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-webview (13.12.3):
+  - react-native-webview (13.13.2):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -2057,7 +2057,7 @@ SPEC CHECKSUMS:
   react-native-maps: 72a8a903f8a1b53e2c777ba79102078ab502e0bf
   react-native-safe-area-context: 142fade490cbebbe428640b8cbdb09daf17e8191
   react-native-slider: 4a0f3386a38fc3d2d955efc515aef7096f7d1ee4
-  react-native-webview: 926d2665cf3196e39c4449a72d136d0a53b9df8a
+  react-native-webview: c0b91a4598bd54e9fbc70353aebf1e9bab2e5bb9
   React-nativeconfig: 8c83d992b9cc7d75b5abe262069eaeea4349f794
   React-NativeModulesApple: 9f7920224a3b0c7d04d77990067ded14cee3c614
   React-perflogger: 59e1a3182dca2cee7b9f1f7aab204018d46d1914

examples/default/package.json

@@ -32,7 +32,7 @@
     "react-native-screens": "^3.35.0",
     "react-native-svg": "^15.8.0",
     "react-native-vector-icons": "^10.2.0",
-    "react-native-webview": "^13.12.3",
+    "react-native-webview": "^13.13.2",
     "react-query": "^3.39.3"
   },
   "devDependencies": {

examples/default/src/components/CustomGap.tsx

@@ -0,0 +1,33 @@
+import React from 'react';
+import { type DimensionValue, View } from 'react-native';
+
+// Define the component type with static properties
+interface CustomGapComponent extends React.FC<{ height?: DimensionValue; width?: DimensionValue }> {
+  small: JSX.Element;
+  smallV: JSX.Element;
+  smallH: JSX.Element;
+  large: JSX.Element;
+  largeV: JSX.Element;
+  largeH: JSX.Element;
+}
+
+const defaultDimensionValue = 16;
+
+// Define the CustomGap component
+const CustomGap: CustomGapComponent = ({ height, width }) => {
+  return (
+    <View
+      style={{ width: width ?? defaultDimensionValue, height: height ?? defaultDimensionValue }}
+    />
+  );
+};
+
+// Assign static properties for predefined gaps
+CustomGap.small = <CustomGap height={8} width={8} />;
+CustomGap.large = <CustomGap height={32} width={32} />;
+CustomGap.smallV = <CustomGap height={8} />;
+CustomGap.largeV = <CustomGap height={32} />;
+CustomGap.smallH = <CustomGap width={8} />;
+CustomGap.largeH = <CustomGap width={32} />;
+
+export default CustomGap;

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

@@ -3,9 +3,10 @@ import type { HomeStackParamList } from '../../navigation/HomeStack';
 import React, { useState } from 'react';
 import { ListTile } from '../../components/ListTile';
 import { Screen } from '../../components/Screen';
-import { Text, Switch } from 'react-native';
+import { StyleSheet, Switch, Text, View } from 'react-native';
 import { APM } from 'instabug-reactnative';
 import { showNotification } from '../../utils/showNotification';
+import CustomGap from '../../components/CustomGap';
 
 export const APMScreen: React.FC<NativeStackScreenProps<HomeStackParamList, 'APM'>> = ({
   navigation,
@@ -17,16 +18,26 @@ export const APMScreen: React.FC<NativeStackScreenProps<HomeStackParamList, 'APM
     APM.setEnabled(value);
     showNotification('APM status', 'APM enabled set to ' + value);
   };
+  const styles = StyleSheet.create({
+    switch: {
+      flexDirection: 'row',
+      justifyContent: 'space-between',
+    },
+  });
 
   return (
     <Screen>
-      <Text>Enable APM:</Text>
-      <Switch onValueChange={toggleSwitch} value={isEnabled} />
+      <View style={styles.switch}>
+        <Text>Enable APM:</Text>
+        <Switch onValueChange={toggleSwitch} value={isEnabled} />
+      </View>
+      {CustomGap.smallV}
       <ListTile title="End App launch" onPress={() => APM.endAppLaunch()} />
       <ListTile title="Network Screen" onPress={() => navigation.navigate('NetworkTraces')} />
       <ListTile title="Traces" onPress={() => navigation.navigate('ExecutionTraces')} />
       <ListTile title="Flows" onPress={() => navigation.navigate('AppFlows')} />
       <ListTile title="WebViews" onPress={() => navigation.navigate('WebViews')} />
+      <ListTile title="Complex Views" onPress={() => navigation.navigate('ComplexViews')} />
     </Screen>
   );
 };

examples/default/yarn.lock

@@ -6329,10 +6329,10 @@ react-native-vector-icons@^10.2.0:
     prop-types "^15.7.2"
     yargs "^16.1.1"
 
-react-native-webview@^13.12.3:
-  version "13.12.3"
-  resolved "https://registry.yarnpkg.com/react-native-webview/-/react-native-webview-13.12.3.tgz#3aa9d2fc982ba2681e56d3e96e22b63a0d929270"
-  integrity sha512-Y1I5YyDYyE7NC96RHLhd2nxh7ymLYOYLTefgx5ixxw2OToQK0ow3OJ+o77QcI1Tuevj5PCxwqC/14ceS/7yPJQ==
+react-native-webview@^13.13.2:
+  version "13.13.2"
+  resolved "https://registry.yarnpkg.com/react-native-webview/-/react-native-webview-13.13.2.tgz#6d72fd8492f11accbcf3be4d1386fa961e424357"
+  integrity sha512-zACPDTF0WnaEnKZ9mA/r/UpcOpV2gQM06AAIrOOexnO8UJvXL8Pjso0b/wTqKFxUZZnmjKuwd8gHVUosVOdVrw==
   dependencies:
     escape-string-regexp "^4.0.0"
     invariant "2.2.4"

ios/RNInstabug/InstabugAPMBridge.m

@@ -36,33 +36,34 @@ - (id) init
     return self;
 }
 
+// Pauses the current thread for 3 seconds.
 RCT_EXPORT_METHOD(ibgSleep) {
     [NSThread sleepForTimeInterval:3.0f];
-    // for (int i = 1; i <= 1000000; i++)
-    // {
-    //     double value = sqrt(i);
-
-    //     printf("%@", [NSNumber numberWithDouble:value]);
-    // }
-    // [NSThread sleepForTimeInterval:3.0f];
 }
 
+// Enables or disables APM.
 RCT_EXPORT_METHOD(setEnabled:(BOOL)isEnabled) {
     IBGAPM.enabled = isEnabled;
 }
 
+// Determines either coldAppLaunch is enabled or not.
 RCT_EXPORT_METHOD(setAppLaunchEnabled:(BOOL)isEnabled) {
     IBGAPM.coldAppLaunchEnabled = isEnabled;
 }
 
+// This method is used to signal the end of the app launch process.
 RCT_EXPORT_METHOD(endAppLaunch) {
     [IBGAPM endAppLaunch];
 }
 
+// Controls whether automatic tracing of UI interactions is enabled or disabled within the SDK.
 RCT_EXPORT_METHOD(setAutoUITraceEnabled:(BOOL)isEnabled) {
     IBGAPM.autoUITraceEnabled = isEnabled;
 }
 
+// Starts new execution trace with the specified `name`.
+//
+// Deprecated see [startFlow: (NSString *)name]
 RCT_EXPORT_METHOD(startExecutionTrace:(NSString *)name :(NSString *)id
                                      :(RCTPromiseResolveBlock)resolve
                                      :(RCTPromiseRejectBlock)reject) {
@@ -75,37 +76,50 @@ - (id) init
     }
 }
 
+//  Sets a user defined attribute for the execution trace.
+//
+// Deprecated see [setFlowAttribute:(NSString *)name :(NSString *)key :(NSString *_Nullable)value]
 RCT_EXPORT_METHOD(setExecutionTraceAttribute:(NSString *)id :(NSString *)key :(NSString *)value) {
     IBGExecutionTrace *trace = [traces objectForKey:id];
     if (trace != nil) {
         [trace setAttributeWithKey:key value:value];
     }
 }
 
+// Ends execution trace with the specified `name`.
+//
+// Deprecated see [endFlow: (NSString *)name]
 RCT_EXPORT_METHOD(endExecutionTrace:(NSString *)id) {
     IBGExecutionTrace *trace = [traces objectForKey:id];
     if (trace != nil) {
         [trace end];
     }
 }
 
+// Starts a flow trace with the specified `name`,
+// allowing the SDK to capture and analyze the flow of execution within the application.
 RCT_EXPORT_METHOD(startFlow: (NSString *)name) {
     [IBGAPM startFlowWithName:name];
 }
 
+// Ends a flow with the specified `name`.
 RCT_EXPORT_METHOD(endFlow: (NSString *)name) {
     [IBGAPM endFlowWithName:name];
 }
 
 
+// Sets a user defined attribute for the currently active flow.
 RCT_EXPORT_METHOD(setFlowAttribute:(NSString *)name :(NSString *)key :(NSString *_Nullable)value) {
     [IBGAPM setAttributeForFlowWithName:name key:key value:value];
 }
 
+// Starts a new `UITrace` with the provided `name` parameter,
+// allowing the SDK to capture and analyze the UI components within the application.
 RCT_EXPORT_METHOD(startUITrace:(NSString *)name) {
     [IBGAPM startUITraceWithName:name];
 }
 
+// Terminates the currently active UI trace.
 RCT_EXPORT_METHOD(endUITrace) {
     [IBGAPM endUITrace];
 }

src/modules/APM.ts

@@ -13,23 +13,26 @@ export const setEnabled = (isEnabled: boolean) => {
 };
 
 /**
- * Enables or disables APM App Launch
+ * If APM is enabled, Instabug SDK starts collecting data about the app launch time by default.
+ * This API is used to give user more control over this behavior.
  * @param isEnabled
  */
 export const setAppLaunchEnabled = (isEnabled: boolean) => {
   NativeAPM.setAppLaunchEnabled(isEnabled);
 };
 
 /**
- * Ends app launch
+ * To define when an app launch is complete,
+ * such as when it's intractable, use the end app launch API.
+ * You can then view this data with the automatic cold app launch.
  */
 export const endAppLaunch = () => {
   NativeAPM.endAppLaunch();
 };
 
 /**
  * Enables or disables APM Network Metric
- * @param isEnabled
+ * @param isEnabled - a boolean indicates either iOS monitoring is enabled or disabled.
  */
 export const setNetworkEnabledIOS = (isEnabled: boolean) => {
   if (Platform.OS === 'ios') {
@@ -114,15 +117,17 @@ export const setFlowAttribute = (name: string, key: string, value?: string | nul
 };
 
 /**
- * Starts a custom trace
- * @param name
+ * Initiates a UI trace with the specified name using a native module.
+ * @param {string} name - The `name` parameter in the `startUITrace` function is a string that
+ * represents the name of the UI trace that you want to start. This name is used to identify and track
+ * the specific UI trace within the application.
  */
 export const startUITrace = (name: string) => {
   NativeAPM.startUITrace(name);
 };
 
 /**
- * Ends a custom trace
+ * Ends the currently running custom trace.
  */
 export const endUITrace = () => {
   NativeAPM.endUITrace();