chore: remove APMNetworkEnabled flag from android

AndrewAminInstabug · AndrewAminInstabug · commit f248be7f79fe · 2024-10-14T15:43:55.000+03:00
diff --git a/android/src/main/java/com/instabug/reactlibrary/RNInstabugNetworkLoggerModule.java b/android/src/main/java/com/instabug/reactlibrary/RNInstabugNetworkLoggerModule.java
@@ -7,23 +7,12 @@
 
 import androidx.annotation.NonNull;
 
-//import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactMethod;
-//import com.facebook.react.bridge.WritableMap;
-//import com.instabug.apm.InternalAPM;
-//import com.instabug.apm.sanitization.OnCompleteCallback;
-//import com.instabug.apm.sanitization.VoidSanitizer;
-//import com.instabug.library.logging.listeners.networklogs.NetworkLogSnapshot;
 import com.instabug.apm.InternalAPM;
 import com.instabug.reactlibrary.utils.EventEmitterModule;
 import com.instabug.reactlibrary.utils.MainThreadHandler;
-//
-//import org.json.JSONException;
-//import org.json.JSONObject;
-//
-//import java.util.concurrent.ConcurrentHashMap;
 
 
 public class RNInstabugNetworkLoggerModule extends EventEmitterModule {
@@ -32,8 +21,6 @@ public RNInstabugNetworkLoggerModule(ReactApplicationContext reactContext) {
         super(reactContext);
     }
 
-//    private final ConcurrentHashMap<Integer, OnCompleteCallback<NetworkLogSnapshot>> callbackMap = new ConcurrentHashMap<Integer, OnCompleteCallback<NetworkLogSnapshot>>();
-
     @NonNull
     @Override
     public String getName() {
@@ -67,7 +54,7 @@ public void run() {
                     promise.resolve(getFlagValue(CP_NATIVE_INTERCEPTION_ENABLED));
                 } catch (Exception e) {
                     e.printStackTrace();
-                    promise.resolve(false);
+                    promise.resolve(false); // Will rollback to JS interceptor
                 }
 
             }
@@ -88,83 +75,10 @@ public void run() {
                     promise.resolve(getFlagValue(APM_NETWORK_PLUGIN_INSTALLED));
                 } catch (Exception e) {
                     e.printStackTrace();
-                    promise.resolve(false);
-                }
-
-            }
-        });
-    }
-
-    /**
-     * Indicate APM is enabled & Network logging is enabled
-     * [true] ApmEnabled && NetworkEnabled
-     * [false] otherwise
-     */
-    @ReactMethod
-    public void isAPMNetworkEnabled(Promise promise) {
-        MainThreadHandler.runOnMainThread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    promise.resolve(getFlagValue(NETWORK_INTERCEPTION_ENABLED));
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    promise.resolve(false);
+                    promise.resolve(false);  // Will rollback to JS interceptor
                 }
 
             }
         });
     }
