npm - @newrelic/browser-agent - Versions diffs - 1.233.1 → 1.234.0 - Mend

@newrelic/browser-agent 1.233.1 → 1.234.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (97) hide show

package/dist/cjs/common/constants/env.cdn.js +1 -1
package/dist/cjs/common/constants/env.npm.js +1 -1
package/dist/cjs/common/event-emitter/contextual-ee.test.js +10 -10
package/dist/cjs/common/harvest/harvest-scheduler.test.js +2 -2
package/dist/cjs/common/harvest/harvest.js +4 -11
package/dist/cjs/common/harvest/harvest.test.js +224 -0
package/dist/cjs/common/url/encode.js +2 -2
package/dist/cjs/common/util/console.test.js +30 -0
package/dist/cjs/common/util/get-or-set.js +8 -1
package/dist/cjs/common/util/get-or-set.test.js +47 -0
package/dist/cjs/common/util/stringify.test.js +48 -0
package/dist/cjs/common/util/submit-data.js +15 -15
package/dist/cjs/common/util/submit-data.test.js +221 -0
package/dist/cjs/common/util/traverse.js +19 -27
package/dist/cjs/common/util/traverse.test.js +44 -0
package/dist/cjs/features/metrics/aggregate/endpoint-map.js +14 -0
package/dist/cjs/features/metrics/aggregate/index.js +3 -2
package/dist/cjs/features/metrics/instrument/index.js +0 -2
package/dist/cjs/features/page_view_event/aggregate/index.js +58 -44
package/dist/cjs/loaders/configure/configure.js +0 -1
package/dist/esm/common/constants/env.cdn.js +1 -1
package/dist/esm/common/constants/env.npm.js +1 -1
package/dist/esm/common/event-emitter/contextual-ee.test.js +10 -10
package/dist/esm/common/harvest/harvest-scheduler.test.js +2 -2
package/dist/esm/common/harvest/harvest.js +4 -11
package/dist/esm/common/harvest/harvest.test.js +222 -0
package/dist/esm/common/url/encode.js +2 -2
package/dist/esm/common/util/console.test.js +28 -0
package/dist/esm/common/util/get-or-set.js +8 -1
package/dist/esm/common/util/get-or-set.test.js +45 -0
package/dist/esm/common/util/stringify.test.js +46 -0
package/dist/esm/common/util/submit-data.js +15 -15
package/dist/esm/common/util/submit-data.test.js +219 -0
package/dist/esm/common/util/traverse.js +19 -27
package/dist/esm/common/util/traverse.test.js +42 -0
package/dist/esm/features/metrics/aggregate/endpoint-map.js +7 -0
package/dist/esm/features/metrics/aggregate/index.js +3 -2
package/dist/esm/features/metrics/instrument/index.js +0 -2
package/dist/esm/features/page_view_event/aggregate/index.js +58 -44
package/dist/esm/loaders/configure/configure.js +0 -1
package/dist/types/common/config/state/init.d.ts.map +1 -1
package/dist/types/common/context/shared-context.d.ts.map +1 -1
package/dist/types/common/harvest/harvest.d.ts.map +1 -1
package/dist/types/common/timer/timer.d.ts.map +1 -1
package/dist/types/common/util/get-or-set.d.ts +9 -1
package/dist/types/common/util/get-or-set.d.ts.map +1 -1
package/dist/types/common/util/submit-data.d.ts +14 -10
package/dist/types/common/util/submit-data.d.ts.map +1 -1
package/dist/types/common/util/traverse.d.ts +10 -1
package/dist/types/common/util/traverse.d.ts.map +1 -1
package/dist/types/common/window/nreum.d.ts.map +1 -1
package/dist/types/features/metrics/aggregate/endpoint-map.d.ts +8 -0
package/dist/types/features/metrics/aggregate/endpoint-map.d.ts.map +1 -0
package/dist/types/features/metrics/aggregate/index.d.ts.map +1 -1
package/dist/types/features/metrics/aggregate/polyfill-detection.es5.d.ts.map +1 -1
package/dist/types/features/metrics/instrument/index.d.ts.map +1 -1
package/dist/types/features/page_view_event/aggregate/index.d.ts.map +1 -1
package/dist/types/features/page_view_event/instrument/index.d.ts.map +1 -1
package/dist/types/features/utils/handler-cache.d.ts.map +1 -1
package/dist/types/loaders/configure/configure.d.ts.map +1 -1
package/package.json +6 -2
package/src/common/config/state/init.js +0 -1
package/src/common/context/shared-context.js +0 -1
package/src/common/event-emitter/contextual-ee.test.js +10 -10
package/src/common/harvest/harvest-scheduler.test.js +2 -2
package/src/common/harvest/harvest.js +5 -9
package/src/common/harvest/harvest.test.js +169 -0
package/src/common/session/session-entity.test.js +0 -1
package/src/common/timer/timer.js +0 -1
package/src/common/url/encode.js +2 -2
package/src/common/util/console.test.js +34 -0
package/src/common/util/get-or-set.js +8 -1
package/src/common/util/get-or-set.test.js +58 -0
package/src/common/util/stringify.test.js +49 -0
package/src/common/util/submit-data.js +15 -16
package/src/common/util/submit-data.test.js +218 -0
package/src/common/util/traverse.js +18 -27
package/src/common/util/traverse.test.js +50 -0
package/src/common/window/nreum.js +0 -1
package/src/features/metrics/aggregate/endpoint-map.js +7 -0
package/src/features/metrics/aggregate/index.js +3 -2
package/src/features/metrics/aggregate/polyfill-detection.es5.js +0 -1
package/src/features/metrics/instrument/index.js +0 -2
package/src/features/page_view_event/aggregate/index.js +48 -51
package/src/features/page_view_event/instrument/index.js +0 -1
package/src/features/utils/handler-cache.js +0 -1
package/src/loaders/configure/configure.js +0 -1
package/dist/cjs/common/util/s-hash.js +0 -19
package/dist/cjs/features/metrics/instrument/workers-helper.js +0 -124
package/dist/esm/common/util/s-hash.js +0 -13
package/dist/esm/features/metrics/instrument/workers-helper.js +0 -119
package/dist/types/common/util/s-hash.d.ts +0 -2
package/dist/types/common/util/s-hash.d.ts.map +0 -1
package/dist/types/features/metrics/instrument/workers-helper.d.ts +0 -7
package/dist/types/features/metrics/instrument/workers-helper.d.ts.map +0 -1
package/src/common/util/s-hash.js +0 -14
package/src/features/metrics/instrument/workers-helper.js +0 -113

