Skip to content

Commit d6e9f14

Browse files
ahmedAlaaInstabugahmedAlaaInstabug
committed
fix: Replace Thrown Errors with Logs
sss chore(ios): bump sdk to v13.1.0 (#1227) * chore(ios): bump ios sdk v13.1.0 * chore(ios): bump ios sdk v13.1.0 * chore(ios): bump ios sdk v13.1.0 chore(android): bump sdk to v13.1.1 (#1228) * chore(android): bump android sdk v13.1.1 feat: enhance non-fatals support (#1194) * add non fatal api --------- Co-authored-by: Ahmed Mahmoud <68241710+a7medev@users.noreply.github.com> fix: read env variable in sourcemap (#1232) * fix sourcemap issue * fix sourcemap issue * fix sourcemap issue * Update typo in CHANGELOG.md --------- Co-authored-by: Andrew Amin <160974398+AndrewAminInstabug@users.noreply.github.com> Release:v13.1.1 (#1231) * release/v13.1.1 * Update CHANGELOG.md Update CHANGELOG.md chore(deps): bump @babel/traverse in /examples/default Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.22.8 to 7.24.6. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.24.6/packages/babel-traverse) --- updated-dependencies: - dependency-name: "@babel/traverse" dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> chore(deps): bump follow-redirects from 1.15.2 to 1.15.6 Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.2 to 1.15.6. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](follow-redirects/follow-redirects@v1.15.2...v1.15.6) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> fix: cont work after logging fix(android): change parameters used in inner class to final (#1239) chore(android): bump sdk to v13.2.0 (#1245) * chore(android): bump sdk to v13.2.0 * chore: update changelog chore(ios): bump sdk to v13.2.0 (#1246) release: v13.2.0 (#1247) chore: resolve issues in changelog (#1249) feat(example): add apm screen (#1141) fix(android): resolve an OOM in network logs (#1244) fix(android): APM network logging(#1253) * fix(android): add W3C External Trace Attributes placeholder * chore: add CHANGLOG * chore: add CHANGLOG * fix: remove ios sub module feat: export upload utils (#1252) chore(example): remove flipper (#1259) fix(android): pass network start time in microseconds (#1260) * fix: network timestamp in android side * fix: PR comments Co-authored-by: Ahmed Elrefaey <68241710+a7medev@users.noreply.github.com> --------- Co-authored-by: Ahmed Elrefaey <68241710+a7medev@users.noreply.github.com> feat: support feature flags with variants (#1230) Jira ID: MOB-14684 --------- Co-authored-by: Ahmed Elrefaey <68241710+a7medev@users.noreply.github.com> chore(android): bump android sdk to v13.3.0 (#1261) chore(ios): bump sdk to v13.3.0 (#1262) release: v13.3.0 (#1263) chore: remove duplicate app flows entries in changelog (#1264) chore: remove duplicate execution traces deprecation in changelog (#1265) feat: navigation tracking support with expo router (#1270) * feat: add screen tracker on screen change listener and tests * feat (example): add screen change listener chore: enhance expo router tracking support (#1272) ci: generalize enterprise releases (#1275) ci: run tests before enterprise releases (#1271) ci: publish snapshots to npm (#1274) fix: PR comments fix(ios): network log empty response body (#1273) fix: drop non-error objects when reporting errors (#1279) * Fix: omitted non-error objects when logging errors * ci: publish snapshots to npm (#1274) * Fix: omitted non-error objects when logging errors * fix: use warn instead of logs Co-authored-by: Ahmed Elrefaey <68241710+a7medev@users.noreply.github.com> * Update CHANGELOG.md Co-authored-by: Ahmed Elrefaey <68241710+a7medev@users.noreply.github.com> * fix: merge issues --------- Co-authored-by: Ahmed Elrefaey <68241710+a7medev@users.noreply.github.com> feat: capture client error in the network interceptor (#1257) * feat/support-capture-client-error-in-xhr-requests --------- Co-authored-by: Abdelhamid Nasser <38096011+abdelhamid-f-nasser@users.noreply.github.com> Co-authored-by: Ahmed Elrefaey <68241710+a7medev@users.noreply.github.com> Co-authored-by: kholood <keassa@instabug.com> fix: APM test cases
1 parent abfae99 commit d6e9f14

File tree

104 files changed

+3075
-1008
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+3075
-1008
lines changed

‎.circleci/config.yml‎

Lines changed: 220 additions & 123 deletions
Large diffs are not rendered by default.

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Distribution
22
dist/
33
bin/
4+
upload/*
5+
!upload/package.json
46

57
# NodeJS
68
node_modules/

‎CHANGELOG.md‎

Lines changed: 64 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,64 @@
11
# Changelog
22

3+
## [Unreleased](https://github.com/Instabug/Instabug-React-Native/compare/v13.3.0...dev)
4+
5+
### Added
6+
7+
- Add support for Expo Router navigation tracking ([#1270](https://github.com/Instabug/Instabug-React-Native/pull/1270)).
8+
- Enhance the network interceptor to capture more client error messages ([#1257](https://github.com/Instabug/Instabug-React-Native/pull/1257)).
9+
10+
### Fixed
11+
12+
- Drop non-error objects reported as crashes since they don't have a stack trace ([#1279](https://github.com/Instabug/Instabug-React-Native/pull/1279)).
13+
- Fix APM network logging on iOS when the response body is missing or empty. ([#1273](https://github.com/Instabug/Instabug-React-Native/pull/1273)).
14+
15+
## [13.3.0](https://github.com/Instabug/Instabug-React-Native/compare/v13.2.0...v13.3.0) (August 4, 2024)
16+
17+
### Added
18+
19+
- Add support for Feature Flags APIs `Instabug.addFeatureFlags`, `Instabug.removeFeatureFlags` and `Instabug.clearAllFeatureFlags` ([#1230](https://github.com/Instabug/Instabug-React-Native/pull/1230)).
20+
- 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)).
21+
22+
### Changed
23+
24+
- 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).
25+
- 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).
26+
27+
### Deprecated
28+
29+
- 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)).
30+
31+
### Fixed
32+
33+
- Fix APM network logging on Android ([#1253](https://github.com/Instabug/Instabug-React-Native/pull/1253)).
34+
- Fix an OOM (out-of-memory) crash while saving network logs on Android ([#1244](https://github.com/Instabug/Instabug-React-Native/pull/1244)).
35+
36+
## [13.2.0](https://github.com/Instabug/Instabug-React-Native/compare/v13.1.1...v13.2.0) (July 7, 2024)
37+
38+
### Changed
39+
40+
- Bump Instabug Android SDK to v13.2.0 ([#1245](https://github.com/Instabug/Instabug-React-Native/pull/1245)). [See release notes](https://github.com/Instabug/Instabug-Android/releases/tag/v13.2.0).
41+
- Bump Instabug iOS SDK to v13.2.0 ([#1246](https://github.com/Instabug/Instabug-React-Native/pull/1246)). [See release notes](https://github.com/Instabug/Instabug-iOS/releases/tag/13.2.0).
42+
43+
### Fixed
44+
45+
- Change parameters used inside inner classes to `final` in Android code to maintain compatibility with Java 7 and earlier ([#1239](https://github.com/Instabug/Instabug-React-Native/pull/1239)).
46+
47+
## [13.1.1](https://github.com/Instabug/Instabug-React-Native/compare/v13.0.5...v13.1.1) (June 6, 2024)
48+
49+
### Added
50+
51+
- Add support for passing a grouping fingerprint, error level, and user attributes to the `CrashReporting.reportError` non-fatals API ([#1194](https://github.com/Instabug/Instabug-React-Native/pull/1194)).
52+
53+
### Changed
54+
55+
- Bump Instabug iOS SDK to v13.1.0 ([#1227](https://github.com/Instabug/Instabug-React-Native/pull/1227)). [See release notes](https://github.com/Instabug/Instabug-iOS/releases/tag/13.1.0).
56+
- Bump Instabug android SDK to v13.1.1 ([#1228](https://github.com/Instabug/Instabug-React-Native/pull/1228)). [See release notes](https://github.com/Instabug/android/releases/tag/v13.1.0).
57+
58+
### Fixed
59+
60+
- Read `INSTABUG_APP_TOKEN` from system environment when there is no default value ([#1232](https://github.com/Instabug/Instabug-React-Native/pull/1232)).
61+
362
## [13.0.5](https://github.com/Instabug/Instabug-React-Native/compare/v13.0.4...v13.0.5) (May 18, 2024)
463

564
### Changed
@@ -26,17 +85,17 @@
2685
- 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).
2786
- 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).
2887

29-
## [12.9.0](https://github.com/Instabug/Instabug-React-Native/compare/v12.8.0...v12.9.0) (April 2, 2024)
88+
### Deprecated
89+
90+
- 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)).
91+
92+
## [12.9.0](https://github.com/Instabug/Instabug-React-Native/compare/v12.8.0...12.9.0)(April 2, 2024)
3093

3194
### Added
3295

3396
- Adds symbol files upload script ([#1137](https://github.com/Instabug/Instabug-React-Native/pull/1137))
3497
- Support enabling NDK crash capturing on Android ([#1132](https://github.com/Instabug/Instabug-React-Native/pull/1132)).
3598

36-
### Deprecated
37-
38-
- 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)).
39-
4099
### Changed
41100

42101
- 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).

‎android/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ android {
5757
minSdkVersion getExtOrDefault('minSdkVersion').toInteger()
5858
targetSdkVersion getExtOrDefault('targetSdkVersion').toInteger()
5959
versionCode 1
60-
versionName "13.0.5"
60+
versionName "13.3.0"
6161
multiDexEnabled true
6262
ndk {
6363
abiFilters "armeabi-v7a", "x86"

‎android/native.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
project.ext.instabug = [
2-
version: '13.0.3'
2+
version: '13.3.0'
33
]
44

55
dependencies {

‎android/sourcemaps.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ String resolveVar(String name, String envKey, String defaultValue) {
9191
def env = System.getenv()
9292
def envValue = env.get(envKey)
9393

94-
if (envValue != null && envValue != defaultValue) {
94+
if (envValue != null && defaultValue !=null && envValue != defaultValue) {
9595
project.logger.warn "Environment variable `${envKey}` might have incorrect value, " +
9696
"make sure this was intentional:\n" +
9797
" Environment Value: ${envValue}\n" +

‎android/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<manifest package="com.instabug.reactlibrary"
1+
<manifest
22
xmlns:android="http://schemas.android.com/apk/res/android">
33

44
</manifest>

‎android/src/main/java/com/instabug/reactlibrary/ArgsRegistry.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import com.instabug.bug.BugReporting;
66
import com.instabug.bug.invocation.Option;
7+
import com.instabug.crash.models.IBGNonFatalException;
78
import com.instabug.featuresrequest.ActionType;
89
import com.instabug.library.InstabugColorTheme;
910
import com.instabug.library.InstabugCustomTextPlaceHolder.Key;
@@ -54,11 +55,19 @@ static Map<String, Object> getAll() {
5455
putAll(extendedBugReportStates);
5556
putAll(reproModes);
5657
putAll(sdkLogLevels);
58+
putAll(nonFatalExceptionLevel);
5759
putAll(locales);
5860
putAll(placeholders);
5961
}};
6062
}
6163

64+
public static ArgsMap<IBGNonFatalException.Level> nonFatalExceptionLevel = new ArgsMap<IBGNonFatalException.Level>() {{
65+
put("nonFatalErrorLevelCritical", IBGNonFatalException.Level.CRITICAL);
66+
put("nonFatalErrorLevelError", IBGNonFatalException.Level.ERROR);
67+
put("nonFatalErrorLevelWarning", IBGNonFatalException.Level.WARNING);
68+
put("nonFatalErrorLevelInfo", IBGNonFatalException.Level.INFO);
69+
}};
70+
6271
static ArgsMap<InstabugInvocationEvent> invocationEvents = new ArgsMap<InstabugInvocationEvent>() {{
6372
put("invocationEventNone", InstabugInvocationEvent.NONE);
6473
put("invocationEventShake", InstabugInvocationEvent.SHAKE);

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

Lines changed: 47 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,16 @@
55
import android.util.Log;
66

77
import androidx.annotation.NonNull;
8+
import androidx.annotation.Nullable;
9+
810
import com.facebook.react.bridge.Promise;
911
import com.facebook.react.bridge.ReactApplicationContext;
1012
import com.facebook.react.bridge.ReactContextBaseJavaModule;
1113
import com.facebook.react.bridge.ReactMethod;
1214
import com.instabug.apm.APM;
1315
import com.instabug.apm.model.ExecutionTrace;
1416
import com.instabug.apm.networking.APMNetworkLogger;
17+
import com.instabug.apm.networkinterception.cp.APMCPNetworkLog;
1518
import com.instabug.reactlibrary.utils.MainThreadHandler;
1619

1720
import org.json.JSONException;
@@ -312,56 +315,59 @@ public void run() {
312315
});
313316
}
314317

315-
/**
316-
* Send Apm network log by Reflection
317-
*/
318318
@ReactMethod
319-
public void networkLog(String networkData) throws JSONException {
320-
try{
321-
APMNetworkLogger apmNetworkLogger = new APMNetworkLogger();
322-
JSONObject jsonObject = new JSONObject(networkData);
323-
final String requestUrl = (String) jsonObject.get("url");
324-
final String requestBody = (String) jsonObject.get("requestBody");
325-
final String responseBody = (String) jsonObject.get("responseBody");
326-
final String requestMethod = (String) jsonObject.get("method");
327-
//--------------------------------------------
328-
final String requestContentType = (String) jsonObject.get("requestContentType");
329-
final String responseContentType = (String) jsonObject.get("contentType");
330-
//--------------------------------------------
331-
final long requestBodySize = ((Number) jsonObject.get("requestBodySize")).longValue();
332-
final long responseBodySize = ((Number) jsonObject.get("responseBodySize")).longValue();
333-
//--------------------------------------------
334-
final String errorDomain = (String) jsonObject.get("errorDomain");
335-
final Integer statusCode = (Integer) jsonObject.get("responseCode");
336-
final long requestDuration = ((Number) jsonObject.get("duration")).longValue();
337-
final long requestStartTime = ((Number) jsonObject.get("startTime")).longValue() * 1000;
338-
final String requestHeaders = (String) jsonObject.get("requestHeaders").toString();
339-
final String responseHeaders = (String) jsonObject.get("responseHeaders").toString();
340-
final String errorMessage;
341-
if(errorDomain.equals("")) {
342-
errorMessage = null;
343-
} else {
344-
errorMessage = errorDomain;
345-
}
346-
//--------------------------------------------
347-
String gqlQueryName = null;
348-
if(jsonObject.has("gqlQueryName")){
349-
gqlQueryName = (String) jsonObject.get("gqlQueryName");
350-
}
351-
final String serverErrorMessage = (String) jsonObject.get("serverErrorMessage");
319+
private void networkLogAndroid(final double requestStartTime,
320+
final double requestDuration,
321+
final String requestHeaders,
322+
final String requestBody,
323+
final double requestBodySize,
324+
final String requestMethod,
325+
final String requestUrl,
326+
final String requestContentType,
327+
final String responseHeaders,
328+
final String responseBody,
329+
final double responseBodySize,
330+
final double statusCode,
331+
final String responseContentType,
332+
@Nullable final String errorDomain,
333+
@Nullable final String gqlQueryName,
334+
@Nullable final String serverErrorMessage) {
335+
try {
336+
APMNetworkLogger networkLogger = new APMNetworkLogger();
337+
338+
final boolean hasError = errorDomain != null && !errorDomain.isEmpty();
339+
final String errorMessage = hasError ? errorDomain : null;
352340

353341
try {
354-
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);
342+
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);
355343
if (method != null) {
356-
method.invoke(apmNetworkLogger, requestStartTime, requestDuration, requestHeaders, requestBody, requestBodySize, requestMethod, requestUrl, requestContentType, responseHeaders, responseBody, responseBodySize, statusCode, responseContentType, errorMessage, gqlQueryName, serverErrorMessage);
344+
method.invoke(
345+
networkLogger,
346+
(long) requestStartTime * 1000,
347+
(long) requestDuration,
348+
requestHeaders,
349+
requestBody,
350+
(long) requestBodySize,
351+
requestMethod,
352+
requestUrl,
353+
requestContentType,
354+
responseHeaders,
355+
responseBody,
356+
(long)responseBodySize,
357+
(int) statusCode,
358+
responseContentType,
359+
errorMessage,
360+
gqlQueryName,
361+
serverErrorMessage,
362+
null
363+
);
357364
} else {
358-
Log.e("IB-CP-Bridge", "apmNetworkLogByReflection was not found by reflection");
365+
Log.e("IB-CP-Bridge", "APMNetworkLogger.log was not found by reflection");
359366
}
360367
} catch (Throwable e) {
361368
e.printStackTrace();
362369
}
363-
}
364-
catch(Throwable e) {
370+
} catch(Throwable e) {
365371
e.printStackTrace();
366372
}
367373
}

0 commit comments

Comments
 (0)