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

@newrelic/browser-agent 1.233.0 → 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 (115) hide show

package/dist/cjs/cdn/experimental.js +27 -0
package/dist/cjs/common/config/state/init.js +1 -1
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.js +18 -3
package/dist/cjs/common/harvest/harvest-scheduler.test.js +39 -0
package/dist/cjs/common/harvest/harvest.js +14 -34
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/features/session_replay/aggregate/index.js +10 -7
package/dist/cjs/loaders/configure/configure.js +0 -1
package/dist/esm/cdn/experimental.js +24 -0
package/dist/esm/common/config/state/init.js +1 -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.js +18 -3
package/dist/esm/common/harvest/harvest-scheduler.test.js +37 -0
package/dist/esm/common/harvest/harvest.js +14 -34
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/features/session_replay/aggregate/index.js +10 -7
package/dist/esm/loaders/configure/configure.js +0 -1
package/dist/types/cdn/experimental.d.ts +2 -0
package/dist/types/cdn/experimental.d.ts.map +1 -0
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-scheduler.d.ts +26 -3
package/dist/types/common/harvest/harvest-scheduler.d.ts.map +1 -1
package/dist/types/common/harvest/harvest.d.ts +2 -2
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/session_replay/aggregate/index.d.ts +4 -0
package/dist/types/features/session_replay/aggregate/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 +8 -3
package/src/cdn/experimental.js +36 -0
package/src/common/config/state/init.js +1 -2
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.js +18 -3
package/src/common/harvest/harvest-scheduler.test.js +25 -0
package/src/common/harvest/harvest.js +15 -20
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/session_replay/aggregate/index.js +12 -7
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/dist/cjs/common/util/stringify.test.js ADDED Viewed

@@ -0,0 +1,48 @@
+"use strict";
+var _stringify = require("./stringify");
+var mockEmit = jest.fn();
+jest.mock('../event-emitter/contextual-ee', () => ({
+  __esModule: true,
+  get ee() {
+    return {
+      emit: mockEmit
+    };
+  }
+}));
+test('should return a JSON string representation of the value', () => {
+  const obj = {
+    a: 1,
+    b: {
+      nested: true
+    }
+  };
+  const expected = '{"a":1,"b":{"nested":true}}';
+  const result = (0, _stringify.stringify)(obj);
+  expect(result).toBe(expected);
+});
+test('should handle circular references and exclude them from the JSON output', () => {
+  const obj = {
+    a: 1
+  };
+  obj.b = obj; // Create a circular reference
+  const expected = '{"a":1}';
+  const result = (0, _stringify.stringify)(obj);
+  expect(result).toBe(expected);
+});
+test('should handle non-object values and return their string representation', () => {
+  const value = 42;
+  const expected = '42';
+  const result = (0, _stringify.stringify)(value);
+  expect(result).toBe(expected);
+});
+test('should emit an "internal-error" event if an error occurs during JSON.stringify', () => {
+  const obj = {
+    a: 1
+  };
+  jest.spyOn(JSON, 'stringify').mockImplementation(() => {
+    throw new Error('message');
+  });
+  (0, _stringify.stringify)(obj);
+  expect(mockEmit).toHaveBeenCalledWith('internal-error', expect.any(Array));
+});

package/dist/cjs/common/util/submit-data.js CHANGED Viewed

@@ -50,6 +50,14 @@ submitData.jsonp = function jsonp(_ref) {
     // do nothing
   }
 };