-
-
-//    @ReactMethod
-//    public void registerNetworkLogsListener() {
-//        MainThreadHandler.runOnMainThread(new Runnable() {
-//            @Override
-//            public void run() {
-//                InternalAPM._registerNetworkLogSanitizer(new VoidSanitizer<NetworkLogSnapshot>() {
-//                    @Override
-//                    public void sanitize(NetworkLogSnapshot networkLogSnapshot, @NonNull OnCompleteCallback<NetworkLogSnapshot> onCompleteCallback) {
-//                        final int id = onCompleteCallback.hashCode();
-//                        callbackMap.put(id, onCompleteCallback);
-//
-//                        WritableMap networkSnapshotParams = Arguments.createMap();
-//                        networkSnapshotParams.putInt("id", id);
-//                        networkSnapshotParams.putString("url", networkLogSnapshot.getUrl());
-//                        networkSnapshotParams.putInt("responseCode", networkLogSnapshot.getResponseCode());
-//
-//                        sendEvent("IBGNetworkLoggerHandler", networkSnapshotParams);
-//
-//                    }
-//                });
-//            }
-//        });
-//    }
-//
-//    @ReactMethod
-//    protected void updateNetworkLogSnapshot(String jsonString) {
-//
-//        JSONObject newJSONObject = null;
-//        try {
-//            newJSONObject = new JSONObject(jsonString);
-//        } catch (JSONException e) {
-//            throw new RuntimeException(e);
-//        }
-//        final Integer ID = newJSONObject.optInt("id");
-//        final NetworkLogSnapshot modifiedSnapshot = new NetworkLogSnapshot(
-//                newJSONObject.optString("url"),
-//                null,
-//                null,
-//                null,
-//                null,
-//                newJSONObject.optInt("responseCode")
-//        );
-//
-//        final OnCompleteCallback<NetworkLogSnapshot> callback = callbackMap.get(ID);
-//        if (callback != null) {
-//            callback.onComplete(null);
-//        }
-//        callbackMap.remove(ID);
-//
-//    }
 }
