change: handle headers in request-tracker

Author: gingerbenw

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

@@ -4,11 +4,10 @@
  */
 
 const extractDomain = require('./lib/extract-domain')
-const headersToObject = require('./lib/headers-to-object')
+// const headersToObject = require('./lib/headers-to-object')
 const parseQueryParams = require('./lib/parse-query-params')
 const shouldCaptureStatusCode = require('./lib/should-capture-status-code')
 const truncate = require('./lib/truncate')
-const xhrResponseHeadersToObject = require('./lib/xhr-response-headers-to-object')
 const redactValues = require('./lib/redact-values')
 const redactQueryParameters = require('./lib/redact-query-parameters')
 
@@ -82,11 +81,7 @@ module.exports = (config = {}, global = window) => {
 
       function handleHttpError (startContext, endContext) {
         // Check if we should capture this status code
-        if (!shouldCaptureStatusCode(normalizedStatusCodes, endContext.status)) {
-          return
-        }
-
-        // console.log({ startContext, endContext })
+        if (!shouldCaptureStatusCode(normalizedStatusCodes, endContext.status)) return
 
         try {
           // Extract request information
@@ -112,12 +107,7 @@ module.exports = (config = {}, global = window) => {
           }
 
           // Extract response headers
-          let responseHeaders = {}
-          if (endContext.headers) {
-            responseHeaders = xhrResponseHeadersToObject(endContext.headers) // XHR case
-          } else if (endContext.response && endContext.response.headers) {
-            responseHeaders = headersToObject(endContext.response.headers) // Fetch case
-          }
+          const responseHeaders = endContext.headers || {}
 
           // Extract response body - XHR only
           let responseBody

packages/plugin-http-errors/lib/headers-to-object.js

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

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

@@ -7,7 +7,7 @@ module.exports = function (headers) {
   if (!headers) return {}
 
   const obj = {}
-  if (headers.entries) {
+  if (typeof headers.entries === 'function') {
     for (const [key, value] of headers.entries()) {
       obj[key] = value
     }

packages/request-tracker/lib/headers-to-object.js

@@ -1,3 +1,9 @@
+
+/**
+ * Converts an XHR header string to an object
+ * @param {string} headersString
+ * @returns {Object}
+ */
 module.exports = function (headersString) {
   if (!headersString) return {}
   const arr = headersString.trim().split(/[\r\n]+/)

…rs/lib/xhr-response-headers-to-object.js …acker/lib/xhr-header-string-to-object.jspackages/plugin-http-errors/lib/xhr-response-headers-to-object.js renamed to packages/request-tracker/lib/xhr-header-string-to-object.js packages/plugin-http-errors/lib/xhr-response-headers-to-object.js renamed to packages/request-tracker/lib/xhr-header-string-to-object.js

@@ -1,4 +1,5 @@
 const RequestTracker = require('./request-tracker')
+const xhrHeaderStringToObject = require('./xhr-header-string-to-object')
 
 /**
  * Create XHR request tracker with singleton pattern
@@ -63,12 +64,14 @@ function createXhrTracker (global, options = {}) {
 
         const { onRequestEnd } = tracker.start(context)
 
+        const getResponseHeaders = () => xhrHeaderStringToObject(this.getAllResponseHeaders())
+
         const handleLoad = () => {
           onRequestEnd({
             endTime: Date.now(),
             status: this.status,
             state: 'success',
-            headers: this.getAllResponseHeaders(),
+            headers: getResponseHeaders(),
             xhr: this
           })
         }
@@ -77,7 +80,7 @@ function createXhrTracker (global, options = {}) {
           onRequestEnd({
             endTime: Date.now(),
             state: 'error',
-            headers: this.getAllResponseHeaders(),
+            headers: getResponseHeaders(),
             xhr: this
           })
         }