Merge remote-tracking branch 'refs/remotes/origin/refactor/monorepo' …

…into refactor/monorepo-modular-package

.circleci/config.yml

@@ -44,7 +44,7 @@ commands:
           command: sudo gem install cocoapods
       - run:
           name: Install Pods
-          working_directory: packages/Instabug-Flutter/example/ios
+          working_directory: packages/instabug_flutter/example/ios
           command: pod install --repo-update
   setup_captain:
     parameters:
@@ -222,7 +222,7 @@ jobs:
       - advanced-checkout/shallow-checkout
       - setup_flutter
       - android/run-tests:
-          working-directory: packages/Instabug-Flutter/example/android
+          working-directory: packages/instabug_flutter/example/android
           test-command: ./gradlew test
 
   e2e_android_captain:
@@ -239,7 +239,7 @@ jobs:
           run-tests-working-directory: e2e
           additional-avd-args: --device 3
           system-image: system-images;android-33;default;x86_64
-          post-emulator-launch-assemble-command: cd packages/Instabug-Flutter/example && flutter build apk --debug
+          post-emulator-launch-assemble-command: cd packages/instabug_flutter/example && flutter build apk --debug
           test-command: dotnet test
 
   test_ios:
@@ -253,7 +253,7 @@ jobs:
       - setup_ios
       - run:
           name: Build and run tests
-          working_directory: ~/project/packages/Instabug-Flutter/example/ios
+          working_directory: ~/project/packages/instabug_flutter/example/ios
           command: |
             xcodebuild -allowProvisioningUpdates \
                 -workspace Runner.xcworkspace \
@@ -274,7 +274,7 @@ jobs:
       - setup_ios
       - run:
           name: Build Example App
-          working_directory: packages/Instabug-Flutter/example
+          working_directory: packages/instabug_flutter/example
           command: flutter build ios --simulator
       - run:
           name: Run E2E Tests
@@ -368,7 +368,7 @@ workflows:
       - test_flutter_without_melos:
           name: test_flutter-2.10.5
           version: 2.10.5
-          app-dir: "~/project/packages/Instabug-Flutter/"
+          app-dir: "~/project/packages/instabug_flutter/"
       - e2e_android_captain
       - test_ios
       - e2e_ios_captain

.gitignore

@@ -2,7 +2,7 @@
 *.mocks.dart
 *.g.dart
 packages/**/android/**/generated/
-packages/**ios/**/Generated/
+packages/**/ios/**/Generated/
 
 # Miscellaneous
 *.class
@@ -84,4 +84,4 @@ android/gradlew.bat
 !**/ios/**/default.pbxuser
 !**/ios/**/default.perspectivev3
 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
-/packages/Instabug-Flutter/lib/src/generated/
+/packages/**/lib/src/generated/

e2e/Utils/CaptainTest.cs

