Release 6.2.2 (#70)

* Add optional attributes for recordError (#69) * feat: add optional attributes parameter for javascript code * feat: handle optional attributes for record error in native code * test: add unit tests for optional attributes parameter in record error * feat: add boolean type for value in optional attributes for record error * test: modify test for record error to test boolean and number values in optional attributes * feat: update README documentation for record error to include optional attributes * Add optional attributes for recordError (#69) * feat: add optional attributes parameter for javascript code * feat: handle optional attributes for record error in native code * test: add unit tests for optional attributes parameter in record error * feat: add boolean type for value in optional attributes for record error * test: modify test for record error to test boolean and number values in optional attributes * feat: update README documentation for record error to include optional attributes * 1)Fixes the issue where the response body appears empty for HTTP requests. 2) Upgraded native Android agent to v7.0.0 * 1)Fixes the issue where the response body appears empty for HTTP requests. 2) Upgraded native Android agent to v7.0.0 --------- Co-authored-by: mchavez-newrelic <[email protected]>
newrelic · Jul 21, 2023 · b9c0b6b · b9c0b6b
1 parent 3cb2cfe
commit b9c0b6b
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+# 6.2.2
+
+### New in this release
+* Fixes the issue where the response body appears empty for HTTP requests.
+* Upgraded native Android agent to v7.0.0
+
 # 6.2.1
 
 ### New in this release

diff --git a/README.md b/README.md
@@ -244,7 +244,7 @@ By default, these configurations are already set to true on agent start.
 ```
 
 ## Error Reporting
-### recordError(err: [Error](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error)) : void;
+### recordError(err: [Error](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error), attributes?: {[key: string]: boolean | number | string}) : void;
 Records JavaScript errors for Cordova. It is useful to add this method by adding it to the error handler of the framework that you are using. Here are some examples below:
 
 ### Angular

diff --git a/plugin.xml b/plugin.xml
@@ -6,7 +6,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
-  id="newrelic-cordova-plugin" version="6.2.1">
+  id="newrelic-cordova-plugin" version="6.2.2">
   <name>NewRelic</name>
   <description>New Relic Cordova Plugin for iOS and Android</description>
   <author>New Relic</author>
@@ -18,16 +18,16 @@
     <engine name="cordova-android" version=">=5.0.0" />
   </engines>
 
-  <preference name="PLUGIN_VERSION" default="6.2.1" />
+  <preference name="PLUGIN_VERSION" default="6.2.2" />
   <preference name="CRASH_REPORTING_ENABLED" default="true" />
   <preference name="DISTRIBUTED_TRACING_ENABLED" default="true" />
   <preference name="INTERACTION_TRACING_ENABLED" default="true" />
   <preference name="DEFAULT_INTERACTIONS_ENABLED" default="true" />
   <preference name="LOGGING_ENABLED" default="true" />
   <preference name="LOG_LEVEL" default="default" />
   <preference name="WEB_VIEW_INSTRUMENTATION" default="true" />
-  <preference name="COLLECTOR_ADDRESS" default="x" />
-  <preference name="CRASH_COLLECTOR_ADDRESS" default="x" />
+  <preference name="COLLECTOR_ADDRESS" default="mobile-collector.newrelic.com" />
+  <preference name="CRASH_COLLECTOR_ADDRESS" default="mobile-crash.newrelic.com" />
   <preference name="FEDRAMP_ENABLED" default="false" />
 
   <platform name="ios">
@@ -78,7 +78,7 @@
 
   <platform name="android">
     <preference name="ANDROID_APP_TOKEN" default="x" />
-    <preference name="ANDROID_AGENT_VER" default="6.11.1" />
+    <preference name="ANDROID_AGENT_VER" default="7.0.0" />
 
     <config-file target="AndroidManifest.xml" parent="/*">
       <uses-permission android:name="android.permission.INTERNET" />

diff --git a/src/android/NewRelicCordovaPlugin.java b/src/android/NewRelicCordovaPlugin.java
@@ -208,12 +208,20 @@ public boolean execute(String action, JSONArray args, CallbackContext callbackCo
                     final String errorMessage = args.getString(1);
                     final String errorStack = args.getString(2);
                     final Boolean isFatal = args.getBoolean(3);
+                    final JSONObject attributesAsJson = args.getJSONObject(4);
 
                     HashMap<String, Object> exceptionMap = new HashMap<>();
                     try {
                         exceptionMap.put("name", errorName);
                         exceptionMap.put("message", errorMessage);
                         exceptionMap.put("isFatal", isFatal);
+                        if (attributesAsJson != null) {
+                            final Map<String, Object> attributes = new Gson().fromJson(String.valueOf(attributesAsJson),
+                                Map.class);
+                            for (String key : attributes.keySet()) {
+                                exceptionMap.put(key, attributes.get(key));
+                            }
+                        }
                     } catch (IllegalArgumentException e) {
                         Log.w("NRMA", e.getMessage());
                     }

diff --git a/src/ios/NewRelicCordovaPlugin.m b/src/ios/NewRelicCordovaPlugin.m
@@ -197,6 +197,7 @@ - (void)recordError:(CDVInvokedUrlCommand *)command {
     NSString* errorMessage = [command.arguments objectAtIndex:1];
     NSString* errorStack = [command.arguments objectAtIndex:2];
     NSString* isFatal = @"false";
+    NSDictionary* errorAttributes = [command.arguments objectAtIndex:4];
 
     if ([[command.arguments objectAtIndex:3] boolValue] == YES) {
         isFatal = @"true";
@@ -207,6 +208,11 @@ - (void)recordError:(CDVInvokedUrlCommand *)command {
     attributes[@"cause"] = errorMessage;
     attributes[@"reason"] = errorMessage;
     attributes[@"fatal"] = isFatal;
+    if (errorAttributes != nil && ![errorAttributes isKindOfClass:[NSNull class]]) {
+        for(id key in errorAttributes) {
+            attributes[key] = errorAttributes[key];
+        }
+    }
 
     NSMutableArray* stackTraceArr = [self parseStackTrace:errorStack];
     attributes[@"stackTraceElements"] = stackTraceArr;

diff --git a/tests/tests.js b/tests/tests.js
@@ -134,15 +134,29 @@ exports.defineAutoTests = () => {
       window.NewRelic.recordError(new ReferenceError);
       window.NewRelic.recordError(new Error);
 
+      // should parse errors with non-empty custom attributes
+      let errorAttributes = new Map([
+        ["errorKey1", "errorValue1"],
+        ["errorKey2", 2],
+        ["errorKey3", true]
+      ]);
+      window.NewRelic.recordError(exampleError, errorAttributes);
+
+      // should parse errors with null custom attributes
+      window.NewRelic.recordError(exampleError, null);
+
+      // should parse errors with empty custom attributes
+      window.NewRelic.recordError(exampleError, {});
+
       // Bad arguments
       window.NewRelic.recordError(undefined);
       window.NewRelic.recordError(null);
       window.NewRelic.recordError(123);
       window.NewRelic.recordError(true);
 
       let numOfNativeCalls = cordova.exec.calls.count() - window.console.warn.calls.count();
-      expect(numOfNativeCalls).toBe(6);
-      expect(window.NewRelic.recordError).toHaveBeenCalledTimes(10);
+      expect(numOfNativeCalls).toBe(9);
+      expect(window.NewRelic.recordError).toHaveBeenCalledTimes(13);
     });
 
     it('should parse JS error with missing fields', () => {

diff --git a/www/js/newrelic.js b/www/js/newrelic.js
@@ -125,8 +125,13 @@ var NewRelic = {
     /**
      * Records JavaScript errors for Cordova.
      * @param {Error} err The error to record.
+     * @param {Map<string, boolean|number|string>} attributes Optional attributes that will be appended to the handled exception event created in insights.
      */
-    recordError: function(err, cb, fail) {
+    recordError: function(err, attributes={}, cb, fail) {
+        let errorAttributes = attributes instanceof Map ? Object.fromEntries(attributes) : attributes;
+        if (attributes === null) {
+            errorAttributes = {};
+        }
         if (err) {
             var error;
 
@@ -139,7 +144,7 @@ var NewRelic = {
             }
 
             if(error !== undefined) {
-                cordova.exec(cb, fail, "NewRelicCordovaPlugin", "recordError", [error.name, error.message, error.stack, false]);
+                cordova.exec(cb, fail, "NewRelicCordovaPlugin", "recordError", [error.name, error.message, error.stack, false, errorAttributes]);
             } else {
                 window.console.warn('Undefined error in NewRelic.recordError');
             }
@@ -346,8 +351,13 @@ window.XMLHttpRequest.prototype.send = function (data) {
                 if (this.readyState === this.DONE) {
                     networkRequest.endTime = Date.now();
                     networkRequest.status = this.status;
+                    if(this.responseText !== undefined) {
                     networkRequest.bytesreceived = this.responseText.length;
                     networkRequest.body = this.responseText;
+                    } else {
+                        networkRequest.bytesreceived = 0;
+                        networkRequest.body = "";
+                    }
 
 
                     NewRelic.noticeHttpTransaction(networkRequest.url, networkRequest.method, networkRequest.status, networkRequest.startTime, networkRequest.endTime, networkRequest.bytesSent, networkRequest.bytesreceived, networkRequest.body);