package/src/common/util/submit-data.test.js ADDED Viewed

@@ -0,0 +1,218 @@
+/**
+ * @jest-environment jsdom
+ * @jest-environment-options {"html": "<html><head><script></script></head><body></body></html>", "url": "https://example.com/"}
+ */
+import { submitData } from './submit-data'
+const mockWorkerScope = jest.fn().mockImplementation(() => false)
+jest.mock('./global-scope', () => ({
+  __esModule: true,
+  get isWorkerScope () {
+    return mockWorkerScope()
+  }
+}))
+const url = 'https://example.com/api'
+beforeEach(() => {
+  jest.restoreAllMocks()
+  mockWorkerScope.mockReturnValue(false)
+})
+describe('submitData.jsonp', () => {
+  // This test requires a script tag to exist in the html set by this file's jest-environment-options header block.
+  test('should return an HTMLScriptElement when called from a web window environment', () => {
+    mockWorkerScope.mockReturnValue(false)
+    const jsonp = 'callback'
+    const result = submitData.jsonp({ url, jsonp })
+    expect(result).toBeInstanceOf(HTMLScriptElement)
+    expect(result.type).toBe('text/javascript')
+    expect(result.src).toBe(url + '&jsonp=' + jsonp)
+  })
+  test('should try to use importScripts when called from a worker scope', () => {
+    mockWorkerScope.mockReturnValueOnce(true)
+    const jsonp = 'callback'
+    global.importScripts = jest.fn()
+    submitData.jsonp({ url, jsonp })
+    expect(importScripts).toHaveBeenCalledWith(url + '&jsonp=' + jsonp)
+    delete global.importScripts
+  })
+  test('should fall back to an xhrGet call and return false when called from a worker scope', () => {
+    mockWorkerScope.mockReturnValueOnce(true)
+    const jsonp = 'callback'
+    jest.spyOn(submitData, 'xhrGet').mockImplementation(jest.fn())
+    const result = submitData.jsonp({ url, jsonp })
+    expect(result).toBe(false)
+    expect(submitData.xhrGet).toHaveBeenCalledTimes(1)
+  })
+  test('should not throw an error if any error occurs during execution', () => {
+    jest.spyOn(document, 'createElement').mockImplementation(() => { throw new Error('message') })
+    const jsonp = 'callback'
+    expect(() => {
+      submitData.jsonp({ url, jsonp })
+    }).not.toThrow()
+  })
+})
+describe('submitData.xhrGet', () => {
+  test('should return an XMLHttpRequest object', () => {
+    const result = submitData.xhrGet({ url })
+    expect(result).toBeInstanceOf(XMLHttpRequest)
+  })
+  test('should not throw an error if URL is not provided', () => {
+    expect(() => {
+      submitData.xhrGet({})
+    }).not.toThrow()
+  })
+  test('should not throw an error if an invalid URL is provided', () => {
+    expect(() => {
+      submitData.xhrGet({ url: 'invalid url' })
+    }).not.toThrow()
+  })
+})
+describe('submitData.xhr', () => {
+  test('should return an XMLHttpRequest object', () => {
+    const result = submitData.xhrGet({ url })
+    expect(result).toBeInstanceOf(XMLHttpRequest)
+  })
+  test('should not throw an error if URL is not provided', () => {
+    expect(() => {
+      submitData.xhr({})
+    }).not.toThrow()
+  })
+  test('should not throw an error if an invalid URL is provided', () => {
+    expect(() => {
+      submitData.xhr({ url: 'invalid url' })
+    }).not.toThrow()
+  })
+  test('should send a POST request by default', () => {
+    jest.spyOn(XMLHttpRequest.prototype, 'open')
+    submitData.xhr({ url })
+    expect(XMLHttpRequest.prototype.open).toHaveBeenCalledWith('POST', url, true)
+  })
+  test('should send a GET request if specified', () => {
+    jest.spyOn(XMLHttpRequest.prototype, 'open')
+    submitData.xhr({ url, method: 'GET' })
+    expect(XMLHttpRequest.prototype.open).toHaveBeenCalledWith('GET', url, true)
+  })
+  // This test requires a same-origin url to be set by this file's jest-environment-options header block.
+  test('should send a request synchronously if specified', () => {
+    jest.spyOn(XMLHttpRequest.prototype, 'open')
+    submitData.xhr({ url, sync: true })
+    expect(XMLHttpRequest.prototype.open).toHaveBeenCalledWith('POST', url, false)
+  })
+  test('should set custom headers if provided', () => {
+    const headers = [{ key: 'Content-Type', value: 'application/json' }]
+    jest.spyOn(XMLHttpRequest.prototype, 'setRequestHeader')
+    submitData.xhr({ url, headers })
+    headers.forEach((header) => {
+      expect(XMLHttpRequest.prototype.setRequestHeader).toHaveBeenCalledWith(header.key, header.value)
+    })
+  })
+  test('should send a request with the specified body', () => {
+    const body = JSON.stringify({ key: 'value' })
+    jest.spyOn(XMLHttpRequest.prototype, 'send')
+    submitData.xhr({ url, body })
+    expect(XMLHttpRequest.prototype.send).toHaveBeenCalledWith(body)
+  })
+})
+describe('submitData.img', () => {
+  test('should return an HTMLImageElement', () => {
+    const imageUrl = 'https://example.com/image.png'
+    const result = submitData.img({ url: imageUrl })
+    expect(result).toBeInstanceOf(HTMLImageElement)
+  })
+  test('should not throw an error if URL is not provided', () => {
+    expect(() => {
+      submitData.img({})
+    }).not.toThrow()
+  })
+  test('should set the src attribute of the image element to the provided URL', () => {
+    const imageUrl = 'https://example.com/image.png'
+    const result = submitData.img({ url: imageUrl })
+    expect(result.src).toBe(imageUrl)
+  })
+})
+describe('submitData.beacon', () => {
+  test('should return true when beacon request succeeds', () => {
+    const body = JSON.stringify({ key: 'value' })
+    window.navigator.sendBeacon = {
+      bind: jest.fn(() => () => true)
+    }
+    const result = submitData.beacon({ url, body })
+    expect(result).toBe(true)
+  })
+  test('should return false when beacon request fails', () => {
+    const body = JSON.stringify({ key: 'value' })
+    window.navigator.sendBeacon = {
+      bind: jest.fn(() => () => { throw new Error('message') })
+    }
+    const result = submitData.beacon({ url, body })
+    expect(result).toBe(false)
+  })
+  test('should error if sendBeacon is not supported', () => {
+    const body = JSON.stringify({ key: 'value' })
+    window.navigator.sendBeacon = undefined
+    expect(() => {
+      submitData.beacon({ url, body })
+    }).toThrow()
+  })
+})

