Xml http request distributed tracing (#105)

* NR-362528_DT_FR

* release 7.0.5

Author: ndesai-newrelic

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+# 7.0.5
+
+## Improvements
+
+- Implemented Distributed Tracing support for `XMLHttpRequest`.
+- Updated the Native Android agent to version 7.6.4.
+
+
 # 7.0.4
 
 ## Improvements

package.json

@@ -1,6 +1,6 @@
 {
   "name": "newrelic-cordova-plugin",
-  "version": "7.0.4",
+  "version": "7.0.5",
   "description": "New Relic Cordova Plugin for iOS and Android",
   "repo": "https://github.com/newrelic/newrelic-cordova-plugin/",
   "scripts": {

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="7.0.4">
+  id="newrelic-cordova-plugin" version="7.0.5">
   <name>NewRelic</name>
   <description>New Relic Cordova Plugin for iOS and Android</description>
   <author>New Relic</author>
@@ -89,7 +89,7 @@
 
   <platform name="android">
     <preference name="ANDROID_APP_TOKEN" default="x" />
-    <preference name="ANDROID_AGENT_VER" default="7.6.2" />
+    <preference name="ANDROID_AGENT_VER" default="7.6.4" />
 
     <config-file target="AndroidManifest.xml" parent="/*">
       <uses-permission android:name="android.permission.INTERNET" />

src/android/NewRelicCordovaPlugin.java

@@ -323,6 +323,9 @@ public void run() {
                                 dtHeaders.put(NRTraceConstants.TRACE_ID, traceId);
                                 dtHeaders.put(NRTraceConstants.ID, spanId);
                                 dtHeaders.put(NRTraceConstants.GUID, spanId);
+                                dtHeaders.put(NRTraceConstants.ACCOUNT_ID,accountId);
+                                dtHeaders.put(NRTraceConstants.APPLICATION_ID,applicationId);
+                                dtHeaders.put(NRTraceConstants.TRUST_ACCOUNT_KEY,vendor.substring(0,vendor.indexOf("@")));
 
 
                                 callbackContext.success(dtHeaders);
@@ -595,6 +598,9 @@ protected static final class NRTraceConstants {
         public static final String TRACE_ID = "trace.id";
         public static final String GUID = "guid";
         public static final String ID = "id";
+        public static final String ACCOUNT_ID = "account.id";
+        public static final String APPLICATION_ID = "application.id";
+        public static final String TRUST_ACCOUNT_KEY = "trust.account.key";
     }
 
 }

src/ios/NewRelicCordovaPlugin.m

@@ -463,8 +463,36 @@ - (void)generateDistributedTracingHeaders:(CDVInvokedUrlCommand *)command {
 
     NSDictionary<NSString*,NSString*>* headers =  [NewRelic generateDistributedTracingHeaders];
 
-    pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:headers];
-    
+    NSMutableDictionary *mutableDictionary = [headers mutableCopy];
+
+    NSData *decodedData = [[NSData alloc] initWithBase64EncodedString:headers[@"newrelic"] options:0];
+          
+    NSError *error = nil;
+    NSDictionary *jsonObject = [NSJSONSerialization JSONObjectWithData:decodedData options:0 error:&error];
+
+          if (error) {
+              NSLog(@"Error parsing JSON: %@", error);
+          } else {
+              NSLog(@"JSON Object: %@", jsonObject);
+              // Access individual values from the JSON object
+              NSDictionary *dDictionary = jsonObject[@"d"];
+              NSString *acNumber = dDictionary[@"ac"];
+              NSString *apNumber = dDictionary[@"ap"];
+              NSString *tkNumber = dDictionary[@"tk"];
+
+              
+              
+              [mutableDictionary setObject:acNumber forKey:@"application.id"];
+              [mutableDictionary setObject:apNumber forKey:@"account.id"];
+              
+              if(tkNumber != nil) {
+                  [mutableDictionary setObject:tkNumber forKey:@"trust.account.key"];
+              } else {
+                  [mutableDictionary setObject:acNumber forKey:@"trust.account.key"];
+              }
+          }
+    pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:mutableDictionary];
+        
     [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
 
 }

www/js/newrelic.js

@@ -4,6 +4,11 @@
      */
 
     var exec = require("cordova/exec");
+
+    var accountId = "";
+    var applicationId = "";
+    var trustAccountKey = "";
+    
 
     var NewRelic = {
 
@@ -501,8 +506,18 @@
         networkRequest.method = method;
         networkRequest.bytesSent = 0;
         networkRequest.startTime = Date.now();
-        return originalXhrOpen.apply(this, arguments)
-
+        try {
+            return originalXhrOpen.apply(this, arguments)
+            } catch (e) {
+                console.error(e);
+            } finally{
+                    var headers = generateTracePayload();
+                   
+            this.setRequestHeader("newrelic", headers['newrelic']);
+            this.setRequestHeader("traceparent", headers['traceparent']);
+            this.setRequestHeader("tracestate", headers['tracestate']);
+             networkRequest.params = headers;
+                }
     }
 
 
@@ -680,6 +695,94 @@
         });
     }
 