diff --git a/examples/default/src/screens/apm/NetworkScreen.tsx b/examples/default/src/screens/apm/NetworkScreen.tsx
@@ -177,11 +177,6 @@ export const NetworkScreen: React.FC = () => {
               title="Send Sequantail Requests"
             />
 
-            <CustomButton
-              onPress={() => makeSequentialApiCalls(generateUrls())}
-              title="Send Sequantail Requests"
-            />
-
             <CustomButton onPress={() => refetch} title="Reload GraphQL" />
             <View>
               {isLoading && <Text>Loading...</Text>}
diff --git a/ios/RNInstabug/InstabugNetworkLoggerBridge.m b/ios/RNInstabug/InstabugNetworkLoggerBridge.m
@@ -44,74 +44,4 @@ -(void)stopObserving {
     resolve(@(IBGNetworkLogger.isNativeNetworkInterceptionFeatureEnabled));
 }
 
-
-// RCT_EXPORT_METHOD(registerNetworkLogsListener){
-//     [IBGNetworkLogger setRequestObfuscationHandlerV2:^(NSURLRequest * _Nonnull request, void (^ _Nonnull completionHandler)(NSURLRequest * _Nonnull)) {
-//         NSString *tempId = [[[NSUUID alloc] init] UUIDString];
-//         self.dictionary[tempId] = completionHandler;
-//
-//            // Ensure the URL, HTTP body, and headers are in the correct format
-//            NSString *urlString = request.URL.absoluteString ?: @"";
-//            NSString *bodyString = [[NSString alloc] initWithData:request.HTTPBody encoding:NSUTF8StringEncoding] ?: @"";
-//            NSDictionary *headerDict = request.allHTTPHeaderFields ?: @{};
-//
-//            // Create the dictionary to send
-//            NSDictionary *dict = @{
-//                @"tempId": tempId,
-//                @"url": urlString,
-//                @"requestBody": bodyString,
-//                @"requestHeader": headerDict
-//            };
-//
-//            // Send the event
-//            [self sendEventWithName:@"IBGNetworkLoggerHandler" body:dict];
-//
-//        }];
-// }
-//
-// RCT_EXPORT_METHOD(updateNetworkLogSnapshot:(NSString * _Nonnull)jsonString) {
-//     // Properly initialize the NSMutableURLRequest
-//     NSMutableURLRequest *request = [[NSMutableURLRequest alloc] init];
-//
-//     // Convert jsonString to NSData
-//     NSData *data = [jsonString dataUsingEncoding:NSUTF8StringEncoding];
-//
-//     // Parse the JSON into a dictionary
-//     NSError *error = nil;
-//     NSDictionary *dict = [NSJSONSerialization JSONObjectWithData:data options:0 error:&error];
-//
-//     // Check for JSON parsing errors
-//     if (error) {
-//         NSLog(@"Failed to parse JSON: %@", error);
-//         return;
-//     }
-//
-//     // Set the URL, HTTP body, and headers
-//     request.URL = [NSURL URLWithString:dict[@"url"]];
-//     request.HTTPBody = [dict[@"requestBody"] dataUsingEncoding:NSUTF8StringEncoding];
-//
-//     // Ensure requestHeader is a dictionary
-//     if ([dict[@"requestHeader"] isKindOfClass:[NSDictionary class]]) {
-//         request.allHTTPHeaderFields = dict[@"requestHeader"];
-//     } else {
-//         NSLog(@"Invalid requestHeader format");
-// //        return;
-//     }
-//
-//     // Ensure self.completion is not nil before calling it
-//     NSString *tempId = dict[@"tempId"];
-//     if ([tempId isKindOfClass:[NSString class]] && self.dictionary[tempId] != nil) {
-//         ((IBGURLRequestObfuscationHandler)self.dictionary[tempId])(request);
-//     } else {
-//         NSLog(@"Not Available Completion");
-//     }
-// }
-//
-// RCT_EXPORT_METHOD(setNetworkLoggingRequestFilterPredicateIOS: (BOOL)value){
-//
-//     NSPredicate *requestPredicate = [NSPredicate predicateWithValue:(value) ? YES : NO];
-//
-//     [IBGNetworkLogger setNetworkLoggingRequestFilterPredicate:requestPredicate responseFilterPredicate:nil];
-// }
-
 @end
diff --git a/src/modules/Instabug.ts b/src/modules/Instabug.ts
@@ -45,7 +45,6 @@ const firstScreen = 'Initial Screen';
 let _currentAppState = AppState.currentState;
 let isNativeInterceptionFeatureEnabled = false; // Checks the value of "cp_native_interception_enabled" backend flag.
 let hasAPMNetworkPlugin = false; // Android only: checks if the APM plugin is installed.
-let isAPMNetworkEnabled = false; // Android only: checks if (APM enabled && Network enabled).
 let shouldEnableNativeInterception = false; // Android: used to disable APM logging inside reportNetworkLog() -> NativeAPM.networkLogAndroid(), iOS: used to control native interception (true == enabled , false == disabled)
 
 /**
@@ -78,7 +77,6 @@ function _logFlags() {
     `Andrew: init -> {
      isNativeInterceptionFeatureEnabled: ${isNativeInterceptionFeatureEnabled},
      hasAPMNetworkPlugin: ${hasAPMNetworkPlugin},
-     isApmNetworkEnabled: ${isAPMNetworkEnabled},
      shouldEnableNativeInterception: ${shouldEnableNativeInterception}
     }`,
   );
@@ -96,7 +94,6 @@ export const init = async (config: InstabugConfig) => {
   isNativeInterceptionFeatureEnabled = await NativeNetworkLogger.isNativeInterceptionEnabled();
   if (Platform.OS === 'android') {
     hasAPMNetworkPlugin = await NativeNetworkLogger.hasAPMNetworkPlugin();
-    isAPMNetworkEnabled = await NativeNetworkLogger.isAPMNetworkEnabled();
     shouldEnableNativeInterception =
       config.networkInterceptionMode === NetworkInterceptionMode.native;
   }
@@ -118,7 +115,6 @@ export const init = async (config: InstabugConfig) => {
   setApmNetworkFlagsIfChanged({
     isNativeInterceptionFeatureEnabled: isNativeInterceptionFeatureEnabled,
     hasAPMNetworkPlugin: hasAPMNetworkPlugin,
-    isAPMNetworkEnabled: isAPMNetworkEnabled,
     shouldEnableNativeInterception: shouldEnableNativeInterception,
   });
 
@@ -166,13 +162,11 @@ const fetchApmNetworkFlags = async () => {
   isNativeInterceptionFeatureEnabled = await NativeNetworkLogger.isNativeInterceptionEnabled();
   if (Platform.OS === 'android') {
     hasAPMNetworkPlugin = await NativeNetworkLogger.hasAPMNetworkPlugin();
-    isAPMNetworkEnabled = await NativeNetworkLogger.isAPMNetworkEnabled();
   }
 
   return {
     isNativeInterceptionFeatureEnabled,
     hasAPMNetworkPlugin,
-    isAPMNetworkEnabled,
     shouldEnableNativeInterception,
   };
 };
@@ -243,6 +237,7 @@ const checkNativeInterceptionForIOS = (config: InstabugConfig) => {
       shouldEnableNativeInterception = true;
     } else {
       shouldEnableNativeInterception = false;
+      NetworkLogger.setEnabled(true); // rollback to JS interceptor
       console.error(InstabugConstants.IBG_APM_TAG + 'Native interception is disabled');
     }
   }
diff --git a/src/native/NativeNetworkLogger.ts b/src/native/NativeNetworkLogger.ts
@@ -4,12 +4,7 @@ import { NativeEventEmitter, type NativeModule } from 'react-native';
 export interface NetworkLoggerNativeModule extends NativeModule {
   // Network logging Flags //
   isNativeInterceptionEnabled(): Promise<boolean>;
-  isAPMNetworkEnabled(): Promise<boolean>;
   hasAPMNetworkPlugin(): Promise<boolean>;
-
-  // registerNetworkLogsListener(): void;
-  // updateNetworkLogSnapshot(networkData: string): void;
-  // setNetworkLoggingRequestFilterPredicateIOS(value: boolean): void;
 }
 
 export const NativeNetworkLogger = NativeModules.IBGNetworkLogger;
diff --git a/src/utils/InstabugUtils.ts b/src/utils/InstabugUtils.ts
@@ -16,20 +16,17 @@ import { NativeAPM } from '../native/NativeAPM';
 type ApmNetworkFlags = {
   isNativeInterceptionFeatureEnabled: boolean;
   hasAPMNetworkPlugin: boolean;
-  isAPMNetworkEnabled: boolean;
   shouldEnableNativeInterception: boolean;
 };
 
 let apmFlags: ApmNetworkFlags = {
   isNativeInterceptionFeatureEnabled: false,
   hasAPMNetworkPlugin: false,
-  isAPMNetworkEnabled: false,
   shouldEnableNativeInterception: false,
 };
 
 export function setApmNetworkFlagsIfChanged(flags: ApmNetworkFlags): boolean {
   if (
-    flags.isAPMNetworkEnabled === apmFlags.isAPMNetworkEnabled &&
     flags.hasAPMNetworkPlugin === apmFlags.hasAPMNetworkPlugin &&
     flags.isNativeInterceptionFeatureEnabled === apmFlags.isNativeInterceptionFeatureEnabled &&
     flags.shouldEnableNativeInterception === apmFlags.shouldEnableNativeInterception
@@ -188,10 +185,9 @@ export const reportNetworkLog = (network: NetworkData) => {
     );
 
     if (
-      (!apmFlags.isNativeInterceptionFeatureEnabled ||
-        !apmFlags.hasAPMNetworkPlugin ||
-        !apmFlags.shouldEnableNativeInterception) &&
-      apmFlags.isAPMNetworkEnabled
+      !apmFlags.isNativeInterceptionFeatureEnabled ||
+      !apmFlags.hasAPMNetworkPlugin ||
+      !apmFlags.shouldEnableNativeInterception
     ) {
       console.log('Andrew: ' + 'NetworkLogger -> NativeAPM.networkLogAndroid');
       NativeAPM.networkLogAndroid(
diff --git a/test/modules/Instabug.spec.ts b/test/modules/Instabug.spec.ts
diff --git a/test/modules/NetworkLogger.spec.ts b/test/modules/NetworkLogger.spec.ts
diff --git a/test/utils/InstabugUtils.spec.ts b/test/utils/InstabugUtils.spec.ts