@@ -7,10 +7,10 @@ public class CaptainTest : IDisposable
 {
   private static readonly CaptainConfig _config = new()
   {
-    AndroidApp = Path.GetFullPath("../../../../packages/Instabug-Flutter/example/build/app/outputs/flutter-apk/app-debug.apk"),
+    AndroidApp = Path.GetFullPath("../../../../packages/instabug_flutter/example/build/app/outputs/flutter-apk/app-debug.apk"),
     AndroidAppId = "com.instabug.flutter.example",
     AndroidVersion = "13",
-    IosApp = Path.GetFullPath("../../../../packages/Instabug-Flutter/example/build/ios/iphonesimulator/Runner.app"),
+    IosApp = Path.GetFullPath("../../../../packages/instabug_flutter/example/build/ios/iphonesimulator/Runner.app"),
     IosAppId = "com.instabug.InstabugSample",
     IosVersion = "17.2",
     IosDevice = "iPhone 15 Pro Max"

packages/Instabug-Flutter/CHANGELOG.md → packages/instabug_flutter/CHANGELOG.md

@@ -1,11 +1,15 @@
 # Changelog
 
-## [Unreleased](https://github.com/Instabug/Instabug-Flutter/compare/v13.4.0...dev)
+## [14.0.0](https://github.com/Instabug/Instabug-Flutter/compare/v13.4.0...v14.0.0) (November 11, 2024)
 
-### Changed
+### Added
 
-- Set the minimum Flutter SDK version to v2.10.0. ([#518](https://github.com/Instabug/Instabug-Flutter/pull/518))
+- Add support for tracing network requests from Instabug to services like Datadog and New Relic ([#481](https://github.com/Instabug/Instabug-Flutter/pull/481)).
+
+### Changed
 
+- Bump Instabug Android SDK to v14.0.0 ([#532](https://github.com/Instabug/Instabug-Flutter/pull/532)). [See release notes](https://github.com/Instabug/Instabug-Android/releases/tag/v14.0.0).
+- Bump Instabug iOS SDK to v14.0.0 ([#532](https://github.com/Instabug/Instabug-Flutter/pull/532)). [See release notes](https://github.com/Instabug/Instabug-iOS/releases/tag/14.0.0),
 
 ## [13.4.0](https://github.com/Instabug/Instabug-Flutter/compare/v13.3.0...v13.4.0) (September 29, 2024)
 

packages/Instabug-Flutter/android/build.gradle → packages/instabug_flutter/android/build.gradle

@@ -1,5 +1,5 @@
 group 'com.instabug.flutter'
-version '13.4.0'
+version '14.0.0'
 
 buildscript {
     repositories {
@@ -22,7 +22,10 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
+    if (project.android.hasProperty("namespace")) {
+        namespace "com.instabug.flutter"
+    }
+    compileSdkVersion 33
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -41,10 +44,11 @@ android {
 }
 
 dependencies {
-    api 'com.instabug.library:instabug:13.4.1'
-
+    api 'com.instabug.library:instabug:14.0.0'
     testImplementation 'junit:junit:4.13.2'
     testImplementation "org.mockito:mockito-inline:3.12.1"
+    testImplementation "io.mockk:mockk:1.13.13"
+
 }
 
 // add upload_symbols task

packages/Instabug-Flutter/android/src/main/AndroidManifest.xml → packages/instabug_flutter/android/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.instabug.flutter">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
   <application>
     <meta-data

packages/Instabug-Flutter/android/src/main/java/com/instabug/flutter/modules/ApmApi.java → packages/instabug_flutter/android/src/main/java/com/instabug/flutter/modules/ApmApi.java

@@ -11,14 +11,13 @@
 import com.instabug.apm.configuration.cp.FeatureAvailabilityCallback;
 import com.instabug.apm.model.ExecutionTrace;
 import com.instabug.apm.networking.APMNetworkLogger;
+import com.instabug.apm.networkinterception.cp.APMCPNetworkLog;
 import com.instabug.flutter.generated.ApmPigeon;
 import com.instabug.flutter.util.Reflection;
 import com.instabug.flutter.util.ThreadManager;
-import com.instabug.apm.networkinterception.cp.APMCPNetworkLog;
 
 import io.flutter.plugin.common.BinaryMessenger;
 
-import org.jetbrains.annotations.NotNull;
 import org.json.JSONObject;
 
 import java.lang.reflect.Method;
@@ -210,18 +209,62 @@ public void networkLogAndroid(@NonNull Map<String, Object> data) {
             if (data.containsKey("serverErrorMessage")) {
                 serverErrorMessage = (String) data.get("serverErrorMessage");
             }
+            Boolean isW3cHeaderFound = null;
+            Number partialId = null;
+            Number networkStartTimeInSeconds = null;
+            String w3CGeneratedHeader = null;
+            String w3CCaughtHeader = null;
+
+            if (data.containsKey("isW3cHeaderFound")) {
+                isW3cHeaderFound = (Boolean) data.get("isW3cHeaderFound");
+            }
+
+            if (data.containsKey("partialId")) {
+
+
+                partialId = ((Number) data.get("partialId"));
 
-            Method method = Reflection.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(apmNetworkLogger, requestStartTime, requestDuration, requestHeaders, requestBody, requestBodySize, requestMethod, requestUrl, requestContentType, responseHeaders, responseBody, responseBodySize, statusCode, responseContentType, errorMessage, gqlQueryName, serverErrorMessage, null);
-            } else {
-                Log.e(TAG, "APMNetworkLogger.log was not found by reflection");
+            }
+            if (data.containsKey("networkStartTimeInSeconds")) {
+                networkStartTimeInSeconds = ((Number) data.get("networkStartTimeInSeconds"));
             }
 
-        } catch (Exception e) {
-            e.printStackTrace();
+            if (data.containsKey("w3CGeneratedHeader")) {
+
+                w3CGeneratedHeader = (String) data.get("w3CGeneratedHeader");
+
+
+            }
+                if (data.containsKey("w3CCaughtHeader")) {
+                    w3CCaughtHeader = (String) data.get("w3CCaughtHeader");
+
+                }
+
+
+                APMCPNetworkLog.W3CExternalTraceAttributes w3cExternalTraceAttributes =
+                        null;
+                if (isW3cHeaderFound != null) {
+                    w3cExternalTraceAttributes = new APMCPNetworkLog.W3CExternalTraceAttributes(
+                            isW3cHeaderFound, partialId == null ? null : partialId.longValue(),
+                            networkStartTimeInSeconds == null ? null : networkStartTimeInSeconds.longValue(),
+                            w3CGeneratedHeader, w3CCaughtHeader
+
+                    );
+                }
+
+                Method method = Reflection.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(apmNetworkLogger, requestStartTime, requestDuration, requestHeaders, requestBody, requestBodySize, requestMethod, requestUrl, requestContentType, responseHeaders, responseBody, responseBodySize, statusCode, responseContentType, errorMessage, gqlQueryName, serverErrorMessage, w3cExternalTraceAttributes);
+                } else {
+                    Log.e(TAG, "APMNetworkLogger.log was not found by reflection");
+                }
+
+            } catch(Exception e){
+                e.printStackTrace();
+            }
         }
-    }
+
+
 
 
     @Override

packages/Instabug-Flutter/android/src/main/java/com/instabug/flutter/modules/InstabugApi.java → packages/instabug_flutter/android/src/main/java/com/instabug/flutter/modules/InstabugApi.java

@@ -13,6 +13,10 @@
 import com.instabug.flutter.util.ArgsRegistry;
 import com.instabug.flutter.util.Reflection;
 import com.instabug.flutter.util.ThreadManager;
+import com.instabug.library.internal.crossplatform.CoreFeature;
+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.Feature;
 import com.instabug.library.Instabug;
 import com.instabug.library.InstabugColorTheme;
@@ -48,14 +52,19 @@ public class InstabugApi implements InstabugPigeon.InstabugHostApi {
     private final Callable<Bitmap> screenshotProvider;
     private final InstabugCustomTextPlaceHolder placeHolder = new InstabugCustomTextPlaceHolder();
 
+    private final InstabugPigeon.FeatureFlagsFlutterApi featureFlagsFlutterApi;
+
     public static void init(BinaryMessenger messenger, Context context, Callable<Bitmap> screenshotProvider) {
-        final InstabugApi api = new InstabugApi(context, screenshotProvider);
+        final InstabugPigeon.FeatureFlagsFlutterApi flutterApi = new InstabugPigeon.FeatureFlagsFlutterApi(messenger);
+
+        final InstabugApi api = new InstabugApi(context, screenshotProvider, flutterApi);
         InstabugPigeon.InstabugHostApi.setup(messenger, api);
     }
 
-    public InstabugApi(Context context, Callable<Bitmap> screenshotProvider) {
+    public InstabugApi(Context context, Callable<Bitmap> screenshotProvider, InstabugPigeon.FeatureFlagsFlutterApi featureFlagsFlutterApi) {
         this.context = context;
         this.screenshotProvider = screenshotProvider;
+        this.featureFlagsFlutterApi = featureFlagsFlutterApi;
     }
 
     @VisibleForTesting
@@ -437,6 +446,48 @@ public void networkLog(@NonNull Map<String, Object> data) {
         }
     }
 
+    @Override
+    public void registerFeatureFlagChangeListener() {
+
+        try {
+            InternalCore.INSTANCE._setFeaturesStateListener(new FeaturesStateListener() {
+                @Override
+                public void invoke(@NonNull CoreFeaturesState featuresState) {
+                    ThreadManager.runOnMainThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            featureFlagsFlutterApi.onW3CFeatureFlagChange(featuresState.isW3CExternalTraceIdEnabled(),
+                                    featuresState.isAttachingGeneratedHeaderEnabled(),
+                                    featuresState.isAttachingCapturedHeaderEnabled(),
+                                    new InstabugPigeon.FeatureFlagsFlutterApi.Reply<Void>() {
+                                        @Override
+                                        public void reply(Void reply) {
+
+                                        }
+                                    });
+                        }
+                    });
+                }
+
+            });
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    @NonNull
+    @Override
+    public Map<String, Boolean> isW3CFeatureFlagsEnabled() {
+        Map<String, Boolean> params = new HashMap<String, Boolean>();
+        params.put("isW3cExternalTraceIDEnabled", InternalCore.INSTANCE._isFeatureEnabled(CoreFeature.W3C_EXTERNAL_TRACE_ID));
+        params.put("isW3cExternalGeneratedHeaderEnabled", InternalCore.INSTANCE._isFeatureEnabled(CoreFeature.W3C_ATTACHING_GENERATED_HEADER));
+        params.put("isW3cCaughtHeaderEnabled", InternalCore.INSTANCE._isFeatureEnabled(CoreFeature.W3C_ATTACHING_CAPTURED_HEADER));
+
+
+        return params;
+    }
+
     @Override
     public void willRedirectToStore() {
         Instabug.willRedirectToStore();

packages/Instabug-Flutter/android/src/test/java/com/instabug/flutter/ApmApiTest.java → packages/instabug_flutter/android/src/test/java/com/instabug/flutter/ApmApiTest.java

@@ -1,5 +1,18 @@
 package com.instabug.flutter;
 
+import static com.instabug.flutter.util.GlobalMocks.reflected;
+import static com.instabug.flutter.util.MockResult.makeResult;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockConstruction;
+import static org.mockito.Mockito.mockStatic;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import com.instabug.apm.APM;
 import com.instabug.apm.InternalAPM;
 import com.instabug.apm.configuration.cp.APMFeature;