feat: migrate w3c flags to APM core

Author: kholood-ea

.circleci/config.yml

@@ -1,6 +1,8 @@
 # Distribution
 dist/
 bin/
+upload/*
+!upload/package.json
 
 # NodeJS
 node_modules/

.gitignore

@@ -1,6 +1,26 @@
 # Changelog
 
-## [Unreleased](https://github.com/Instabug/Instabug-React-Native/compare/v13.2.0...dev)
+## [Unreleased](https://github.com/Instabug/Instabug-React-Native/compare/v13.3.0...dev)
+
+### Added
+
+- Add support for Expo Router navigation tracking ([#1270](https://github.com/Instabug/Instabug-React-Native/pull/1270)).
+
+## [13.3.0](https://github.com/Instabug/Instabug-React-Native/compare/v13.2.0...v13.3.0) (August 4, 2024)
+
+### Added
+
+- Add support for Feature Flags APIs `Instabug.addFeatureFlags`, `Instabug.removeFeatureFlags` and `Instabug.clearAllFeatureFlags` ([#1230](https://github.com/Instabug/Instabug-React-Native/pull/1230)).
+- Export `uploadSourcemaps` and `uploadSoFiles` utilities in the `instabug-reactnative/upload` sub-package for usage in custom Node.js upload scripts ([#1252](https://github.com/Instabug/Instabug-React-Native/pull/1252)).
+
+### Changed
+
+- Bump Instabug Android SDK to v13.3.0 ([#1261](https://github.com/Instabug/Instabug-React-Native/pull/1261)). [See release notes](https://github.com/Instabug/Instabug-Android/releases/tag/v13.3.0).
+- Bump Instabug iOS SDK to v13.3.0 ([#1262](https://github.com/Instabug/Instabug-React-Native/pull/1262)). [See release notes](https://github.com/Instabug/Instabug-iOS/releases/tag/13.3.0).
+
+### Deprecated
+
+- Deprecate Experiments APIs `Instabug.addExperiments`, `Instabug.removeExperiments` and `Instabug.clearAllExperiments` in favor of the new Feature Flags APIs ([#1230](https://github.com/Instabug/Instabug-React-Native/pull/1230)).
 
 ### Fixed
 
@@ -59,8 +79,20 @@
 - Bump Instabug iOS SDK to v13.0.0 ([#1189](https://github.com/Instabug/Instabug-React-Native/pull/1189)). [See release notes](https://github.com/instabug/instabug-ios/releases/tag/13.0.0).
 - Bump Instabug Android SDK to v13.0.0 ([#1188](https://github.com/Instabug/Instabug-React-Native/pull/1188)). [See release notes](https://github.com/Instabug/android/releases/tag/v13.0.0).
 
+<<<<<<< HEAD
+
 ## [12.9.0](https://github.com/Instabug/Instabug-React-Native/compare/v12.8.0...v12.9.0) (April 2, 2024)
 
+=======
+
+### Deprecated
+
+- Deprecate Execution Traces APIs `APM.startExecutionTrace`, `Trace.end` and `Trace.setAttribute` in favor of the new App Flows APIs ([#1138](https://github.com/Instabug/Instabug-React-Native/pull/1138)).
+
+## [12.9.0](https://github.com/Instabug/Instabug-React-Native/compare/v12.8.0...12.9.0)(April 2, 2024)
+
+> > > > > > > origin/dev
+
 ### Added
 
 - Adds symbol files upload script ([#1137](https://github.com/Instabug/Instabug-React-Native/pull/1137))
@@ -71,10 +103,6 @@
 
 - Deprecate execution traces APIs `APM.startExecutionTrace`, `Trace.end` and `Trace.setFlowAttribute` in favor of the new app flow APIs ([#1138](https://github.com/Instabug/Instabug-React-Native/pull/1138)).
 
-### Deprecated
-
-- Deprecate Execution Traces APIs `APM.startExecutionTrace`, `Trace.end` and `Trace.setAttribute` in favor of the new App Flows APIs ([#1138](https://github.com/Instabug/Instabug-React-Native/pull/1138)).
-
 ### Changed
 
 - Bump Instabug Android SDK to v12.9.0 ([#1168](https://github.com/Instabug/Instabug-React-Native/pull/1168)). [See release notes](https://github.com/Instabug/android/releases/tag/v12.9.0).

CHANGELOG.md

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

android/build.gradle

@@ -1,4 +1,4 @@
-<manifest package="com.instabug.reactlibrary"
+<manifest 
   xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>

android/src/main/AndroidManifest.xml

@@ -330,10 +330,10 @@ private void networkLogAndroid(final double requestStartTime,
                                    @Nullable final String errorDomain,
                                    @Nullable final ReadableMap w3cAttributes,
                                    @Nullable final String gqlQueryName,
-                                   @Nullable final String serverErrorMessage) {
+                                   @Nullable final String serverErrorMessage
+                                   ) {
         try {
             APMNetworkLogger networkLogger = new APMNetworkLogger();
-
             final boolean hasError = errorDomain != null && !errorDomain.isEmpty();
             final String errorMessage = hasError ? errorDomain : null;
 
@@ -363,13 +363,12 @@ private void networkLogAndroid(final double requestStartTime,
                             w3cAttributes.getString("w3cGeneratedHeader"),
                             w3cAttributes.getString("w3cCaughtHeader")
                     );
-
             try {
                 Method method = getMethod(Class.forName("com.instabug.apm.networking.APMNetworkLogger"), "log", long.class, long.class, String.class, String.class, long.class, String.class, String.class, String.class, String.class, String.class, long.class, int.class, String.class, String.class, String.class, String.class, APMCPNetworkLog.W3CExternalTraceAttributes.class);
                 if (method != null) {
                         method.invoke(
                                 networkLogger,
-                                (long) requestStartTime,
+                                (long) requestStartTime * 1000,
                                 (long) requestDuration,
                                 requestHeaders,
                                 requestBody,

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

@@ -17,6 +17,7 @@
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeArray;
@@ -36,6 +37,7 @@
 import com.instabug.library.internal.crossplatform.CoreFeaturesState;
 import com.instabug.library.internal.crossplatform.FeaturesStateListener;
 import com.instabug.library.internal.crossplatform.InternalCore;
+import com.instabug.library.featuresflags.model.IBGFeatureFlag;
 import com.instabug.library.internal.module.InstabugLocale;
 import com.instabug.library.invocation.InstabugInvocationEvent;
 import com.instabug.library.logging.InstabugLog;
@@ -48,6 +50,7 @@
 import com.instabug.reactlibrary.utils.MainThreadHandler;
 
 import com.instabug.reactlibrary.utils.RNTouchedViewExtractor;
+
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONTokener;
@@ -57,6 +60,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -1030,6 +1034,9 @@ public void run() {
         });
     }
 
+    /**
+     * @deprecated see @link #addFeatureFlags(ReadableArray)
+     */
     @ReactMethod
     public void addExperiments(final ReadableArray experiments) {
         MainThreadHandler.runOnMainThread(new Runnable() {
@@ -1046,6 +1053,9 @@ public void run() {
         });
     }
 
+    /**
+     * @deprecated see {@link #removeFeatureFlags(ReadableArray)}
+     */
     @ReactMethod
     public void removeExperiments(final ReadableArray experiments) {
         MainThreadHandler.runOnMainThread(new Runnable() {
@@ -1062,6 +1072,9 @@ public void run() {
         });
     }
 
+    /**
+     * @deprecated see {@link #removeAllFeatureFlags()}
+     */
     @ReactMethod
     public void clearAllExperiments() {
         MainThreadHandler.runOnMainThread(new Runnable() {
@@ -1076,6 +1089,59 @@ public void run() {
         });
     }
 
+    @ReactMethod
+    public void addFeatureFlags(final ReadableMap featureFlagsMap) {
+        MainThreadHandler.runOnMainThread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    Iterator<Map.Entry<String, Object>> iterator = featureFlagsMap.getEntryIterator();
+                    ArrayList<IBGFeatureFlag> featureFlags = new ArrayList<>();
+                    while (iterator.hasNext()) {
+                        Map.Entry<String, Object> item = iterator.next();
+                        String variant = (String) item.getValue();
+                        String name = item.getKey();
+                        featureFlags.add(new IBGFeatureFlag(name, variant.isEmpty() ? null : variant));
+                    }
+                    if (!featureFlags.isEmpty()) {
+                        Instabug.addFeatureFlags(featureFlags);
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+    }
+
+    @ReactMethod
+    public void removeFeatureFlags(final ReadableArray featureFlags) {
+        MainThreadHandler.runOnMainThread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                   ArrayList<String> stringArray = ArrayUtil.parseReadableArrayOfStrings(featureFlags);
+                    Instabug.removeFeatureFlag(stringArray);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+    }
+
+    @ReactMethod
+    public void removeAllFeatureFlags() {
+        MainThreadHandler.runOnMainThread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    Instabug.removeAllFeatureFlags();
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+    }
+
     @ReactMethod
     public void willRedirectToStore() {
         MainThreadHandler.runOnMainThread(new Runnable() {

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

@@ -20,6 +20,7 @@
 import com.instabug.library.ReproMode;
 import com.instabug.library.internal.crossplatform.CoreFeature;
 import com.instabug.library.internal.crossplatform.InternalCore;
+import com.instabug.library.featuresflags.model.IBGFeatureFlag;
 import com.instabug.library.internal.module.InstabugLocale;
 import com.instabug.library.ui.onboarding.WelcomeMessage;
 import com.instabug.reactlibrary.utils.MainThreadHandler;
@@ -40,6 +41,7 @@
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -569,8 +571,6 @@ public void testIdentifyUserWithId() {
 
     @Test
     public void given$clearAllExperiments_whenQuery_thenShouldCallNativeApi() {
-        // given
-
         // when
         rnModule.clearAllExperiments();
 
@@ -579,6 +579,56 @@ public void testIdentifyUserWithId() {
         Instabug.clearAllExperiments();
     }
 
+    @Test
+    public void testAddFeatureFlags() {
+        // given
+        JavaOnlyMap map = new JavaOnlyMap();
+        map.putString("key1", "value1");
+        map.putString("key2", "value2");
+
+        // when
+        rnModule.addFeatureFlags(map);
+
+        // then
+        Iterator<Map.Entry<String, Object>> iterator = map.getEntryIterator();
+        ArrayList<IBGFeatureFlag> featureFlags = new ArrayList<>();
+        while (iterator.hasNext()) {
+            Map.Entry<String, Object> item = iterator.next();
+            featureFlags.add(new IBGFeatureFlag(item.getKey(), (String) item.getValue()));
+        }
+
+        mockInstabug.verify(() -> Instabug.addFeatureFlags(featureFlags));
+
+    }
+
+    @Test
+    public void testRemoveFeatureFlags() {
+        // given
+        JavaOnlyArray array = new JavaOnlyArray();
+        array.pushString("exp1");
+        array.pushString("exp2");
+
+        // when
+        rnModule.removeFeatureFlags(array);
+
+        // then
+        List<String> expectedList = new ArrayList<String>();
+        for (Object o : array.toArrayList()) {
+            expectedList.add((String) o);
+        }
+        mockInstabug.verify(() -> Instabug.removeFeatureFlag(expectedList));
+
+    }
+
+    @Test
+    public void testRemoveAllFeatureFlags() {
+        // when
+        rnModule.removeAllFeatureFlags();
+
+        // then
+        mockInstabug.verify(() -> Instabug.removeAllFeatureFlags());
+    }
+
     @Test
     public void testWillRedirectToStore() {
         // when