+/**
+ * Performs an asynchronous GET request using XMLHttpRequest.
+ *
+ * @param {Object} args - An object containing a `url` property.
+ * @param {string} args.url - The URL to send the GET request to.
+ * @returns {XMLHttpRequest} - An XMLHttpRequest object.
+ */
 submitData.xhrGet = function xhrGet(_ref2) {
   let {
     url
@@ -63,18 +71,18 @@ submitData.xhrGet = function xhrGet(_ref2) {
 /**
  * Send via XHR
- * @param {Object} args - The args
- * @param {string} args.url - The URL to send to
- * @param {string=} args.body - The Stringified body
- * @param {boolean=} args.sync - Run XHR as Synchronous
- * @param {string=} [args.method=POST] - The XHR method to use
- * @param {{key: string, value: string}[]} [args.headers] - The headers to attach
+ * @param {Object} args - The args.
+ * @param {string} args.url - The URL to send to.
+ * @param {string=} args.body - The Stringified body. Default null to prevent IE11 from breaking.
+ * @param {boolean=} args.sync - Run XHR synchronously.
+ * @param {string=} [args.method=POST] - The XHR method to use.
+ * @param {{key: string, value: string}[]} [args.headers] - The headers to attach.
  * @returns {XMLHttpRequest}
  */
 submitData.xhr = function xhr(_ref3) {
   let {
     url,
-    body,
+    body = null,
     sync,
     method = 'POST',
     headers = [{
@@ -97,13 +105,6 @@ submitData.xhr = function xhr(_ref3) {
   return request;
 };
-/**
- * Unused at the moment -- DEPRECATED
- */
-// submitData.xhrSync = function xhrSync (url, body) {
-//   return submitData.xhr(url, body, true)
-// }
 /**
  * Send by appending an <img> element to the page. Do NOT call this function outside of a guaranteed web window environment.
  * @param {Object} args - The args
@@ -114,7 +115,6 @@ submitData.img = function img(_ref4) {
   let {
     url
   } = _ref4;
-  console.log('img url', url);
   var element = new Image();
   element.src = url;
   return element;

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

@@ -0,0 +1,221 @@
+"use strict";
+var _submitData = require("./submit-data");
+/**
+ * @jest-environment jsdom
+ * @jest-environment-options {"html": "<html><head><script></script></head><body></body></html>", "url": "https://example.com/"}
+ */
+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.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.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.submitData, 'xhrGet').mockImplementation(jest.fn());
+    const result = _submitData.submitData.jsonp({
+      url,
+      jsonp
+    });
+    expect(result).toBe(false);
+    expect(_submitData.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.submitData.jsonp({
+        url,
+        jsonp
+      });
+    }).not.toThrow();
+  });
+});
+describe('submitData.xhrGet', () => {
+  test('should return an XMLHttpRequest object', () => {
+    const result = _submitData.submitData.xhrGet({
+      url
+    });
+    expect(result).toBeInstanceOf(XMLHttpRequest);
+  });
+  test('should not throw an error if URL is not provided', () => {
+    expect(() => {
+      _submitData.submitData.xhrGet({});
+    }).not.toThrow();
+  });
+  test('should not throw an error if an invalid URL is provided', () => {
+    expect(() => {
+      _submitData.submitData.xhrGet({
+        url: 'invalid url'
+      });
+    }).not.toThrow();
+  });
+});
+describe('submitData.xhr', () => {
+  test('should return an XMLHttpRequest object', () => {
+    const result = _submitData.submitData.xhrGet({
+      url
+    });
+    expect(result).toBeInstanceOf(XMLHttpRequest);
+  });
+  test('should not throw an error if URL is not provided', () => {
+    expect(() => {
+      _submitData.submitData.xhr({});
+    }).not.toThrow();
+  });
+  test('should not throw an error if an invalid URL is provided', () => {
+    expect(() => {
+      _submitData.submitData.xhr({
+        url: 'invalid url'
+      });
+    }).not.toThrow();
+  });
+  test('should send a POST request by default', () => {
+    jest.spyOn(XMLHttpRequest.prototype, 'open');
+    _submitData.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.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.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.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.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.submitData.img({
+      url: imageUrl
+    });
+    expect(result).toBeInstanceOf(HTMLImageElement);
+  });
+  test('should not throw an error if URL is not provided', () => {
+    expect(() => {
+      _submitData.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.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.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.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.submitData.beacon({
+        url,
+        body
+      });
+    }).toThrow();
+  });
+});

package/dist/cjs/common/util/traverse.js CHANGED Viewed

@@ -9,33 +9,25 @@ exports.applyFnToProps = applyFnToProps;
  * SPDX-License-Identifier: Apache-2.0
  */
-// traverses an object and applies a fn to property values of a certain type
-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.
+ */
+function applyFnToProps(obj, fn) {
+  let type = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'string';
+  let ignoreKeys = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
   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/dist/cjs/common/util/traverse.test.js ADDED Viewed

@@ -0,0 +1,44 @@
+"use strict";
+var _traverse = require("./traverse");
+test.each(['not an object', null, undefined])('should return input unchanged when input is %p', input => {
+  const result = (0, _traverse.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 = (0, _traverse.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 = (0, _traverse.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/dist/cjs/features/metrics/aggregate/endpoint-map.js ADDED Viewed

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.endpointMap = void 0;
+const endpointMap = {
+  rum: '1',
+  events: 'Events',
+  ins: 'Ins',
+  jserrors: 'Jserrors',
+  resources: 'Resources'
+};
+exports.endpointMap = endpointMap;

package/dist/cjs/features/metrics/aggregate/index.js CHANGED Viewed

@@ -19,6 +19,7 @@ var _eventListenerOpts = require("../../../common/event-listener/event-listener-
 var _globalScope = require("../../../common/util/global-scope");
 var _aggregateBase = require("../../utils/aggregate-base");
 var _stringify = require("../../../common/util/stringify");
+var _endpointMap = require("./endpoint-map");
 class Aggregate extends _aggregateBase.AggregateBase {
   static featureName = _constants.FEATURE_NAME;
   constructor(agentIdentifier, aggregator) {
@@ -137,12 +138,12 @@ class Aggregate extends _aggregateBase.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/".concat(endpoint.charAt(0).toUpperCase() + endpoint.slice(1), "/BytesSent"), agentRuntime.bytesSent[endpoint]);
+        this.storeSupportabilityMetrics("PageSession/Endpoint/".concat(_endpointMap.endpointMap[endpoint], "/BytesSent"), agentRuntime.bytesSent[endpoint]);
       });
       // 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/".concat(endpoint.charAt(0).toUpperCase() + endpoint.slice(1), "/QueryBytesSent"), agentRuntime.queryBytesSent[endpoint]);
+        this.storeSupportabilityMetrics("PageSession/Endpoint/".concat(_endpointMap.endpointMap[endpoint], "/QueryBytesSent"), agentRuntime.queryBytesSent[endpoint]);
       });
       // Capture metrics for session trace if active (`ptid` is set when returned by replay ingest).

package/dist/cjs/features/metrics/instrument/index.js CHANGED Viewed

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Instrument = void 0;
 var _instrumentBase = require("../../utils/instrument-base");
-var _workersHelper = require("./workers-helper");
 var _constants = require("../constants");
 var _handle = require("../../../common/event-emitter/handle");
 var _features = require("../../../loaders/features/features");
@@ -14,7 +13,6 @@ class Instrument extends _instrumentBase.InstrumentBase {
   constructor(agentIdentifier, aggregator) {
     let auto = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
     super(agentIdentifier, aggregator, _constants.FEATURE_NAME, auto);
-    (0, _workersHelper.insertSupportMetrics)(tag => (0, _handle.handle)(_constants.SUPPORTABILITY_METRIC_CHANNEL, [tag], undefined, _features.FEATURE_NAMES.metrics, this.ee));
     this.importAggregator();
   }
 }

package/dist/cjs/features/page_view_event/aggregate/index.js CHANGED Viewed

@@ -8,22 +8,20 @@ var _handle = require("../../../common/event-emitter/handle");
 var _features = require("../../../loaders/features/features");
 var _iosVersion = require("../../../common/browser-version/ios-version");
 var _webVitals = require("web-vitals");
-var _mapOwn = require("../../../common/util/map-own");
-var _encode = require("../../../common/url/encode");
 var _navTiming = require("../../../common/timing/nav-timing");
 var _stringify = require("../../../common/util/stringify");
 var _paintMetrics = require("../../../common/metrics/paint-metrics");
-var _submitData = require("../../../common/util/submit-data");
 var _config = require("../../../common/config/config");
-var _harvestScheduler = require("../../../common/harvest/harvest-scheduler");
+var _harvest = require("../../../common/harvest/harvest");
 var CONSTANTS = _interopRequireWildcard(require("../constants"));
 var _initializedFeatures = require("./initialized-features");
 var _globalScope = require("../../../common/util/global-scope");
 var _drain = require("../../../common/drain/drain");
+var _featureFlags = require("../../../common/util/feature-flags");
+var _console = require("../../../common/util/console");
 var _aggregateBase = require("../../utils/aggregate-base");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-const jsonp = 'NREUM.setToken';
 class Aggregate extends _aggregateBase.AggregateBase {
   static featureName = CONSTANTS.FEATURE_NAME;
   constructor(agentIdentifier, aggregator) {
@@ -62,6 +60,8 @@ class Aggregate extends _aggregateBase.AggregateBase {
   }
   sendRum() {
     const info = (0, _config.getInfo)(this.agentIdentifier);
+    const agentRuntime = (0, _config.getRuntime)(this.agentIdentifier);
+    const harvester = new _harvest.Harvest(this);
     if (!info.beacon) return;
     if (info.queueTime) this.aggregator.store('measures', 'qt', {
       value: info.queueTime
@@ -69,7 +69,6 @@ class Aggregate extends _aggregateBase.AggregateBase {
     if (info.applicationTime) this.aggregator.store('measures', 'ap', {
       value: info.applicationTime
     });
-    const agentRuntime = (0, _config.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
@@ -83,22 +82,27 @@ class Aggregate extends _aggregateBase.AggregateBase {
     this.aggregator.store('measures', 'dc', {
       value: _globalScope.isBrowserScope ? agentRuntime[CONSTANTS.FBTDC] : 0
     });
-    var measuresMetrics = this.aggregator.get('measures');
-    var measuresQueryString = (0, _mapOwn.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.HarvestScheduler('page_view_event', {}, this);
-    var chunksForQueryString = [scheduler.harvest.baseQueryString()];
-    chunksForQueryString.push(measuresQueryString);
-    chunksForQueryString.push((0, _encode.param)('tt', info.ttGuid));
-    chunksForQueryString.push((0, _encode.param)('us', info.user));
-    chunksForQueryString.push((0, _encode.param)('ac', info.account));
-    chunksForQueryString.push((0, _encode.param)('pr', info.product));
-    chunksForQueryString.push((0, _encode.param)('af', (0, _initializedFeatures.getActivatedFeaturesFlags)(this.agentIdentifier).join(',')));
+    const queryParameters = {
+      tt: info.ttGuid,
+      us: info.user,
+      ac: info.account,
+      pr: info.product,
+      af: (0, _initializedFeatures.getActivatedFeaturesFlags)(this.agentIdentifier).join(','),
+      ...Object.entries(this.aggregator.get('measures') || {}).reduce((aggregator, _ref2) => {
+        let [metricName, measure] = _ref2;
+        aggregator[metricName] = measure.params?.value;
+        return aggregator;
+      }, {}),
+      xx: info.extra,
+      ua: info.userAttributes,
+      at: info.atts
+    };
+    let body;
+    if (typeof info.jsAttributes === 'object' && Object.keys(info.jsAttributes).length > 0) {
+      body = {
+        ja: info.jsAttributes
+      };
+    }
     if (_globalScope.globalScope.performance) {
       if (typeof PerformanceNavigationTiming !== 'undefined') {
         // Navigation Timing level 2 API that replaced PerformanceTiming & PerformanceNavigation
@@ -107,14 +111,14 @@ class Aggregate extends _aggregateBase.AggregateBase {
           timing: (0, _navTiming.addPT)(agentRuntime.offset, navTimingEntry, {}),
           navigation: (0, _navTiming.addPN)(navTimingEntry, {})
         };
-        chunksForQueryString.push((0, _encode.param)('perf', (0, _stringify.stringify)(perf)));
+        queryParameters.perf = (0, _stringify.stringify)(perf);
       } else if (typeof PerformanceTiming !== 'undefined') {
         // Safari pre-15 did not support level 2 timing
         const perf = {
           timing: (0, _navTiming.addPT)(agentRuntime.offset, _globalScope.globalScope.performance.timing, {}, true),
           navigation: (0, _navTiming.addPN)(_globalScope.globalScope.performance.navigation, {})
         };
-        chunksForQueryString.push((0, _encode.param)('perf', (0, _stringify.stringify)(perf)));
+        queryParameters.perf = (0, _stringify.stringify)(perf);
       }
     }
     try {
@@ -123,32 +127,42 @@ class Aggregate extends _aggregateBase.AggregateBase {
       entries.forEach(function (entry) {
         if (!entry.startTime || entry.startTime <= 0) return;
         if (entry.name === 'first-paint') {
-          chunksForQueryString.push((0, _encode.param)('fp', String(Math.floor(entry.startTime))));
+          queryParameters.fp = String(Math.floor(entry.startTime));
         } else if (entry.name === 'first-contentful-paint') {
-          chunksForQueryString.push((0, _encode.param)('fcp', String(Math.floor(entry.startTime))));
+          queryParameters.fcp = String(Math.floor(entry.startTime));
         }
         _paintMetrics.paintMetrics[entry.name] = Math.floor(entry.startTime); // this is consumed by Spa module
       });
     } catch (e) {}
-    chunksForQueryString.push((0, _encode.param)('xx', info.extra));
-    chunksForQueryString.push((0, _encode.param)('ua', info.userAttributes));
-    chunksForQueryString.push((0, _encode.param)('at', info.atts));
-    var customJsAttributes = (0, _stringify.stringify)(info.jsAttributes);
-    chunksForQueryString.push((0, _encode.param)('ja', customJsAttributes === '{}' ? null : customJsAttributes));
-    var queryString = (0, _encode.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;
-    const isValidJsonp = _submitData.submitData.jsonp({
-      url: this.getScheme() + '://' + info.beacon + '/' + protocol + '/' + info.licenseKey + '?' + queryString,
-      jsonp
+    harvester.send({
+      endpoint: 'rum',
+      payload: {
+        qs: queryParameters,
+        body
+      },
+      opts: {
+        needResponse: true,
+        sendEmptyBody: true
+      },
+      cbFinished: _ref3 => {
+        let {
+          status,
+          responseText
+        } = _ref3;
+        if (status >= 400) {
+          // Adding retry logic for the rum call will be a separate change
+          this.ee.abort();
+          return;
+        }
+        try {
+          (0, _featureFlags.activateFeatures)(JSON.parse(responseText), this.agentIdentifier);
+          (0, _drain.drain)(this.agentIdentifier, this.featureName);
+        } catch (err) {
+          this.ee.abort();
+          (0, _console.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) (0, _drain.drain)(this.agentIdentifier, CONSTANTS.FEATURE_NAME);
   }
 }
 exports.Aggregate = Aggregate;