From 36758a3c15769f2fc35d00d99db0b2933e36916c Mon Sep 17 00:00:00 2001 From: kholood Date: Wed, 17 Jul 2024 18:50:13 +0300 Subject: [PATCH 1/4] fix(android): add W3C External Trace Attributes placeholder --- .../reactlibrary/RNInstabugAPMModule.java | 42 ++++++++++--------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/android/src/main/java/com/instabug/reactlibrary/RNInstabugAPMModule.java b/android/src/main/java/com/instabug/reactlibrary/RNInstabugAPMModule.java index 7ffaf4de73..70487f8cc5 100644 --- a/android/src/main/java/com/instabug/reactlibrary/RNInstabugAPMModule.java +++ b/android/src/main/java/com/instabug/reactlibrary/RNInstabugAPMModule.java @@ -14,6 +14,7 @@ import com.instabug.apm.APM; import com.instabug.apm.model.ExecutionTrace; import com.instabug.apm.networking.APMNetworkLogger; +import com.instabug.apm.networkinterception.cp.APMCPNetworkLog; import com.instabug.reactlibrary.utils.MainThreadHandler; import org.json.JSONException; @@ -338,27 +339,28 @@ private void networkLogAndroid(final double requestStartTime, final String errorMessage = hasError ? errorDomain : null; 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); + 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, - requestStartTime, - requestDuration, - requestHeaders, - requestBody, - requestBodySize, - requestMethod, - requestUrl, - requestContentType, - responseHeaders, - responseBody, - responseBodySize, - statusCode, - responseContentType, - errorMessage, - gqlQueryName, - serverErrorMessage - ); + method.invoke( + networkLogger, + (long) requestStartTime, + (long) requestDuration, + requestHeaders, + requestBody, + (long) requestBodySize, + requestMethod, + requestUrl, + requestContentType, + responseHeaders, + responseBody, + (long)responseBodySize, + (int) statusCode, + responseContentType, + errorMessage, + gqlQueryName, + serverErrorMessage, + null + ); } else { Log.e("IB-CP-Bridge", "APMNetworkLogger.log was not found by reflection"); } From 70d8132736945b8f0b9b24e198974dcfed27525a Mon Sep 17 00:00:00 2001 From: kholood Date: Wed, 17 Jul 2024 19:20:20 +0300 Subject: [PATCH 2/4] chore: add CHANGLOG --- ios/Instabug-iOS | 1 + 1 file changed, 1 insertion(+) create mode 160000 ios/Instabug-iOS diff --git a/ios/Instabug-iOS b/ios/Instabug-iOS new file mode 160000 index 0000000000..ed3f8f4907 --- /dev/null +++ b/ios/Instabug-iOS @@ -0,0 +1 @@ +Subproject commit ed3f8f4907a833abcd4bff26bce956afeb8b4755 From 75f345cf86e3530c416a87de82ddf421f0872b64 Mon Sep 17 00:00:00 2001 From: kholood Date: Wed, 17 Jul 2024 19:20:20 +0300 Subject: [PATCH 3/4] chore: add CHANGLOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ec9aad5b6..4221fa8a26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ### Fixed +- Fix APM network logging on Android ([#1253](https://github.com/Instabug/Instabug-React-Native/pull/1253)). - Fix an OOM (out-of-memory) crash while saving network logs on Android ([#1244](https://github.com/Instabug/Instabug-React-Native/pull/1244)). ## [13.2.0](https://github.com/Instabug/Instabug-React-Native/compare/v13.1.1...v13.2.0) (July 7, 2024) From 95ff786d686a8467040fda661d5eeda3707ef0b7 Mon Sep 17 00:00:00 2001 From: kholood Date: Thu, 18 Jul 2024 14:25:43 +0300 Subject: [PATCH 4/4] fix: remove ios sub module --- ios/Instabug-iOS | 1 - 1 file changed, 1 deletion(-) delete mode 160000 ios/Instabug-iOS diff --git a/ios/Instabug-iOS b/ios/Instabug-iOS deleted file mode 160000 index ed3f8f4907..0000000000 --- a/ios/Instabug-iOS +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ed3f8f4907a833abcd4bff26bce956afeb8b4755