package/src/common/util/traverse.js CHANGED Viewed

@@ -3,34 +3,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
-// traverses an object and applies a fn to property values of a certain type
-export function applyFnToProps (obj, fn, type, ignoreKeys) {
+/**
+ * Applies a function to properties of a specified type in an object, recursively.
+ *
+ * @param {Object} obj - The object to apply the function to.
+ * @param {Function} fn - The function to apply to matching properties.
+ * @param {string} [type='string'] - The type of properties to apply the function to.
+ * @param {Array<string>} [ignoreKeys=[]] - The keys of properties to ignore and not modify.
+ * @returns {Object} - The object with function recursively applied.
+ */
+export function applyFnToProps (obj, fn, type = 'string', ignoreKeys = []) {
   if (!obj || typeof obj !== 'object') return obj
-  type = type || 'string'
-  ignoreKeys = ignoreKeys || []
-  return traverse(obj)
-  function traverse (obj) {
-    for (var property in obj) {
-      // eslint-disable-next-line
-      if (obj.hasOwnProperty(property)) {
-        if (typeof obj[property] === 'object') {
-          traverse(obj[property])
-        } else {
-          if (typeof obj[property] === type && !shouldIgnore(property)) obj[property] = fn(obj[property])
-        }
-      }
-    }
-    return obj
-  }
-  function shouldIgnore (key) {
-    var ignore = false
-    for (var i = 0; i < ignoreKeys.length; i++) {
-      if (ignoreKeys[i] === key) {
-        ignore = true
-        break
-      }
+  Object.keys(obj).forEach(property => {
+    if (typeof obj[property] === 'object') {
+      applyFnToProps(obj[property], fn, type, ignoreKeys)
+    } else {
+      if (typeof obj[property] === type && !ignoreKeys.includes(property)) obj[property] = fn(obj[property])
     }
-    return ignore
-  }
+  })
+  return obj
 }

package/src/common/util/traverse.test.js ADDED Viewed

@@ -0,0 +1,50 @@
+import { applyFnToProps } from './traverse'
+test.each(['not an object', null, undefined])('should return input unchanged when input is %p', (input) => {
+  const result = applyFnToProps(input, jest.fn())
+  expect(result).toEqual(input)
+})
+test('should apply the provided function only to properties of the specified type', () => {
+  const obj = {
+    stringProp: 'Hello',
+    numberProp: 42,
+    arrayProp: [1, 2, 3],
+    objectProp: { foo: 'bar' }
+  }
+  const fn = jest.fn((value) => value.toUpperCase())
+  const result = applyFnToProps(obj, fn, 'string')
+  expect(result.stringProp).toBe('HELLO')
+  expect(result.numberProp).toBe(42)
+  expect(result.arrayProp).toEqual([1, 2, 3])
+  expect(result.objectProp).toEqual({ foo: 'BAR' })
+  expect(fn).toHaveBeenCalledTimes(2)
+  expect(fn).toHaveBeenCalledWith('Hello')
+  expect(fn).toHaveBeenCalledWith('bar')
+})
+test('should ignore properties specified in ignoreKeys', () => {
+  const obj = {
+    a: 1,
+    b: 2,
+    c: 3
+  }
+  const fn = jest.fn((value) => value + 1)
+  const ignoreKeys = ['c']
+  const result = applyFnToProps(obj, fn, 'number', ignoreKeys)
+  expect(result.a).toBe(2)
+  expect(result.b).toBe(3)
+  expect(result.c).toBe(3)
+  expect(fn).toHaveBeenCalledTimes(2)
+  expect(fn).toHaveBeenCalledWith(1)
+  expect(fn).toHaveBeenCalledWith(2)
+})

package/src/common/window/nreum.js CHANGED Viewed

@@ -1,4 +1,3 @@
 import { now } from '../timing/now'
 import { globalScope } from '../util/global-scope'

package/src/features/metrics/aggregate/endpoint-map.js ADDED Viewed

@@ -0,0 +1,7 @@
+export const endpointMap = {
+  rum: '1',
+  events: 'Events',
+  ins: 'Ins',
+  jserrors: 'Jserrors',
+  resources: 'Resources'
+}

package/src/features/metrics/aggregate/index.js CHANGED Viewed

@@ -13,6 +13,7 @@ import { windowAddEventListener } from '../../../common/event-listener/event-lis
 import { isBrowserScope } from '../../../common/util/global-scope'
 import { AggregateBase } from '../../utils/aggregate-base'
 import { stringify } from '../../../common/util/stringify'
+import { endpointMap } from './endpoint-map'
 export class Aggregate extends AggregateBase {
   static featureName = FEATURE_NAME
@@ -125,7 +126,7 @@ export class Aggregate extends AggregateBase {
       // Capture per-agent bytes sent for each endpoint (see harvest) and RUM call (see page_view_event aggregator).
       Object.keys(agentRuntime.bytesSent).forEach(endpoint => {
         this.storeSupportabilityMetrics(
-          `PageSession/Endpoint/${endpoint.charAt(0).toUpperCase() + endpoint.slice(1)}/BytesSent`,
+          `PageSession/Endpoint/${endpointMap[endpoint]}/BytesSent`,
           agentRuntime.bytesSent[endpoint]
         )
       })
@@ -133,7 +134,7 @@ export class Aggregate extends AggregateBase {
       // Capture per-agent query bytes sent for each endpoint (see harvest) and RUM call (see page_view_event aggregator).
       Object.keys(agentRuntime.bytesSent).forEach(endpoint => {
         this.storeSupportabilityMetrics(
-          `PageSession/Endpoint/${endpoint.charAt(0).toUpperCase() + endpoint.slice(1)}/QueryBytesSent`,
+          `PageSession/Endpoint/${endpointMap[endpoint]}/QueryBytesSent`,
           agentRuntime.queryBytesSent[endpoint]
         )
       })

package/src/features/metrics/aggregate/polyfill-detection.es5.js CHANGED Viewed

@@ -1,4 +1,3 @@
 /**
  * This file is used as a replacement for the polyfill-detection.es5.js
  * file when running the polyfills webpack build.

package/src/features/metrics/instrument/index.js CHANGED Viewed

@@ -1,5 +1,4 @@
 import { InstrumentBase } from '../../utils/instrument-base'
-import { insertSupportMetrics } from './workers-helper'
 import { FEATURE_NAME, SUPPORTABILITY_METRIC_CHANNEL } from '../constants'
 import { handle } from '../../../common/event-emitter/handle'
 import { FEATURE_NAMES } from '../../../loaders/features/features'
@@ -8,7 +7,6 @@ export class Instrument extends InstrumentBase {
   static featureName = FEATURE_NAME
   constructor (agentIdentifier, aggregator, auto = true) {
     super(agentIdentifier, aggregator, FEATURE_NAME, auto)
-    insertSupportMetrics(tag => handle(SUPPORTABILITY_METRIC_CHANNEL, [tag], undefined, FEATURE_NAMES.metrics, this.ee))
     this.importAggregator()
   }
 }

package/src/features/page_view_event/aggregate/index.js CHANGED Viewed

@@ -2,22 +2,19 @@ import { handle } from '../../../common/event-emitter/handle'
 import { FEATURE_NAMES } from '../../../loaders/features/features'
 import { isiOS } from '../../../common/browser-version/ios-version'
 import { onTTFB } from 'web-vitals'
-import { mapOwn } from '../../../common/util/map-own'
-import { param, fromArray } from '../../../common/url/encode'
 import { addPT, addPN } from '../../../common/timing/nav-timing'
 import { stringify } from '../../../common/util/stringify'
 import { paintMetrics } from '../../../common/metrics/paint-metrics'
-import { submitData } from '../../../common/util/submit-data'
 import { getConfigurationValue, getInfo, getRuntime } from '../../../common/config/config'
-import { HarvestScheduler } from '../../../common/harvest/harvest-scheduler'
+import { Harvest } from '../../../common/harvest/harvest'
 import * as CONSTANTS from '../constants'
 import { getActivatedFeaturesFlags } from './initialized-features'
 import { globalScope, isBrowserScope } from '../../../common/util/global-scope'
 import { drain } from '../../../common/drain/drain'
+import { activateFeatures } from '../../../common/util/feature-flags'
+import { warn } from '../../../common/util/console'
 import { AggregateBase } from '../../utils/aggregate-base'
-const jsonp = 'NREUM.setToken'
 export class Aggregate extends AggregateBase {
   static featureName = CONSTANTS.FEATURE_NAME
   constructor (agentIdentifier, aggregator) {
@@ -55,10 +52,12 @@ export class Aggregate extends AggregateBase {
   sendRum () {
     const info = getInfo(this.agentIdentifier)
+    const agentRuntime = getRuntime(this.agentIdentifier)
+    const harvester = new Harvest(this)
     if (!info.beacon) return
     if (info.queueTime) this.aggregator.store('measures', 'qt', { value: info.queueTime })
     if (info.applicationTime) this.aggregator.store('measures', 'ap', { value: info.applicationTime })
-    const agentRuntime = getRuntime(this.agentIdentifier)
     // These 3 values should've been recorded after load and before this func runs. They are part of the minimum required for PageView events to be created.
     // Following PR #428, which demands that all agents send RUM call, these need to be sent even outside of the main window context where PerformanceTiming
@@ -67,27 +66,27 @@ export class Aggregate extends AggregateBase {
     this.aggregator.store('measures', 'fe', { value: isBrowserScope ? agentRuntime[CONSTANTS.FBTWL] : 0 })
     this.aggregator.store('measures', 'dc', { value: isBrowserScope ? agentRuntime[CONSTANTS.FBTDC] : 0 })
-    var measuresMetrics = this.aggregator.get('measures')
-    var measuresQueryString = mapOwn(measuresMetrics, function (metricName, measure) {
-      return '&' + metricName + '=' + measure.params.value
-    }).join('')
-    // currently we only have one version of our protocol
-    // in the future we may add more
-    var protocol = '1'
-    var scheduler = new HarvestScheduler('page_view_event', {}, this)
-    var chunksForQueryString = [scheduler.harvest.baseQueryString()]
-    chunksForQueryString.push(measuresQueryString)
+    const queryParameters = {
+      tt: info.ttGuid,
+      us: info.user,
+      ac: info.account,
+      pr: info.product,
+      af: getActivatedFeaturesFlags(this.agentIdentifier).join(','),
+      ...(
+        Object.entries(this.aggregator.get('measures') || {}).reduce((aggregator, [metricName, measure]) => {
+          aggregator[metricName] = measure.params?.value
+          return aggregator
+        }, {})
+      ),
+      xx: info.extra,
+      ua: info.userAttributes,
+      at: info.atts
+    }
-    chunksForQueryString.push(param('tt', info.ttGuid))
-    chunksForQueryString.push(param('us', info.user))
-    chunksForQueryString.push(param('ac', info.account))
-    chunksForQueryString.push(param('pr', info.product))
-    chunksForQueryString.push(param('af', getActivatedFeaturesFlags(this.agentIdentifier).join(',')))
+    let body
+    if (typeof info.jsAttributes === 'object' && Object.keys(info.jsAttributes).length > 0) {
+      body = { ja: info.jsAttributes }
+    }
     if (globalScope.performance) {
       if (typeof PerformanceNavigationTiming !== 'undefined') { // Navigation Timing level 2 API that replaced PerformanceTiming & PerformanceNavigation
@@ -96,13 +95,13 @@ export class Aggregate extends AggregateBase {
           timing: addPT(agentRuntime.offset, navTimingEntry, {}),
           navigation: addPN(navTimingEntry, {})
         })
-        chunksForQueryString.push(param('perf', stringify(perf)))
+        queryParameters.perf = stringify(perf)
       } else if (typeof PerformanceTiming !== 'undefined') { // Safari pre-15 did not support level 2 timing
         const perf = ({
           timing: addPT(agentRuntime.offset, globalScope.performance.timing, {}, true),
           navigation: addPN(globalScope.performance.navigation, {})
         })
-        chunksForQueryString.push(param('perf', stringify(perf)))
+        queryParameters.perf = stringify(perf)
       }
     }
@@ -112,35 +111,33 @@ export class Aggregate extends AggregateBase {
         if (!entry.startTime || entry.startTime <= 0) return
         if (entry.name === 'first-paint') {
-          chunksForQueryString.push(param('fp', String(Math.floor(entry.startTime))))
+          queryParameters.fp = String(Math.floor(entry.startTime))
         } else if (entry.name === 'first-contentful-paint') {
-          chunksForQueryString.push(param('fcp', String(Math.floor(entry.startTime))))
+          queryParameters.fcp = String(Math.floor(entry.startTime))
         }
         paintMetrics[entry.name] = Math.floor(entry.startTime) // this is consumed by Spa module
       })
     } catch (e) {}
-    chunksForQueryString.push(param('xx', info.extra))
-    chunksForQueryString.push(param('ua', info.userAttributes))
-    chunksForQueryString.push(param('at', info.atts))
-    var customJsAttributes = stringify(info.jsAttributes)
-    chunksForQueryString.push(param('ja', customJsAttributes === '{}' ? null : customJsAttributes))
-    var queryString = fromArray(chunksForQueryString, agentRuntime.maxBytes)
-    // Capture bytes sent to RUM call endpoint (currently `1`) as a supportability metric. See metrics aggregator (on unload).
-    agentRuntime.bytesSent[protocol] = 0 // Set to zero for now until RUM is moved to POST
-    // Capture query bytes sent to RUM call endpoint (currently `1`) as a supportability metric. See metrics aggregator (on unload).
-    agentRuntime.queryBytesSent[protocol] = (agentRuntime.queryBytesSent[protocol] || 0) + queryString?.length || 0
+    harvester.send({
+      endpoint: 'rum',
+      payload: { qs: queryParameters, body },
+      opts: { needResponse: true, sendEmptyBody: true },
+      cbFinished: ({ status, responseText }) => {
+        if (status >= 400) {
+          // Adding retry logic for the rum call will be a separate change
+          this.ee.abort()
+          return
+        }
-    const isValidJsonp = submitData.jsonp({
-      url: this.getScheme() + '://' + info.beacon + '/' + protocol + '/' + info.licenseKey + '?' + queryString,
-      jsonp
+        try {
+          activateFeatures(JSON.parse(responseText), this.agentIdentifier)
+          drain(this.agentIdentifier, this.featureName)
+        } catch (err) {
+          this.ee.abort()
+          warn('RUM call failed. Agent shutting down.')
+        }
+      }
     })
-    // Usually `drain` is invoked automatically after processing feature flags contained in the JSONP callback from
-    // ingest (see `activateFeatures`), so when JSONP cannot execute (as with module workers), we drain manually.
-    if (!isValidJsonp) drain(this.agentIdentifier, CONSTANTS.FEATURE_NAME)
   }
 }

package/src/features/page_view_event/instrument/index.js CHANGED Viewed

@@ -1,4 +1,3 @@
 import { handle } from '../../../common/event-emitter/handle'
 import { isiOS } from '../../../common/browser-version/ios-version'
 import { InstrumentBase } from '../../utils/instrument-base'

package/src/features/utils/handler-cache.js CHANGED Viewed

@@ -1,4 +1,3 @@
 /**
  * A class to defer callback execution until a decision can be reached
  */

package/src/loaders/configure/configure.js CHANGED Viewed

@@ -29,7 +29,6 @@ export function configure (agentIdentifier, opts = {}, loaderType, forceDrain) {
   gosNREUMInitializedAgents(agentIdentifier, api, 'api')
   gosNREUMInitializedAgents(agentIdentifier, exposed, 'exposed')
   addToNREUM('activatedFeatures', activatedFeatures)
-  addToNREUM('setToken', (flags) => activateFeatures(flags, agentIdentifier))
   return api
 }

package/dist/cjs/common/util/s-hash.js DELETED Viewed

@@ -1,19 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.sHash = sHash;
-/*
- * Copyright 2020 New Relic Corporation. All rights reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-function sHash(s) {
-  var i;
-  var h = 0;
-  for (i = 0; i < s.length; i++) {
-    h += (i + 1) * s.charCodeAt(i);
-  }
-  return Math.abs(h);
-}