+    function generateTracePayload () {
+     
+        if (!accountId || !applicationId) {
+          return null
+        }
+    
+        var guid = generateSpanId()
+        var traceId = generateTraceId()
+        var timestamp = Date.now()
+    
+        var payload = {
+          guid,
+          traceId
+        }
+        payload.id = guid;
+        payload['trace.id'] = payload.traceId;
+    
+          payload.traceparent = generateTraceContextParentHeader(guid, traceId)
+          payload.tracestate = generateTraceContextStateHeader(guid, timestamp,
+            accountId, applicationId, trustAccountKey)
+
+          payload.newrelic = generateTraceHeader(guid, traceId, timestamp, accountId,
+            applicationId, trustAccountKey)
+        
+    
+        return payload
+      }
+
+      function generateSpanId() {
+        return generateRandomHexString(16);
+      }
+
+      function generateTraceId() {
+        return generateRandomHexString(32);
+      }
+
+    function generateRandomHexString(length) {
+        const chars = '0123456789abcdef';
+        let result = '';
+        for (let i = 0; i < length; i++) {
+            result += chars[Math.floor(Math.random() * chars.length)];
+        }
+        return result;
+    }
+    
+      function generateTraceContextParentHeader (spanId, traceId) {
+        return '00-' + traceId + '-' + spanId + '-01'
+      }
+    
+      function generateTraceContextStateHeader (spanId, timestamp, accountId, appId, trustKey) {
+        var version = 0
+        var transactionId = ''
+        var parentType = 2
+        var sampled = ''
+        var priority = ''
+    
+        return trustKey + '@nr=' + version + '-' + parentType + '-' + accountId +
+          '-' + appId + '-' + spanId + '-' + transactionId + '-' + sampled + '-' + priority + '-' + timestamp
+      }
+    
+      function generateTraceHeader (spanId, traceId, timestamp, accountId, appId, trustKey) {
+    
+        var payload = {
+          v: [0, 2],
+          d: {
+            ty: 'Mobile',
+            ac: accountId,
+            ap: appId,
+            id: spanId,
+            tr: traceId,
+            ti: timestamp
+          }
+        }
+        if (trustKey && accountId !== trustKey) {
+          payload.d.tk = trustKey
+        }
+    
+        return btoa(JSON.stringify(payload))
+      }
+
+      document.addEventListener('deviceready', function () {
+        NewRelic.generateDistributedTracingHeaders().then((headers) => {
+            accountId = headers['account.id'];
+            applicationId = headers['application.id'];
+            trustAccountKey = headers['trust.account.key'];
+        });
+    });
+
     function isValidURL(url) {
         try {
           const newUrl = new URL(url);