simplify return values from request tracker plugin

Author: gingerbenw

packages/plugin-http-errors/http-errors.js

@@ -93,42 +93,38 @@ module.exports = (config = {}, global = window) => {
           const redactedUrl = redactQueryParameters(url, redactedKeys)
           const redactedQueryParams = parseQueryParams(redactedUrl)
 
-          // Extract request headers
-          const requestHeaders = startContext.headers || {}
-
-          // Extract request body
-          let requestBody = ''
-          let requestBodyLength = 0
-          const initialBody = startContext.body
-          if (initialBody) {
-            const bodyStr = String(initialBody)
-            requestBody = truncate(initialBody, maxRequestSize)
-            requestBodyLength = bodyStr.length // Report the original length before truncating
+          // Redact request and response headers
+          const requestHeaders = redactValues(startContext.headers || {}, redactedKeys)
+          const responseHeaders = redactValues(endContext.headers || {}, redactedKeys)
+
+          // Truncate request body
+          let requestBody
+          let requestBodyLength
+          if (startContext.body) {
+            requestBody = truncate(startContext.body, maxRequestSize)
+            requestBodyLength = startContext.body.length // Report the original length before truncating
           }
 
-          // Extract response headers
-          const responseHeaders = endContext.headers || {}
-
-          // Extract response body - XHR only
+          // Truncate response body - XHR only
           let responseBody
           let responseBodyLength
-          if (endContext.xhr && endContext.xhr.responseText) {
-            responseBody = truncate(endContext.xhr.responseText, maxRequestSize)
-            responseBodyLength = endContext.xhr.responseText.length
+          if (endContext.body) {
+            responseBody = truncate(endContext.body, maxRequestSize)
+            responseBodyLength = endContext.body.length // Report the original length before truncating
           }
 
           // Create request and response objects for callback
           const requestObj = {
             url: redactedUrl,
             httpMethod: method,
-            headers: redactValues(requestHeaders, redactedKeys),
+            headers: requestHeaders,
             params: redactedQueryParams,
             body: requestBody,
             bodyLength: requestBodyLength
           }
           const responseObj = {
             statusCode: endContext.status,
-            headers: redactValues(responseHeaders, redactedKeys),
+            headers: responseHeaders,
             body: responseBody,
             bodyLength: responseBodyLength
           }

packages/request-tracker/lib/fetch-tracker.js

@@ -70,8 +70,7 @@ function createFetchTracker (global, options = {}) {
             endTime: Date.now(),
             status: response.status,
             state: 'success',
-            headers: headersToObject(response.headers),
-            response
+            headers: headersToObject(response.headers)
           })
           return response
         },

packages/request-tracker/lib/xhr-tracker.js

@@ -72,7 +72,7 @@ function createXhrTracker (global, options = {}) {
             status: this.status,
             state: 'success',
             headers: getResponseHeaders(),
-            xhr: this
+            body: this.responseText
           })
         }
 
@@ -81,7 +81,7 @@ function createXhrTracker (global, options = {}) {
             endTime: Date.now(),
             state: 'error',
             headers: getResponseHeaders(),
-            xhr: this
+            body: this.responseText
           })
         }
 

packages/request-tracker/test/request-tracker.test.js

@@ -268,7 +268,8 @@ describe('@bugsnag/request-tracker', () => {
         endTime: expect.any(Number),
         status: 200,
         state: 'success',
-        xhr: xhr
+        headers: {},
+        body: undefined
       }))
     })
 
@@ -288,7 +289,8 @@ describe('@bugsnag/request-tracker', () => {
       expect(onRequestEnd).toHaveBeenCalledWith(expect.objectContaining({
         endTime: expect.any(Number),
         state: 'error',
-        xhr: xhr
+        headers: {},
+        body: undefined
       }))
     })