fix(android): add w3c external trace attributes placeholder (#491)

* fix(android): add w3c external trace attributes placeholder

* chore: add changelog

* chore: fix formatting

* test: update apm network log signature in mocks

---------

Co-authored-by: Ahmed Mahmoud <[email protected]>

Author: kholood-ea

CHANGELOG.md

@@ -10,6 +10,10 @@
 
 - Deprecate Experiments APIs `Instabug.addExperiments`, `Instabug.removeExperiments` and `Instabug.clearAllExperiments` in favor of the new Feature Flags APIs ([#471](https://github.com/Instabug/Instabug-Flutter/pull/471)).
 
+### Fixed
+
+- Fix APM network logging on Android ([#491](https://github.com/Instabug/Instabug-Flutter/pull/491)).
+
 ## [13.2.0](https://github.com/Instabug/Instabug-Flutter/compare/v13.1.1...v13.2.0)
 
 ### Added
@@ -169,18 +173,18 @@
 
   Below is a list of all the affected APIs:
 
-    - `APM.startExecutionTrace`
-    - `BugReporting.setOnInvokeCallback`
-    - `BugReporting.setOnDismissCallback`
-    - `Instabug.getTags`
-    - `Instabug.getUserAttributeForKey`
-    - `Instabug.getUserAttributes`
-    - `Replies.getUnreadRepliesCount`
-    - `Replies.hasChats`
-    - `Replies.setOnNewReplyReceivedCallback`
-    - `Surveys.hasRespondToSurvey`
-    - `Surveys.setOnShowCallback`
-    - `Surveys.setOnDismissCallback`
+  - `APM.startExecutionTrace`
+  - `BugReporting.setOnInvokeCallback`
+  - `BugReporting.setOnDismissCallback`
+  - `Instabug.getTags`
+  - `Instabug.getUserAttributeForKey`
+  - `Instabug.getUserAttributes`
+  - `Replies.getUnreadRepliesCount`
+  - `Replies.hasChats`
+  - `Replies.setOnNewReplyReceivedCallback`
+  - `Surveys.hasRespondToSurvey`
+  - `Surveys.setOnShowCallback`
+  - `Surveys.setOnDismissCallback`
 
 ## [11.12.0](https://github.com/Instabug/Instabug-Flutter/compare/v11.10.1...v11.12.0) (May 30, 2023)
 
@@ -257,10 +261,10 @@
 - Deprecates Instabug.enableAndroid and Instabug.disableAndroid APIs in favour of the new API
   Instabug.setEnabled, which works on both platforms
 - Deprecates callbacks in favor of return values in the following APIs:
-    1. Replies.getUnreadRepliesCount
-    2. Replies.hasChats
-    3. Surveys.hasRespondedToSurvey
-    4. Surveys.getAvailableSurveys
+  1. Replies.getUnreadRepliesCount
+  2. Replies.hasChats
+  3. Surveys.hasRespondedToSurvey
+  4. Surveys.getAvailableSurveys
 
 ## 11.3.0 (2022-09-30)
 

android/src/main/java/com/instabug/flutter/modules/ApmApi.java

@@ -14,6 +14,7 @@
 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;
 
@@ -210,9 +211,9 @@ public void networkLogAndroid(@NonNull Map<String, Object> data) {
                 serverErrorMessage = (String) data.get("serverErrorMessage");
             }
 
-            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);
+            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);
+                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");
             }

android/src/test/java/com/instabug/flutter/ApmApiTest.java

@@ -262,7 +262,8 @@ public void testNetworkLogAndroid() {
                 responseContentType,
                 errorDomain,
                 null,
-                serverErrorMessage
+                serverErrorMessage,
+                null
         ));
 
         mAPMNetworkLogger.close();

android/src/test/java/com/instabug/flutter/util/GlobalMocks.java

@@ -8,6 +8,7 @@
 import android.net.Uri;
 import android.util.Log;
 
+import com.instabug.apm.networkinterception.cp.APMCPNetworkLog;
 import com.instabug.crash.models.IBGNonFatalException;
 
 import org.json.JSONObject;
@@ -69,10 +70,10 @@ public static void setUp() throws NoSuchMethodException {
                 .when(() -> Reflection.getMethod(Class.forName("com.instabug.library.Instabug"), "setCurrentPlatform", int.class))
                 .thenReturn(mSetCurrentPlatform);
 
-        Method mAPMNetworkLog = MockReflected.class.getDeclaredMethod("apmNetworkLog", 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);
+        Method mAPMNetworkLog = MockReflected.class.getDeclaredMethod("apmNetworkLog", 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);
         mAPMNetworkLog.setAccessible(true);
         reflection
-                .when(() -> 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))
+                .when(() -> 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))
                 .thenReturn(mAPMNetworkLog);
 
         Method mCrashReportException = MockReflected.class.getDeclaredMethod("crashReportException", JSONObject.class, boolean.class);

android/src/test/java/com/instabug/flutter/util/MockReflected.java

@@ -3,6 +3,7 @@
 import android.graphics.Bitmap;
 import androidx.annotation.Nullable;
 
+import com.instabug.apm.networkinterception.cp.APMCPNetworkLog;
 import com.instabug.crash.models.IBGNonFatalException;
 
 import org.json.JSONObject;
@@ -33,7 +34,7 @@ public static void setCurrentPlatform(int platform) {}
     /**
      * APMNetworkLogger.log
      */
-    public static void apmNetworkLog(long requestStartTime, long requestDuration, String requestHeaders, String requestBody, long requestBodySize, String requestMethod, String requestUrl, String responseHeaders, String responseBody, String responseBodySize, long statusCode, int responseContentType, String errorMessage, String var18, @Nullable String gqlQueryName, @Nullable String serverErrorMessage) {}
+    public static void apmNetworkLog(long requestStartTime, long requestDuration, String requestHeaders, String requestBody, long requestBodySize, String requestMethod, String requestUrl, String responseHeaders, String responseBody, String responseBodySize, long statusCode, int responseContentType, String errorMessage, String var18, @Nullable String gqlQueryName, @Nullable String serverErrorMessage, @Nullable APMCPNetworkLog.W3CExternalTraceAttributes w3CExternalTraceAttributes) {}
 
     /**
      * CrashReporting.reportException