Merge branch 'NR-443292-dom-mutations' into tmp-user-frustrations

Author: ptang-nr

.github/actions/build-ab/templates/released.js

@@ -1,6 +1,7 @@
 // config
 window.NREUM={
   init: {
+    feature_flags: ['soft_nav'],
     distributed_tracing: {
       enabled: true
     },

src/common/harvest/harvester.js

@@ -135,22 +135,24 @@ export function send (agentRef, { endpoint, targetApp, payload, localOpts = {},
 
   const fullUrl = `${url}?${baseParams}${payloadParams}`
   const gzip = !!qs?.attributes?.includes('gzip')
-  if (!gzip) {
-    if (endpoint !== EVENTS) body = stringify(body) // all features going to 'events' endpoint should already be serialized & stringified
-    // Warn--once per endpoint--if the agent tries to send large payloads
-    if (body.length > 750000 && (warnings[endpoint] = (warnings[endpoint] || 0) + 1) === 1) warn(28, endpoint)
-  }
+
+  // all gzipped data is already in the correct format and needs no transformation
+  // all features going to 'events' endpoint should already be serialized & stringified
+  let stringBody = gzip || endpoint === EVENTS ? body : stringify(body)
 
   // If body is null, undefined, or an empty object or array after stringifying, send an empty string instead.
-  if (!body || body.length === 0 || body === '{}' || body === '[]') body = ''
+  if (!stringBody || stringBody.length === 0 || stringBody === '{}' || stringBody === '[]') stringBody = ''
+
+  // Warn--once per endpoint--if the agent tries to send large payloads
+  if (endpoint !== BLOBS && stringBody.length > 750000 && (warnings[endpoint] = (warnings[endpoint] || 0) + 1) === 1) warn(28, endpoint)
 
   const headers = [{ key: 'content-type', value: 'text/plain' }]
 
   /* Since workers don't support sendBeacon right now, they can only use XHR method.
       Because they still do permit synch XHR, the idea is that at final harvest time (worker is closing),
       we just make a BLOCKING request--trivial impact--with the remaining data as a temp fill-in for sendBeacon.
      Following the removal of img-element method. */
-  let result = submitMethod({ url: fullUrl, body, sync: localOpts.isFinalHarvest && isWorkerScope, headers })
+  let result = submitMethod({ url: fullUrl, body: stringBody, sync: localOpts.isFinalHarvest && isWorkerScope, headers })
 
   if (!localOpts.isFinalHarvest && cbFinished) { // final harvests don't hold onto buffer data (shouldRetryOnFail is false), so cleanup isn't needed
     if (submitMethod === xhrMethod) {
@@ -176,17 +178,23 @@ export function send (agentRef, { endpoint, targetApp, payload, localOpts = {},
     }
 
     function trackHarvestMetadata () {
-      const hasReplay = baseParams.includes('hr=1')
-      const hasTrace = baseParams.includes('ht=1')
-      const hasError = qs?.attributes?.includes('hasError=true')
-
-      handle('harvest-metadata', [{
-        [featureName]: {
-          ...(hasReplay && { hasReplay }),
-          ...(hasTrace && { hasTrace }),
-          ...(hasError && { hasError })
-        }
-      }], undefined, FEATURE_NAMES.metrics, agentRef.ee)
+      try {
+        if (featureName === FEATURE_NAMES.jserrors && !body?.err) return
+
+        const hasReplay = baseParams.includes('hr=1')
+        const hasTrace = baseParams.includes('ht=1')
+        const hasError = qs?.attributes?.includes('hasError=true')
+
+        handle('harvest-metadata', [{
+          [featureName]: {
+            ...(hasReplay && { hasReplay }),
+            ...(hasTrace && { hasTrace }),
+            ...(hasError && { hasError })
+          }
+        }], undefined, FEATURE_NAMES.metrics, agentRef.ee)
+      } catch (err) {
+      // do nothing
+      }
     }
   }
 

src/common/url/extract-url.js

@@ -5,13 +5,13 @@
 import { globalScope } from '../constants/runtime'
 import { gosNREUMOriginals } from '../window/nreum'
 
+/**
+ * Extracts a URL from various target types.
+ * @param {string|Request|URL} target - The target to extract the URL from. It can be a string, a Fetch Request object, or a URL object.
+ * @returns {string|undefined} The extracted URL as a string, or undefined if the target type is not supported.
+ */
 export function extractUrl (target) {
-  if (typeof target === 'string') {
-    return target
-  } else if (typeof target === 'object' && target instanceof gosNREUMOriginals().o.REQ) {
-    return target.url
-  } else if (globalScope?.URL && typeof target === 'object' && target instanceof URL) {
-    return target.href
-  }
-  return undefined
+  if (typeof target === 'string') return target
+  else if (target instanceof gosNREUMOriginals().o.REQ) return target.url
+  else if (globalScope?.URL && target instanceof URL) return target.href
 }

src/features/generic_events/instrument/index.js

@@ -87,21 +87,24 @@ export class Instrument extends InstrumentBase {
 
     wrapFetch(this.ee)
     wrapXhr(this.ee)
-    this.ee.on('send-xhr-start', (_, xhr) => {
-      emitIfNonAgentTraffic.call(this, parseUrl(xhr.responseURL))
+    this.ee.on('open-xhr-start', (args, xhr) => {
+      if (!isInternalTraffic(args[1])) {
+        xhr.addEventListener('readystatechange', () => {
+          if (xhr.readyState === 2) { // HEADERS_RECEIVED
+            handle('uaXhr', [], undefined, FEATURE_NAMES.genericEvents, this.ee)
+          }
+        })
+      }
     })
     this.ee.on('fetch-start', (fetchArguments) => {
-      if (fetchArguments.length >= 1) { emitIfNonAgentTraffic.call(this, parseUrl(extractUrl(fetchArguments[0]))) }
+      if (fetchArguments.length >= 1 && !isInternalTraffic(extractUrl(fetchArguments[0]))) {
+        handle('uaXhr', [], undefined, FEATURE_NAMES.genericEvents, this.ee)
+      }
     })
 
-    function emitIfNonAgentTraffic (parsedUrl) {
-      try {
-        let host
-        if (parsedUrl) host = parsedUrl.hostname + ':' + parsedUrl.port
-        if (host && !agentRef.beacons.includes(host)) {
-          handle('uaXhr', [], undefined, FEATURE_NAMES.genericEvents, this.ee)
-        }
-      } catch {}
+    function isInternalTraffic (url) {
+      const parsedUrl = parseUrl(url)
+      return agentRef.beacons.includes(parsedUrl.hostname + ':' + parsedUrl.port)
     }
 
     /** If any of the sources are active, import the aggregator. otherwise deregister */

tests/components/generic_events/instrument/index.test.js

@@ -179,25 +179,37 @@ describe('User frustrations - XMLHttpRequest', () => {
 class MockXMLHttpRequest {
   constructor () {
     this.readyState = 0
-    this.status = 200
+    this.status = 0
     this.responseText = ''
     this.responseURL = ''
-    this.onreadystatechange = null
+    this._url = ''
+  }
+
+  onreadystatechange (url) {
+    if (this.readyState === 1) {
+      this._url = url
+    } else if (this.readyState === 2) {
+      this.responseURL = this._url
+    }
+    if (this._onreadystatechange) this._onreadystatechange()
   }
 
   open (method, url) {
     this.method = method
-    this.responseURL = url
     this.readyState = 1
+    this.onreadystatechange(url)
   }
 
   send () {
-    this.readyState = 4
+    this.readyState = 2
     this.responseText = 'Mock response'
-    if (this.onreadystatechange) {
-      this.onreadystatechange()
-    }
+    this.status = 200
+    this.onreadystatechange()
   }
 
-  addEventListener = jest.fn()
+  addEventListener = (event, handler) => {
+    if (event === 'readystatechange' && typeof handler === 'function') {
+      this._onreadystatechange = handler
+    }
+  }
 }