@newrelic/browser-agent 1.274.0 → 1.275.0

package/CHANGELOG.md

@@ -3,6 +3,19 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.275.0](https://github.com/newrelic/newrelic-browser-agent/compare/v1.274.0...v1.275.0) (2024-12-03)
+
+
+### Features
+
+* Allow logs api wrapper to update custom attributes ([#1265](https://github.com/newrelic/newrelic-browser-agent/issues/1265)) ([8d10e14](https://github.com/newrelic/newrelic-browser-agent/commit/8d10e14953f9a5b9ba97e865ba5476fc527ba384))
+* Enable the browser agent to run in extension background contexts ([#1206](https://github.com/newrelic/newrelic-browser-agent/issues/1206)) ([37e976b](https://github.com/newrelic/newrelic-browser-agent/commit/37e976bf360c209efd163855e7fbe84d665e444b))
+
+
+### Bug Fixes
+
+* Harvest generic events when max size is reached ([#1250](https://github.com/newrelic/newrelic-browser-agent/issues/1250)) ([e00a469](https://github.com/newrelic/newrelic-browser-agent/commit/e00a46975bcc93c48798bd9153f3a503998b0915))
+
 ## [1.274.0](https://github.com/newrelic/newrelic-browser-agent/compare/v1.273.1...v1.274.0) (2024-11-19)
 
 

package/dist/cjs/common/constants/env.cdn.js

@@ -12,7 +12,7 @@ exports.VERSION = exports.RRWEB_VERSION = exports.DIST_METHOD = exports.BUILD_EN
 /**
  * Exposes the version of the agent
  */
-const VERSION = exports.VERSION = "1.274.0";
+const VERSION = exports.VERSION = "1.275.0";
 
 /**
  * Exposes the build type of the agent

package/dist/cjs/common/constants/env.npm.js

@@ -12,7 +12,7 @@ exports.VERSION = exports.RRWEB_VERSION = exports.DIST_METHOD = exports.BUILD_EN
 /**
  * Exposes the version of the agent
  */
-const VERSION = exports.VERSION = "1.274.0";
+const VERSION = exports.VERSION = "1.275.0";
 
 /**
  * Exposes the build type of the agent

package/dist/cjs/common/harvest/harvest.js

@@ -174,6 +174,27 @@ class Harvest extends _sharedContext.SharedContext {
         }
         cbFinished(cbResult);
       }, (0, _eventListenerOpts.eventListenerOpts)(false));
+    } else if (!opts.unload && cbFinished && submitMethod === submitData.xhrFetch) {
+      const harvestScope = this;
+      result.then(async function (response) {
+        const status = response.status;
+        const cbResult = {
+          sent: true,
+          status,
+          fullUrl,
+          fetchResponse: response
+        };
+        if (response.status === 429) {
+          cbResult.retry = true;
+          cbResult.delay = harvestScope.tooManyRequestsDelay;
+        } else if (status === 408 || status === 500 || status === 503) {
+          cbResult.retry = true;
+        }
+        if (opts.needResponse) {
+          cbResult.responseText = await response.text();
+        }
+        cbFinished(cbResult);
+      });
     }
     return result;
   }

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.beacon = beacon;
 exports.getSubmitMethod = getSubmitMethod;
 exports.xhr = xhr;
+exports.xhrFetch = xhrFetch;
 var _runtime = require("../constants/runtime");
 /**
  * @file Contains common methods used to transmit harvested data.
@@ -26,11 +27,47 @@ var _runtime = require("../constants/runtime");
 function getSubmitMethod({
   isFinalHarvest = false
 } = {}) {
-  return isFinalHarvest && _runtime.isBrowserScope
-  // Use sendBeacon for final harvest
-  ? beacon
-  // If not final harvest, or not browserScope, always use xhr post
-  : xhr;
+  if (isFinalHarvest && _runtime.isBrowserScope) {
+    // Use sendBeacon for final harvest
+    return beacon;
+  }
+
+  // If not final harvest, or not browserScope, use XHR post if available
+  if (typeof XMLHttpRequest !== 'undefined') {
+    return xhr;
+  }
+
+  // Fallback for web workers where XMLHttpRequest is not available
+  return xhrFetch;
+}
+
+/**
+ *
+ * @param url
+ * @param body
+ * @param method
+ * @param headers
+ * @returns {Promise<Response>}
+ */
+function xhrFetch({
+  url,
+  body = null,
+  method = 'POST',
+  headers = [{
+    key: 'content-type',
+    value: 'text/plain'
+  }]
+}) {
+  const objHeaders = {};
+  for (const header of headers) {
+    objHeaders[header.key] = header.value;
+  }
+  return fetch(url, {
+    headers: objHeaders,
+    method,
+    body,
+    credentials: 'include'
+  });
 }
 
 /**

package/dist/cjs/common/wrap/wrap-events.js

@@ -44,8 +44,8 @@ function wrapEvents(sharedEE) {
   // Guard against instrumenting environments w/o necessary features
   if ('getPrototypeOf' in Object) {
     if (_runtime.isBrowserScope) findEventListenerProtoAndCb(document, wrapNode);
+    if (XHR) findEventListenerProtoAndCb(XHR.prototype, wrapNode);
     findEventListenerProtoAndCb(_runtime.globalScope, wrapNode);
-    findEventListenerProtoAndCb(XHR.prototype, wrapNode);
   }
   ee.on(ADD_EVENT_LISTENER + '-start', function (args, target) {
     var originalListener = args[1];

package/dist/cjs/common/wrap/wrap-logger.js

@@ -18,6 +18,8 @@ var _wrapFunction = require("./wrap-function");
  * This module is used by: jserrors, spa.
  */
 
+const contextMap = new Map();
+
 /**
  * Wraps a supplied function and adds emitter events under the `-wrap-logger-` prefix
  * @param {Object} sharedEE - The shared event emitter on which a new scoped event emitter will be based.
@@ -38,9 +40,11 @@ function wrapLogger(sharedEE, parent, loggerFn, context) {
   const ctx = new _eventContext.EventContext(_contextualEe.contextId);
   ctx.level = context.level;
   ctx.customAttributes = context.customAttributes;
+  const contextLookupKey = parent[loggerFn]?.[_wrapFunction.flag] || parent[loggerFn];
+  contextMap.set(contextLookupKey, ctx);
 
   /** observe calls to <loggerFn> and emit events prefixed with `wrap-logger-` */
-  wrapFn.inPlace(parent, [loggerFn], 'wrap-logger-', ctx);
+  wrapFn.inPlace(parent, [loggerFn], 'wrap-logger-', () => contextMap.get(contextLookupKey));
   return ee;
 }
 

package/dist/cjs/common/wrap/wrap-xhr.js

@@ -33,6 +33,7 @@ const XHR_PROPS = ['open', 'send']; // these are the specific funcs being wrappe
 function wrapXhr(sharedEE) {
   var baseEE = sharedEE || _contextualEe.ee;
   const ee = scopedEE(baseEE);
+  if (typeof _runtime.globalScope.XMLHttpRequest === 'undefined') return ee;
 
   // Notice if our wrapping never ran yet, the falsy NaN will not early return; but if it has,
   // then we increment the count to track # of feats using this at runtime.

package/dist/cjs/features/generic_events/aggregate/index.js

@@ -15,7 +15,6 @@ var _now = require("../../../common/timing/now");
 var _registerHandler = require("../../../common/event-emitter/register-handler");
 var _constants2 = require("../../metrics/constants");
 var _traverse = require("../../../common/util/traverse");
-var _agentConstants = require("../../../common/constants/agent-constants");
 var _features = require("../../../loaders/features/features");
 var _userActionsAggregator = require("./user-actions/user-actions-aggregator");
 var _iframe = require("../../../common/dom/iframe");
@@ -188,8 +187,16 @@ class Aggregate extends _aggregateBase.AggregateBase {
       /** Event-specific attributes take precedence over agent-level custom attributes and fallbacks */
       ...obj
     };
-    this.events.add(eventAttributes);
-    this.checkEventLimits();
+    const addedEvent = this.events.add(eventAttributes);
+    if (!addedEvent && !this.events.isEmpty()) {
+      /** could not add the event because it pushed the buffer over the limit
+       * so we harvest early, and try to add it again now that the buffer is cleared
+       * if it fails again, we do nothing
+       */
+      this.ee.emit(_constants2.SUPPORTABILITY_METRIC_CHANNEL, ['GenericEvents/Harvest/Max/Seen']);
+      this.harvestScheduler.runHarvest();
+      this.events.add(eventAttributes);
+    }
   }
   serializer(eventBuffer) {
     return (0, _traverse.applyFnToProps)({
@@ -202,12 +209,5 @@ class Aggregate extends _aggregateBase.AggregateBase {
       at: this.agentRef.info.atts
     };
   }
-  checkEventLimits() {
-    // check if we've reached any harvest limits...
-    if (this.events.byteSize() > _agentConstants.IDEAL_PAYLOAD_SIZE) {
-      this.ee.emit(_constants2.SUPPORTABILITY_METRIC_CHANNEL, ['GenericEvents/Harvest/Max/Seen']);
-      this.harvestScheduler.runHarvest();
-    }
-  }
 }
 exports.Aggregate = Aggregate;

package/dist/esm/common/constants/env.cdn.js

@@ -6,7 +6,7 @@
 /**
  * Exposes the version of the agent
  */
-export const VERSION = "1.274.0";
+export const VERSION = "1.275.0";
 
 /**
  * Exposes the build type of the agent

package/dist/esm/common/constants/env.npm.js

@@ -6,7 +6,7 @@
 /**
  * Exposes the version of the agent
  */
-export const VERSION = "1.274.0";
+export const VERSION = "1.275.0";
 
 /**
  * Exposes the build type of the agent

package/dist/esm/common/harvest/harvest.js

@@ -166,6 +166,27 @@ export class Harvest extends SharedContext {
         }
         cbFinished(cbResult);
       }, eventListenerOpts(false));
+    } else if (!opts.unload && cbFinished && submitMethod === submitData.xhrFetch) {
+      const harvestScope = this;
+      result.then(async function (response) {
+        const status = response.status;
+        const cbResult = {
+          sent: true,
+          status,
+          fullUrl,
+          fetchResponse: response
+        };
+        if (response.status === 429) {
+          cbResult.retry = true;
+          cbResult.delay = harvestScope.tooManyRequestsDelay;
+        } else if (status === 408 || status === 500 || status === 503) {
+          cbResult.retry = true;
+        }
+        if (opts.needResponse) {
+          cbResult.responseText = await response.text();
+        }
+        cbFinished(cbResult);
+      });
     }
     return result;
   }

package/dist/esm/common/util/submit-data.js

@@ -19,11 +19,47 @@ import { isBrowserScope } from '../constants/runtime';
 export function getSubmitMethod({
   isFinalHarvest = false
 } = {}) {
-  return isFinalHarvest && isBrowserScope
-  // Use sendBeacon for final harvest
-  ? beacon
-  // If not final harvest, or not browserScope, always use xhr post
-  : xhr;
+  if (isFinalHarvest && isBrowserScope) {
+    // Use sendBeacon for final harvest
+    return beacon;
+  }
+
+  // If not final harvest, or not browserScope, use XHR post if available
+  if (typeof XMLHttpRequest !== 'undefined') {
+    return xhr;
+  }
+
+  // Fallback for web workers where XMLHttpRequest is not available
+  return xhrFetch;
+}
+
+/**
+ *
+ * @param url
+ * @param body
+ * @param method
+ * @param headers
+ * @returns {Promise<Response>}
+ */
+export function xhrFetch({
+  url,
+  body = null,
+  method = 'POST',
+  headers = [{
+    key: 'content-type',
+    value: 'text/plain'
+  }]
+}) {
+  const objHeaders = {};
+  for (const header of headers) {
+    objHeaders[header.key] = header.value;
+  }
+  return fetch(url, {
+    headers: objHeaders,
+    method,
+    body,
+    credentials: 'include'
+  });
 }
 
 /**

package/dist/esm/common/wrap/wrap-events.js

@@ -36,8 +36,8 @@ export function wrapEvents(sharedEE) {
   // Guard against instrumenting environments w/o necessary features
   if ('getPrototypeOf' in Object) {
     if (isBrowserScope) findEventListenerProtoAndCb(document, wrapNode);
+    if (XHR) findEventListenerProtoAndCb(XHR.prototype, wrapNode);
     findEventListenerProtoAndCb(globalScope, wrapNode);
-    findEventListenerProtoAndCb(XHR.prototype, wrapNode);
   }
   ee.on(ADD_EVENT_LISTENER + '-start', function (args, target) {
     var originalListener = args[1];

package/dist/esm/common/wrap/wrap-logger.js

@@ -10,7 +10,8 @@
 import { ee as baseEE, contextId } from '../event-emitter/contextual-ee';
 import { EventContext } from '../event-emitter/event-context';
 import { warn } from '../util/console';
-import { createWrapperWithEmitter as wfn } from './wrap-function';
+import { flag, createWrapperWithEmitter as wfn } from './wrap-function';
+const contextMap = new Map();
 
 /**
  * Wraps a supplied function and adds emitter events under the `-wrap-logger-` prefix
@@ -32,9 +33,11 @@ export function wrapLogger(sharedEE, parent, loggerFn, context) {
   const ctx = new EventContext(contextId);
   ctx.level = context.level;
   ctx.customAttributes = context.customAttributes;
+  const contextLookupKey = parent[loggerFn]?.[flag] || parent[loggerFn];
+  contextMap.set(contextLookupKey, ctx);
 
   /** observe calls to <loggerFn> and emit events prefixed with `wrap-logger-` */
-  wrapFn.inPlace(parent, [loggerFn], 'wrap-logger-', ctx);
+  wrapFn.inPlace(parent, [loggerFn], 'wrap-logger-', () => contextMap.get(contextLookupKey));
   return ee;
 }
 

package/dist/esm/common/wrap/wrap-xhr.js

@@ -26,6 +26,7 @@ const XHR_PROPS = ['open', 'send']; // these are the specific funcs being wrappe
 export function wrapXhr(sharedEE) {
   var baseEE = sharedEE || contextualEE;
   const ee = scopedEE(baseEE);
+  if (typeof globalScope.XMLHttpRequest === 'undefined') return ee;
 
   // Notice if our wrapping never ran yet, the falsy NaN will not early return; but if it has,
   // then we increment the count to track # of feats using this at runtime.

package/dist/esm/features/generic_events/aggregate/index.js

@@ -13,7 +13,6 @@ import { now } from '../../../common/timing/now';
 import { registerHandler } from '../../../common/event-emitter/register-handler';
 import { SUPPORTABILITY_METRIC_CHANNEL } from '../../metrics/constants';
 import { applyFnToProps } from '../../../common/util/traverse';
-import { IDEAL_PAYLOAD_SIZE } from '../../../common/constants/agent-constants';
 import { FEATURE_TO_ENDPOINT } from '../../../loaders/features/features';
 import { UserActionsAggregator } from './user-actions/user-actions-aggregator';
 import { isIFrameWindow } from '../../../common/dom/iframe';
@@ -181,8 +180,16 @@ export class Aggregate extends AggregateBase {
       /** Event-specific attributes take precedence over agent-level custom attributes and fallbacks */
       ...obj
     };
-    this.events.add(eventAttributes);
-    this.checkEventLimits();
+    const addedEvent = this.events.add(eventAttributes);
+    if (!addedEvent && !this.events.isEmpty()) {
+      /** could not add the event because it pushed the buffer over the limit
+       * so we harvest early, and try to add it again now that the buffer is cleared
+       * if it fails again, we do nothing
+       */
+      this.ee.emit(SUPPORTABILITY_METRIC_CHANNEL, ['GenericEvents/Harvest/Max/Seen']);
+      this.harvestScheduler.runHarvest();
+      this.events.add(eventAttributes);
+    }
   }
   serializer(eventBuffer) {
     return applyFnToProps({
@@ -195,11 +202,4 @@ export class Aggregate extends AggregateBase {
       at: this.agentRef.info.atts
     };
   }
-  checkEventLimits() {
-    // check if we've reached any harvest limits...
-    if (this.events.byteSize() > IDEAL_PAYLOAD_SIZE) {
-      this.ee.emit(SUPPORTABILITY_METRIC_CHANNEL, ['GenericEvents/Harvest/Max/Seen']);
-      this.harvestScheduler.runHarvest();
-    }
-  }
 }

package/dist/types/common/harvest/harvest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"harvest.d.ts","sourceRoot":"","sources":["../../../../src/common/harvest/harvest.js"],"names":[],"mappings":"AAsBA;;;;;;GAMG;AACH;IAII,0BAA2H;IAC3H,gBAA2E;IAE3E,YAAiB;IAGnB;;;;;OAKG;IACH,aAFW,eAAe,WAWzB;IAED;;;OAGG;IACH,YAFW,eAAe,WAMzB;IAED;;;;;;OAMG;IACH,gGAJW,eAAe,GACb,OAAO,CA+EnB;IAGD,gDAqBC;IAED;;;;;;;OAOG;IACH,wBALW,yBAAyB,WACzB,6BAA6B,GAE3B,cAAc,CA2B1B;IAED;;;;;;;OAOG;IACH,uBAHW,cAAc,GACZ,cAAc,CAuB1B;IAED;;;;;OAKG;IACH,aAHW,yBAAyB,YACzB,sBAAsB,QAQhC;CACF;8BAvOY,OAAO,YAAY,EAAE,eAAe;wCACpC,OAAO,YAAY,EAAE,yBAAyB;6BAC9C,OAAO,YAAY,EAAE,cAAc;qCACnC,OAAO,YAAY,EAAE,sBAAsB;4CAC3C,OAAO,YAAY,EAAE,6BAA6B;8BAbjC,2BAA2B"}
+{"version":3,"file":"harvest.d.ts","sourceRoot":"","sources":["../../../../src/common/harvest/harvest.js"],"names":[],"mappings":"AAsBA;;;;;;GAMG;AACH;IAII,0BAA2H;IAC3H,gBAA2E;IAE3E,YAAiB;IAGnB;;;;;OAKG;IACH,aAFW,eAAe,WAWzB;IAED;;;OAGG;IACH,YAFW,eAAe,WAMzB;IAED;;;;;;OAMG;IACH,gGAJW,eAAe,GACb,OAAO,CAkGnB;IAGD,gDAqBC;IAED;;;;;;;OAOG;IACH,wBALW,yBAAyB,WACzB,6BAA6B,GAE3B,cAAc,CA2B1B;IAED;;;;;;;OAOG;IACH,uBAHW,cAAc,GACZ,cAAc,CAuB1B;IAED;;;;;OAKG;IACH,aAHW,yBAAyB,YACzB,sBAAsB,QAQhC;CACF;8BA1PY,OAAO,YAAY,EAAE,eAAe;wCACpC,OAAO,YAAY,EAAE,yBAAyB;6BAC9C,OAAO,YAAY,EAAE,cAAc;qCACnC,OAAO,YAAY,EAAE,sBAAsB;4CAC3C,OAAO,YAAY,EAAE,6BAA6B;8BAbjC,2BAA2B"}

package/dist/types/common/util/submit-data.d.ts

@@ -9,7 +9,24 @@
  */
 export function getSubmitMethod({ isFinalHarvest }?: {
     isFinalHarvest: boolean;
-}): typeof xhr | typeof beacon;
+}): typeof xhr | typeof beacon | typeof xhrFetch;
+/**
+ *
+ * @param url
+ * @param body
+ * @param method
+ * @param headers
+ * @returns {Promise<Response>}
+ */
+export function xhrFetch({ url, body, method, headers }: {
+    url: any;
+    body?: null | undefined;
+    method?: string | undefined;
+    headers?: {
+        key: string;
+        value: string;
+    }[] | undefined;
+}): Promise<Response>;
 /**
  * Send via XHR
  * @param {Object} args - The args.

package/dist/types/common/util/submit-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"submit-data.d.ts","sourceRoot":"","sources":["../../../../src/common/util/submit-data.js"],"names":[],"mappings":"AAQA;;GAEG;AAEH;;;;;GAKG;AACH,qDAHG;IAAsB,cAAc,EAA5B,OAAO;CAEjB,8BAOA;AAED;;;;;;;;;GASG;AACH,0DAPG;IAAqB,GAAG,EAAhB,MAAM;IACQ,IAAI,GAAlB,MAAM,YAAC;IACQ,IAAI,GAAnB,OAAO,YAAC;IACO,MAAM,GAArB,MAAM,YAAC;IAC+B,OAAO;aAAvC,MAAM;eAAS,MAAM;;CACnC,GAAU,cAAc,CAmB1B;AAED;;;;;;GAMG;AACH,sCAJG;IAAqB,GAAG,EAAhB,MAAM;IACQ,IAAI,GAAlB,MAAM,YAAC;CACf,GAAU,OAAO,CAanB;6BAhEY,0BAAU"}
+{"version":3,"file":"submit-data.d.ts","sourceRoot":"","sources":["../../../../src/common/util/submit-data.js"],"names":[],"mappings":"AAQA;;GAEG;AAEH;;;;;GAKG;AACH,qDAHG;IAAsB,cAAc,EAA5B,OAAO;CAEjB,gDAcA;AAED;;;;;;;GAOG;AACH;;;;;;;;IAFa,OAAO,CAAC,QAAQ,CAAC,CAkB7B;AAED;;;;;;;;;GASG;AACH,0DAPG;IAAqB,GAAG,EAAhB,MAAM;IACQ,IAAI,GAAlB,MAAM,YAAC;IACQ,IAAI,GAAnB,OAAO,YAAC;IACO,MAAM,GAArB,MAAM,YAAC;IAC+B,OAAO;aAAvC,MAAM;eAAS,MAAM;;CACnC,GAAU,cAAc,CAmB1B;AAED;;;;;;GAMG;AACH,sCAJG;IAAqB,GAAG,EAAhB,MAAM;IACQ,IAAI,GAAlB,MAAM,YAAC;CACf,GAAU,OAAO,CAanB;6BAjGY,0BAAU"}

package/dist/types/common/wrap/wrap-logger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wrap-logger.d.ts","sourceRoot":"","sources":["../../../../src/common/wrap/wrap-logger.js"],"names":[],"mappings":"AAcA;;;;;;GAMG;AAEH,qCANW,MAAM,UACN,MAAM,YACN,MAAM,iBACJ,MAAM,CAoBlB;AAED;;;;;;GAMG;AACH,mCAJW,MAAM,GAEJ,MAAM,CAIlB"}
+{"version":3,"file":"wrap-logger.d.ts","sourceRoot":"","sources":["../../../../src/common/wrap/wrap-logger.js"],"names":[],"mappings":"AAgBA;;;;;;GAMG;AAEH,qCANW,MAAM,UACN,MAAM,YACN,MAAM,iBACJ,MAAM,CAuBlB;AAED;;;;;;GAMG;AACH,mCAJW,MAAM,GAEJ,MAAM,CAIlB"}

package/dist/types/common/wrap/wrap-xhr.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wrap-xhr.d.ts","sourceRoot":"","sources":["../../../../src/common/wrap/wrap-xhr.js"],"names":[],"mappings":"AAmBA;;;;;GAKG;AAEH,kCAJW,MAAM,GACJ,MAAM,CA+KlB;AAED;;;;;;GAMG;AACH,mCAJW,MAAM,GAEJ,MAAM,CAIlB"}
+{"version":3,"file":"wrap-xhr.d.ts","sourceRoot":"","sources":["../../../../src/common/wrap/wrap-xhr.js"],"names":[],"mappings":"AAmBA;;;;;GAKG;AAEH,kCAJW,MAAM,GACJ,MAAM,CAiLlB;AAED;;;;;;GAMG;AACH,mCAJW,MAAM,GAEJ,MAAM,CAIlB"}

package/dist/types/features/generic_events/aggregate/index.d.ts

@@ -24,7 +24,6 @@ export class Aggregate extends AggregateBase {
         ua: any;
         at: any;
     };
-    checkEventLimits(): void;
 }
 import { AggregateBase } from '../../utils/aggregate-base';
 import { UserActionsAggregator } from './user-actions/user-actions-aggregator';

package/dist/types/features/generic_events/aggregate/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/generic_events/aggregate/index.js"],"names":[],"mappings":"AAoBA;IACE,2BAAiC;IACjC,2BAiHC;IA9GC,yBAA4B;IAC5B,wBAAyE;IAEzE,gCAAkG;IA4B9F,4CAAuD;IAsEzD,mCAGQ;IASZ;;;;;;;;;;;OAWG;IACH,eAHW,MAAM,YAAC,QAmCjB;IAED,qCAEC;IAED;;;MAEC;IAED,yBAMC;CACF;8BA9L6B,4BAA4B;sCAQpB,wCAAwC;iCAZ7C,2CAA2C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/generic_events/aggregate/index.js"],"names":[],"mappings":"AAmBA;IACE,2BAAiC;IACjC,2BAiHC;IA9GC,yBAA4B;IAC5B,wBAAyE;IAEzE,gCAAkG;IA4B9F,4CAAuD;IAsEzD,mCAGQ;IASZ;;;;;;;;;;;OAWG;IACH,eAHW,MAAM,YAAC,QA0CjB;IAED,qCAEC;IAED;;;MAEC;CACF;8BA5L6B,4BAA4B;sCAOpB,wCAAwC;iCAX7C,2CAA2C"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newrelic/browser-agent",
-  "version": "1.274.0",
+  "version": "1.275.0",
   "private": false,
   "author": "New Relic Browser Agent Team <browser-agent@newrelic.com>",
   "description": "New Relic Browser Agent",

package/src/common/harvest/harvest.js

@@ -144,6 +144,25 @@ export class Harvest extends SharedContext {
         }
         cbFinished(cbResult)
       }, eventListenerOpts(false))
+    } else if (!opts.unload && cbFinished && submitMethod === submitData.xhrFetch) {
+      const harvestScope = this
+      result.then(async function (response) {
+        const status = response.status
+        const cbResult = { sent: true, status, fullUrl, fetchResponse: response }
+
+        if (response.status === 429) {
+          cbResult.retry = true
+          cbResult.delay = harvestScope.tooManyRequestsDelay
+        } else if (status === 408 || status === 500 || status === 503) {
+          cbResult.retry = true
+        }
+
+        if (opts.needResponse) {
+          cbResult.responseText = await response.text()
+        }
+
+        cbFinished(cbResult)
+      })
     }
 
     return result

package/src/common/util/submit-data.js

@@ -17,11 +17,44 @@ import { isBrowserScope } from '../constants/runtime'
  * a final harvest within the agent.
  */
 export function getSubmitMethod ({ isFinalHarvest = false } = {}) {
-  return isFinalHarvest && isBrowserScope
+  if (isFinalHarvest && isBrowserScope) {
     // Use sendBeacon for final harvest
-    ? beacon
-    // If not final harvest, or not browserScope, always use xhr post
-    : xhr
+    return beacon
+  }
+
+  // If not final harvest, or not browserScope, use XHR post if available
+  if (typeof XMLHttpRequest !== 'undefined') {
+    return xhr
+  }
+
+  // Fallback for web workers where XMLHttpRequest is not available
+  return xhrFetch
+}
+
+/**
+ *
+ * @param url
+ * @param body
+ * @param method
+ * @param headers
+ * @returns {Promise<Response>}
+ */
+export function xhrFetch ({
+  url,
+  body = null,
+  method = 'POST',
+  headers = [{
+    key: 'content-type',
+    value: 'text/plain'
+  }]
+}) {
+  const objHeaders = {}
+
+  for (const header of headers) {
+    objHeaders[header.key] = header.value
+  }
+
+  return fetch(url, { headers: objHeaders, method, body, credentials: 'include' })
 }
 
 /**

package/src/common/wrap/wrap-events.js

@@ -37,8 +37,8 @@ export function wrapEvents (sharedEE) {
   // Guard against instrumenting environments w/o necessary features
   if ('getPrototypeOf' in Object) {
     if (isBrowserScope) findEventListenerProtoAndCb(document, wrapNode)
+    if (XHR) findEventListenerProtoAndCb(XHR.prototype, wrapNode)
     findEventListenerProtoAndCb(globalScope, wrapNode)
-    findEventListenerProtoAndCb(XHR.prototype, wrapNode)
   }
 
   ee.on(ADD_EVENT_LISTENER + '-start', function (args, target) {

package/src/common/wrap/wrap-logger.js

@@ -10,7 +10,9 @@
 import { ee as baseEE, contextId } from '../event-emitter/contextual-ee'
 import { EventContext } from '../event-emitter/event-context'
 import { warn } from '../util/console'
-import { createWrapperWithEmitter as wfn } from './wrap-function'
+import { flag, createWrapperWithEmitter as wfn } from './wrap-function'
+
+const contextMap = new Map()
 
 /**
  * Wraps a supplied function and adds emitter events under the `-wrap-logger-` prefix
@@ -33,8 +35,11 @@ export function wrapLogger(sharedEE, parent, loggerFn, context) {
   ctx.level = context.level
   ctx.customAttributes = context.customAttributes
 
+  const contextLookupKey = parent[loggerFn]?.[flag] || parent[loggerFn]
+  contextMap.set(contextLookupKey, ctx)
+
   /** observe calls to <loggerFn> and emit events prefixed with `wrap-logger-` */
-  wrapFn.inPlace(parent, [loggerFn], 'wrap-logger-', ctx)
+  wrapFn.inPlace(parent, [loggerFn], 'wrap-logger-', () => contextMap.get(contextLookupKey))
 
   return ee
 }

package/src/common/wrap/wrap-xhr.js

@@ -28,6 +28,8 @@ export function wrapXhr (sharedEE) {
   var baseEE = sharedEE || contextualEE
   const ee = scopedEE(baseEE)
 
+  if (typeof globalScope.XMLHttpRequest === 'undefined') return ee
+
   // Notice if our wrapping never ran yet, the falsy NaN will not early return; but if it has,
   // then we increment the count to track # of feats using this at runtime.
   if (wrapped[ee.debugId]++) return ee

package/src/features/generic_events/aggregate/index.js

@@ -13,7 +13,6 @@ import { now } from '../../../common/timing/now'
 import { registerHandler } from '../../../common/event-emitter/register-handler'
 import { SUPPORTABILITY_METRIC_CHANNEL } from '../../metrics/constants'
 import { applyFnToProps } from '../../../common/util/traverse'
-import { IDEAL_PAYLOAD_SIZE } from '../../../common/constants/agent-constants'
 import { FEATURE_TO_ENDPOINT } from '../../../loaders/features/features'
 import { UserActionsAggregator } from './user-actions/user-actions-aggregator'
 import { isIFrameWindow } from '../../../common/dom/iframe'
@@ -177,9 +176,16 @@ export class Aggregate extends AggregateBase {
       ...obj
     }
 
-    this.events.add(eventAttributes)
-
-    this.checkEventLimits()
+    const addedEvent = this.events.add(eventAttributes)
+    if (!addedEvent && !this.events.isEmpty()) {
+      /** could not add the event because it pushed the buffer over the limit
+       * so we harvest early, and try to add it again now that the buffer is cleared
+       * if it fails again, we do nothing
+       */
+      this.ee.emit(SUPPORTABILITY_METRIC_CHANNEL, ['GenericEvents/Harvest/Max/Seen'])
+      this.harvestScheduler.runHarvest()
+      this.events.add(eventAttributes)
+    }
   }
 
   serializer (eventBuffer) {
@@ -189,12 +195,4 @@ export class Aggregate extends AggregateBase {
   queryStringsBuilder () {
     return { ua: this.agentRef.info.userAttributes, at: this.agentRef.info.atts }
   }
-
-  checkEventLimits () {
-    // check if we've reached any harvest limits...
-    if (this.events.byteSize() > IDEAL_PAYLOAD_SIZE) {
-      this.ee.emit(SUPPORTABILITY_METRIC_CHANNEL, ['GenericEvents/Harvest/Max/Seen'])
-      this.harvestScheduler.runHarvest()
-    }
-  }
 }