@newrelic/browser-agent 1.244.0 → 1.245.0

package/CHANGELOG.md

@@ -3,6 +3,15 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.245.0](https://github.com/newrelic/newrelic-browser-agent/compare/v1.244.0...v1.245.0) (2023-10-18)
+
+
+### Features
+
+* Allow boolean values in setCustomAttribute ([#776](https://github.com/newrelic/newrelic-browser-agent/issues/776)) ([d44f033](https://github.com/newrelic/newrelic-browser-agent/commit/d44f03384655f47c5f8a63db02f7eaac58585a86))
+* Detect GraphQL operation names and types in AJAX calls ([#764](https://github.com/newrelic/newrelic-browser-agent/issues/764)) ([8587afc](https://github.com/newrelic/newrelic-browser-agent/commit/8587afc9dbc18a52048f467c77e5ededc225eb2a))
+* Removing worker build ([#762](https://github.com/newrelic/newrelic-browser-agent/issues/762)) ([15f801b](https://github.com/newrelic/newrelic-browser-agent/commit/15f801b1a48c6e60f8f50f349aa382c77a073480))
+
 ## [1.244.0](https://github.com/newrelic/newrelic-browser-agent/compare/v1.243.1...v1.244.0) (2023-10-10)
 
 

package/dist/cjs/cdn/polyfills.js

@@ -10,8 +10,11 @@ require("core-js/stable/array/some");
 require("core-js/stable/object/assign");
 require("core-js/stable/object/entries");
 require("core-js/stable/object/values");
+require("core-js/stable/object/from-entries");
 require("core-js/stable/map");
 require("core-js/stable/reflect");
 require("core-js/stable/set");
 require("core-js/stable/weak-set");
-require("core-js/stable/object/get-own-property-descriptors");
+require("core-js/stable/object/get-own-property-descriptors");
+require("core-js/stable/url");
+require("core-js/stable/url-search-params");

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 = "1.244.0";
+const VERSION = "1.245.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 = "1.244.0";
+const VERSION = "1.245.0";
 
 /**
  * Exposes the build type of the agent

package/dist/cjs/common/url/parse-url.js

@@ -25,18 +25,19 @@ function parseUrl(url) {
   let urlEl;
   var location = _runtime.globalScope?.location;
   var ret = {};
-  if (_runtime.isBrowserScope) {
-    // Use an anchor dom element to resolve the url natively.
-    urlEl = document.createElement('a');
-    urlEl.href = url;
-  } else {
-    try {
-      urlEl = new URL(url, location.href);
-    } catch (err) {
+  try {
+    urlEl = new URL(url, location.href);
+  } catch (err) {
+    if (_runtime.isBrowserScope) {
+      // Use an anchor dom element to resolve the url natively.
+      urlEl = document.createElement('a');
+      urlEl.href = url;
+    } else {
       return ret;
     }
   }
   ret.port = urlEl.port;
+  ret.search = urlEl.search;
   var firstSplit = urlEl.href.split('://');
   if (!ret.port && firstSplit[1]) {
     ret.port = firstSplit[1].split('/')[0].split('@').pop().split(':')[1];

package/dist/cjs/common/util/type-check.js

@@ -0,0 +1,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isPureObject = isPureObject;
+/**
+ * Tests a passed object to see if it is a pure object or not. All non-primatives in JS
+ * are technically objects and would pass a `typeof` check.
+ * @param {*} obj Input object to be tested
+**/
+function isPureObject(obj) {
+  return obj?.constructor === {}.constructor;
+}

package/dist/cjs/features/ajax/aggregate/gql.js

@@ -0,0 +1,94 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.parseGQL = parseGQL;
+var _typeCheck = require("../../../common/util/type-check");
+/**
+ * @typedef {object} GQLMetadata
+ * @property {string} operationName Name of the operation
+ * @property {string} operationType Type of the operation
+ * @property {string} operationFramework Framework responsible for the operation
+ */
+
+/**
+ * Parses and returns the graphql metadata from a network request. If the network
+ * request is not a graphql call, undefined will be returned.
+ * @param {object|string} body Ajax request body
+ * @param {string} query Ajax request query param string
+ * @returns {GQLMetadata | undefined}
+ */
+function parseGQL() {
+  let {
+    body,
+    query
+  } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  if (!body && !query) return;
+  try {
+    const gqlBody = parseBatchGQL(parseGQLContents(body));
+    if (gqlBody) return gqlBody;
+    const gqlQuery = parseSingleGQL(parseGQLQueryString(query));
+    if (gqlQuery) return gqlQuery;
+  } catch (err) {
+    // parsing failed, return undefined
+  }
+}
+
+/**
+ * @param {string|Object} gql The GraphQL object body sent to a GQL server
+ * @returns {GQLMetadata}
+ */
+function parseSingleGQL(contents) {
+  if (typeof contents !== 'object' || !contents.query || typeof contents.query !== 'string') return;
+
+  /** parses gql query string and returns [fullmatch, type match, name match] */
+  const matches = contents.query.trim().match(/^(query|mutation|subscription)\s?(\w*)/);
+  const operationType = matches?.[1];
+  if (!operationType) return;
+  const operationName = contents.operationName || matches?.[2] || 'Anonymous';
+  return {
+    operationName,
+    // the operation name of the indiv query
+    operationType,
+    // query, mutation, or subscription,
+    operationFramework: 'GraphQL'
+  };
+}
+function parseBatchGQL(contents) {
+  if (!contents) return;
+  if (!Array.isArray(contents)) contents = [contents];
+  const opNames = [];
+  const opTypes = [];
+  for (let content of contents) {
+    const operation = parseSingleGQL(content);
+    if (!operation) continue;
+    opNames.push(operation.operationName);
+    opTypes.push(operation.operationType);
+  }
+  if (!opTypes.length) return;
+  return {
+    operationName: opNames.join(','),
+    // the operation name of the indiv query -- joined by ',' for batched results
+    operationType: opTypes.join(','),
+    // query, mutation, or subscription -- joined by ',' for batched results
+    operationFramework: 'GraphQL'
+  };
+}
+function parseGQLContents(gqlContents) {
+  let contents;
+  if (!gqlContents || typeof gqlContents !== 'string' && typeof gqlContents !== 'object') return;else if (typeof gqlContents === 'string') contents = JSON.parse(gqlContents);else contents = gqlContents;
+  if (!(0, _typeCheck.isPureObject)(contents) && !Array.isArray(contents)) return;
+  let isValid = false;
+  if (Array.isArray(contents)) isValid = contents.some(x => validateGQLObject(x));else isValid = validateGQLObject(contents);
+  if (!isValid) return;
+  return contents;
+}
+function parseGQLQueryString(gqlQueryString) {
+  if (!gqlQueryString || typeof gqlQueryString !== 'string') return;
+  const params = new URLSearchParams(gqlQueryString);
+  return parseGQLContents(Object.fromEntries(params));
+}
+function validateGQLObject(obj) {
+  return !(typeof obj !== 'object' || !obj.query || typeof obj.query !== 'string');
+}

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

@@ -15,6 +15,7 @@ var _constants = require("../constants");
 var _features = require("../../../loaders/features/features");
 var _constants2 = require("../../metrics/constants");
 var _aggregateBase = require("../../utils/aggregate-base");
+var _gql = require("./gql");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -116,6 +117,12 @@ class Aggregate extends _aggregateBase.AggregateBase {
         event.spanTimestamp = xhrContext.dt.timestamp;
       }
 
+      // parsed from the AJAX body, looking for operationName param & parsing query for operationType
+      event.gql = params.gql = (0, _gql.parseGQL)({
+        body: this.body,
+        query: this?.parsedOrigin?.search
+      });
+
       // if the ajax happened inside an interaction, hold it until the interaction finishes
       if (this.spaNode) {
         var interactionId = this.spaNode.interaction.id;
@@ -205,7 +212,11 @@ class Aggregate extends _aggregateBase.AggregateBase {
         var insert = '2,';
 
         // add custom attributes
-        var attrParts = (0, _belSerializer.addCustomAttributes)((0, _config.getInfo)(agentIdentifier).jsAttributes || {}, this.addString);
+        // gql decorators are added as custom attributes to alleviate need for new BEL schema
+        var attrParts = (0, _belSerializer.addCustomAttributes)({
+          ...((0, _config.getInfo)(agentIdentifier).jsAttributes || {}),
+          ...(event.gql || {})
+        }, this.addString);
         fields.unshift((0, _belSerializer.numeric)(attrParts.length));
         insert += fields.join(',');
         if (attrParts && attrParts.length > 0) {

package/dist/cjs/features/ajax/instrument/index.js

@@ -161,6 +161,7 @@ function subscribeToEvents(agentIdentifier, ee, handler, dt) {
       if (size) metrics.txSize = size;
     }
     this.startTime = (0, _now.now)();
+    this.body = data;
     this.listener = function (evt) {
       try {
         if (evt.type === 'abort' && !context.loadCaptureCalled) {
@@ -308,6 +309,7 @@ function subscribeToEvents(agentIdentifier, ee, handler, dt) {
     addUrl(this, url);
     var method = ('' + (target && target instanceof origRequest && target.method || opts.method || 'GET')).toUpperCase();
     this.params.method = method;
+    this.body = opts.body;
     this.txSize = (0, _dataSize.dataSize)(opts.body) || 0;
   }
 

package/dist/cjs/features/spa/aggregate/serializer.js

@@ -91,6 +91,13 @@ class Serializer extends _sharedContext.SharedContext {
           break;
         case 2:
           fields.push(addString(params.method), (0, _belSerializer.numeric)(params.status), addString(params.host), addString(params.pathname), (0, _belSerializer.numeric)(metrics.txSize), (0, _belSerializer.numeric)(metrics.rxSize), attrs.isFetch ? 1 : attrs.isJSONP ? 2 : '', addString(node.id), (0, _belSerializer.nullable)(node.dt && node.dt.spanId, addString, true) + (0, _belSerializer.nullable)(node.dt && node.dt.traceId, addString, true) + (0, _belSerializer.nullable)(node.dt && node.dt.timestamp, _belSerializer.numeric, false));
+
+          // add params.gql here
+          if (Object.keys(params?.gql || {}).length) {
+            var ajaxAttrParts = (0, _belSerializer.addCustomAttributes)(params.gql, addString);
+            children = children.concat(ajaxAttrParts);
+            attrCount = ajaxAttrParts.length;
+          }
           break;
         case 4:
           var tracedTime = attrs.tracedTime;

package/dist/cjs/index.js

@@ -69,15 +69,8 @@ Object.defineProperty(exports, "Spa", {
     return _spa.Spa;
   }
 });
-Object.defineProperty(exports, "WorkerAgent", {
-  enumerable: true,
-  get: function () {
-    return _workerAgent.WorkerAgent;
-  }
-});
 var _agent = require("./loaders/agent");
 var _browserAgent = require("./loaders/browser-agent");
-var _workerAgent = require("./loaders/worker-agent");
 var _microAgent = require("./loaders/micro-agent");
 var _ajax = require("./features/ajax");
 var _jserrors = require("./features/jserrors");

package/dist/cjs/loaders/api/api.js

@@ -99,8 +99,8 @@ function setAPI(agentIdentifier, forceDrain) {
       (0, _console.warn)("Failed to execute setCustomAttribute.\nName must be a string type, but a type of <".concat(typeof name, "> was provided."));
       return;
     }
-    if (!(['string', 'number'].includes(typeof value) || value === null)) {
-      (0, _console.warn)("Failed to execute setCustomAttribute.\nNon-null value must be a string or number type, but a type of <".concat(typeof value, "> was provided."));
+    if (!(['string', 'number', 'boolean'].includes(typeof value) || value === null)) {
+      (0, _console.warn)("Failed to execute setCustomAttribute.\nNon-null value must be a string, number or boolean type, but a type of <".concat(typeof value, "> was provided."));
       return;
     }
     return appendJsAttribute(name, value, 'setCustomAttribute', persistAttribute);

package/dist/esm/cdn/polyfills.js

@@ -13,8 +13,11 @@ import 'core-js/stable/array/some';
 import 'core-js/stable/object/assign';
 import 'core-js/stable/object/entries';
 import 'core-js/stable/object/values';
+import 'core-js/stable/object/from-entries';
 import 'core-js/stable/map';
 import 'core-js/stable/reflect';
 import 'core-js/stable/set';
 import 'core-js/stable/weak-set';
-import 'core-js/stable/object/get-own-property-descriptors';
+import 'core-js/stable/object/get-own-property-descriptors';
+import 'core-js/stable/url';
+import 'core-js/stable/url-search-params';

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

@@ -6,7 +6,7 @@
 /**
  * Exposes the version of the agent
  */
-export const VERSION = "1.244.0";
+export const VERSION = "1.245.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.244.0";
+export const VERSION = "1.245.0";
 
 /**
  * Exposes the build type of the agent

package/dist/esm/common/url/parse-url.js

@@ -19,18 +19,19 @@ export function parseUrl(url) {
   let urlEl;
   var location = globalScope?.location;
   var ret = {};
-  if (isBrowserScope) {
-    // Use an anchor dom element to resolve the url natively.
-    urlEl = document.createElement('a');
-    urlEl.href = url;
-  } else {
-    try {
-      urlEl = new URL(url, location.href);
-    } catch (err) {
+  try {
+    urlEl = new URL(url, location.href);
+  } catch (err) {
+    if (isBrowserScope) {
+      // Use an anchor dom element to resolve the url natively.
+      urlEl = document.createElement('a');
+      urlEl.href = url;
+    } else {
       return ret;
     }
   }
   ret.port = urlEl.port;
+  ret.search = urlEl.search;
   var firstSplit = urlEl.href.split('://');
   if (!ret.port && firstSplit[1]) {
     ret.port = firstSplit[1].split('/')[0].split('@').pop().split(':')[1];

package/dist/esm/common/util/type-check.js

@@ -0,0 +1,8 @@
+/**
+ * Tests a passed object to see if it is a pure object or not. All non-primatives in JS
+ * are technically objects and would pass a `typeof` check.
+ * @param {*} obj Input object to be tested
+**/
+export function isPureObject(obj) {
+  return obj?.constructor === {}.constructor;
+}

package/dist/esm/features/ajax/aggregate/gql.js

@@ -0,0 +1,89 @@
+import { isPureObject } from '../../../common/util/type-check';
+
+/**
+ * @typedef {object} GQLMetadata
+ * @property {string} operationName Name of the operation
+ * @property {string} operationType Type of the operation
+ * @property {string} operationFramework Framework responsible for the operation
+ */
+
+/**
+ * Parses and returns the graphql metadata from a network request. If the network
+ * request is not a graphql call, undefined will be returned.
+ * @param {object|string} body Ajax request body
+ * @param {string} query Ajax request query param string
+ * @returns {GQLMetadata | undefined}
+ */
+export function parseGQL() {
+  let {
+    body,
+    query
+  } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  if (!body && !query) return;
+  try {
+    const gqlBody = parseBatchGQL(parseGQLContents(body));
+    if (gqlBody) return gqlBody;
+    const gqlQuery = parseSingleGQL(parseGQLQueryString(query));
+    if (gqlQuery) return gqlQuery;
+  } catch (err) {
+    // parsing failed, return undefined
+  }
+}
+
+/**
+ * @param {string|Object} gql The GraphQL object body sent to a GQL server
+ * @returns {GQLMetadata}
+ */
+function parseSingleGQL(contents) {
+  if (typeof contents !== 'object' || !contents.query || typeof contents.query !== 'string') return;
+
+  /** parses gql query string and returns [fullmatch, type match, name match] */
+  const matches = contents.query.trim().match(/^(query|mutation|subscription)\s?(\w*)/);
+  const operationType = matches?.[1];
+  if (!operationType) return;
+  const operationName = contents.operationName || matches?.[2] || 'Anonymous';
+  return {
+    operationName,
+    // the operation name of the indiv query
+    operationType,
+    // query, mutation, or subscription,
+    operationFramework: 'GraphQL'
+  };
+}
+function parseBatchGQL(contents) {
+  if (!contents) return;
+  if (!Array.isArray(contents)) contents = [contents];
+  const opNames = [];
+  const opTypes = [];
+  for (let content of contents) {
+    const operation = parseSingleGQL(content);
+    if (!operation) continue;
+    opNames.push(operation.operationName);
+    opTypes.push(operation.operationType);
+  }
+  if (!opTypes.length) return;
+  return {
+    operationName: opNames.join(','),
+    // the operation name of the indiv query -- joined by ',' for batched results
+    operationType: opTypes.join(','),
+    // query, mutation, or subscription -- joined by ',' for batched results
+    operationFramework: 'GraphQL'
+  };
+}
+function parseGQLContents(gqlContents) {
+  let contents;
+  if (!gqlContents || typeof gqlContents !== 'string' && typeof gqlContents !== 'object') return;else if (typeof gqlContents === 'string') contents = JSON.parse(gqlContents);else contents = gqlContents;
+  if (!isPureObject(contents) && !Array.isArray(contents)) return;
+  let isValid = false;
+  if (Array.isArray(contents)) isValid = contents.some(x => validateGQLObject(x));else isValid = validateGQLObject(contents);
+  if (!isValid) return;
+  return contents;
+}
+function parseGQLQueryString(gqlQueryString) {
+  if (!gqlQueryString || typeof gqlQueryString !== 'string') return;
+  const params = new URLSearchParams(gqlQueryString);
+  return parseGQLContents(Object.fromEntries(params));
+}
+function validateGQLObject(obj) {
+  return !(typeof obj !== 'object' || !obj.query || typeof obj.query !== 'string');
+}

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

@@ -13,6 +13,7 @@ import { FEATURE_NAME } from '../constants';
 import { FEATURE_NAMES } from '../../../loaders/features/features';
 import { SUPPORTABILITY_METRIC_CHANNEL } from '../../metrics/constants';
 import { AggregateBase } from '../../utils/aggregate-base';
+import { parseGQL } from './gql';
 export class Aggregate extends AggregateBase {
   static featureName = FEATURE_NAME;
   constructor(agentIdentifier, aggregator) {
@@ -109,6 +110,12 @@ export class Aggregate extends AggregateBase {
         event.spanTimestamp = xhrContext.dt.timestamp;
       }
 
+      // parsed from the AJAX body, looking for operationName param & parsing query for operationType
+      event.gql = params.gql = parseGQL({
+        body: this.body,
+        query: this?.parsedOrigin?.search
+      });
+
       // if the ajax happened inside an interaction, hold it until the interaction finishes
       if (this.spaNode) {
         var interactionId = this.spaNode.interaction.id;
@@ -198,7 +205,11 @@ export class Aggregate extends AggregateBase {
         var insert = '2,';
 
         // add custom attributes
-        var attrParts = addCustomAttributes(getInfo(agentIdentifier).jsAttributes || {}, this.addString);
+        // gql decorators are added as custom attributes to alleviate need for new BEL schema
+        var attrParts = addCustomAttributes({
+          ...(getInfo(agentIdentifier).jsAttributes || {}),
+          ...(event.gql || {})
+        }, this.addString);
         fields.unshift(numeric(attrParts.length));
         insert += fields.join(',');
         if (attrParts && attrParts.length > 0) {

package/dist/esm/features/ajax/instrument/index.js

@@ -153,6 +153,7 @@ function subscribeToEvents(agentIdentifier, ee, handler, dt) {
       if (size) metrics.txSize = size;
     }
     this.startTime = now();
+    this.body = data;
     this.listener = function (evt) {
       try {
         if (evt.type === 'abort' && !context.loadCaptureCalled) {
@@ -300,6 +301,7 @@ function subscribeToEvents(agentIdentifier, ee, handler, dt) {
     addUrl(this, url);
     var method = ('' + (target && target instanceof origRequest && target.method || opts.method || 'GET')).toUpperCase();
     this.params.method = method;
+    this.body = opts.body;
     this.txSize = dataSize(opts.body) || 0;
   }
 

package/dist/esm/features/spa/aggregate/serializer.js

@@ -84,6 +84,13 @@ export class Serializer extends SharedContext {
           break;
         case 2:
           fields.push(addString(params.method), numeric(params.status), addString(params.host), addString(params.pathname), numeric(metrics.txSize), numeric(metrics.rxSize), attrs.isFetch ? 1 : attrs.isJSONP ? 2 : '', addString(node.id), nullable(node.dt && node.dt.spanId, addString, true) + nullable(node.dt && node.dt.traceId, addString, true) + nullable(node.dt && node.dt.timestamp, numeric, false));
+
+          // add params.gql here
+          if (Object.keys(params?.gql || {}).length) {
+            var ajaxAttrParts = addCustomAttributes(params.gql, addString);
+            children = children.concat(ajaxAttrParts);
+            attrCount = ajaxAttrParts.length;
+          }
           break;
         case 4:
           var tracedTime = attrs.tracedTime;

package/dist/esm/index.js

@@ -1,6 +1,5 @@
 export { Agent } from './loaders/agent';
 export { BrowserAgent } from './loaders/browser-agent';
-export { WorkerAgent } from './loaders/worker-agent';
 export { MicroAgent } from './loaders/micro-agent';
 export { Ajax } from './features/ajax';
 export { JSErrors } from './features/jserrors';

package/dist/esm/loaders/api/api.js

@@ -90,8 +90,8 @@ export function setAPI(agentIdentifier, forceDrain) {
       warn("Failed to execute setCustomAttribute.\nName must be a string type, but a type of <".concat(typeof name, "> was provided."));
       return;
     }
-    if (!(['string', 'number'].includes(typeof value) || value === null)) {
-      warn("Failed to execute setCustomAttribute.\nNon-null value must be a string or number type, but a type of <".concat(typeof value, "> was provided."));
+    if (!(['string', 'number', 'boolean'].includes(typeof value) || value === null)) {
+      warn("Failed to execute setCustomAttribute.\nNon-null value must be a string, number or boolean type, but a type of <".concat(typeof value, "> was provided."));
       return;
     }
     return appendJsAttribute(name, value, 'setCustomAttribute', persistAttribute);

package/dist/types/common/url/parse-url.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-url.d.ts","sourceRoot":"","sources":["../../../../src/common/url/parse-url.js"],"names":[],"mappings":"AASA,wCA4DC"}
+{"version":3,"file":"parse-url.d.ts","sourceRoot":"","sources":["../../../../src/common/url/parse-url.js"],"names":[],"mappings":"AASA,wCA8DC"}

package/dist/types/common/util/type-check.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Tests a passed object to see if it is a pure object or not. All non-primatives in JS
+ * are technically objects and would pass a `typeof` check.
+ * @param {*} obj Input object to be tested
+**/
+export function isPureObject(obj: any): boolean;
+//# sourceMappingURL=type-check.d.ts.map

package/dist/types/common/util/type-check.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"type-check.d.ts","sourceRoot":"","sources":["../../../../src/common/util/type-check.js"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,gDAEC"}

package/dist/types/features/ajax/aggregate/gql.d.ts

@@ -0,0 +1,29 @@
+/**
+ * @typedef {object} GQLMetadata
+ * @property {string} operationName Name of the operation
+ * @property {string} operationType Type of the operation
+ * @property {string} operationFramework Framework responsible for the operation
+ */
+/**
+ * Parses and returns the graphql metadata from a network request. If the network
+ * request is not a graphql call, undefined will be returned.
+ * @param {object|string} body Ajax request body
+ * @param {string} query Ajax request query param string
+ * @returns {GQLMetadata | undefined}
+ */
+export function parseGQL({ body, query }?: object | string): GQLMetadata | undefined;
+export type GQLMetadata = {
+    /**
+     * Name of the operation
+     */
+    operationName: string;
+    /**
+     * Type of the operation
+     */
+    operationType: string;
+    /**
+     * Framework responsible for the operation
+     */
+    operationFramework: string;
+};
+//# sourceMappingURL=gql.d.ts.map

package/dist/types/features/ajax/aggregate/gql.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"gql.d.ts","sourceRoot":"","sources":["../../../../../src/features/ajax/aggregate/gql.js"],"names":[],"mappings":"AAEA;;;;;GAKG;AAEH;;;;;;GAMG;AACH,2CAJW,MAAM,GAAC,MAAM,GAEX,WAAW,GAAG,SAAS,CAYnC;;;;;mBAtBa,MAAM;;;;mBACN,MAAM;;;;wBACN,MAAM"}

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/ajax/aggregate/index.js"],"names":[],"mappings":"AAgBA;IACE,2BAAiC;IACjC,mDAgOC;IAzMC,qGAAwB;IACxB;;;;4BAAoC;IACpC;;;mBAA2E;CAwM9E;8BArO6B,4BAA4B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/ajax/aggregate/index.js"],"names":[],"mappings":"AAiBA;IACE,2BAAiC;IACjC,mDAuOC;IAhNC,qGAAwB;IACxB;;;;4BAAoC;IACpC;;;mBAA2E;CA+M9E;8BA7O6B,4BAA4B"}

package/dist/types/features/spa/aggregate/serializer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serializer.d.ts","sourceRoot":"","sources":["../../../../../src/features/spa/aggregate/serializer.js"],"names":[],"mappings":"AAUA;IAII;;;;;;OAMG;IACH,gBAFU,MAAM,GAAC,SAAS,CAEK;IAGjC,0EASC;IAED,oFAMC;IAED,iHAyJC;CACF;8BA9L6B,wCAAwC"}
+{"version":3,"file":"serializer.d.ts","sourceRoot":"","sources":["../../../../../src/features/spa/aggregate/serializer.js"],"names":[],"mappings":"AAUA;IAII;;;;;;OAMG;IACH,gBAFU,MAAM,GAAC,SAAS,CAEK;IAGjC,0EASC;IAED,oFAMC;IAED,iHA+JC;CACF;8BApM6B,wCAAwC"}

package/dist/types/index.d.ts

@@ -1,6 +1,5 @@
 export { Agent } from "./loaders/agent";
 export { BrowserAgent } from "./loaders/browser-agent";
-export { WorkerAgent } from "./loaders/worker-agent";
 export { MicroAgent } from "./loaders/micro-agent";
 export { Ajax } from "./features/ajax";
 export { JSErrors } from "./features/jserrors";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newrelic/browser-agent",
-  "version": "1.244.0",
+  "version": "1.245.0",
   "private": false,
   "author": "New Relic Browser Agent Team <browser-agent@newrelic.com>",
   "description": "New Relic Browser Agent",
@@ -26,9 +26,6 @@
       "loaders/micro-agent": [
         "dist/types/loaders/micro-agent.d.ts"
       ],
-      "loaders/worker-agent": [
-        "dist/types/loaders/worker-agent.d.ts"
-      ],
       "features/ajax": [
         "dist/types/features/ajax/index.d.ts"
       ],
@@ -81,11 +78,6 @@
       "require": "./dist/cjs/loaders/micro-agent.js",
       "default": "./dist/esm/loaders/micro-agent.js"
     },
-    "./loaders/worker-agent": {
-      "types": "./dist/types/loaders/worker-agent.d.ts",
-      "require": "./dist/cjs/loaders/worker-agent.js",
-      "default": "./dist/esm/loaders/worker-agent.js"
-    },
     "./features/ajax": {
       "types": "./dist/types/features/ajax/index.d.ts",
       "require": "./dist/cjs/features/ajax/index.js",

package/src/cdn/polyfills.js

@@ -13,8 +13,11 @@ import 'core-js/stable/array/some'
 import 'core-js/stable/object/assign'
 import 'core-js/stable/object/entries'
 import 'core-js/stable/object/values'
+import 'core-js/stable/object/from-entries'
 import 'core-js/stable/map'
 import 'core-js/stable/reflect'
 import 'core-js/stable/set'
 import 'core-js/stable/weak-set'
 import 'core-js/stable/object/get-own-property-descriptors'
+import 'core-js/stable/url'
+import 'core-js/stable/url-search-params'

package/src/common/url/parse-url.js

@@ -23,20 +23,22 @@ export function parseUrl (url) {
   var location = globalScope?.location
   var ret = {}
 
-  if (isBrowserScope) {
+  try {
+    urlEl = new URL(url, location.href)
+  } catch (err) {
+    if (isBrowserScope) {
     // Use an anchor dom element to resolve the url natively.
-    urlEl = document.createElement('a')
-    urlEl.href = url
-  } else {
-    try {
-      urlEl = new URL(url, location.href)
-    } catch (err) {
+      urlEl = document.createElement('a')
+      urlEl.href = url
+    } else {
       return ret
     }
   }
 
   ret.port = urlEl.port
 
+  ret.search = urlEl.search
+
   var firstSplit = urlEl.href.split('://')
 
   if (!ret.port && firstSplit[1]) {

package/src/common/util/type-check.js

@@ -0,0 +1,8 @@
+/**
+ * Tests a passed object to see if it is a pure object or not. All non-primatives in JS
+ * are technically objects and would pass a `typeof` check.
+ * @param {*} obj Input object to be tested
+**/
+export function isPureObject (obj) {
+  return obj?.constructor === ({}).constructor
+}

package/src/features/ajax/aggregate/gql.js

@@ -0,0 +1,95 @@
+import { isPureObject } from '../../../common/util/type-check'
+
+/**
+ * @typedef {object} GQLMetadata
+ * @property {string} operationName Name of the operation
+ * @property {string} operationType Type of the operation
+ * @property {string} operationFramework Framework responsible for the operation
+ */
+
+/**
+ * Parses and returns the graphql metadata from a network request. If the network
+ * request is not a graphql call, undefined will be returned.
+ * @param {object|string} body Ajax request body
+ * @param {string} query Ajax request query param string
+ * @returns {GQLMetadata | undefined}
+ */
+export function parseGQL ({ body, query } = {}) {
+  if (!body && !query) return
+  try {
+    const gqlBody = parseBatchGQL(parseGQLContents(body))
+    if (gqlBody) return gqlBody
+    const gqlQuery = parseSingleGQL(parseGQLQueryString(query))
+    if (gqlQuery) return gqlQuery
+  } catch (err) {
+    // parsing failed, return undefined
+  }
+}
+
+/**
+ * @param {string|Object} gql The GraphQL object body sent to a GQL server
+ * @returns {GQLMetadata}
+ */
+function parseSingleGQL (contents) {
+  if (typeof contents !== 'object' || !contents.query || typeof contents.query !== 'string') return
+
+  /** parses gql query string and returns [fullmatch, type match, name match] */
+  const matches = contents.query.trim().match(/^(query|mutation|subscription)\s?(\w*)/)
+  const operationType = matches?.[1]
+  if (!operationType) return
+  const operationName = contents.operationName || matches?.[2] || 'Anonymous'
+  return {
+    operationName, // the operation name of the indiv query
+    operationType, // query, mutation, or subscription,
+    operationFramework: 'GraphQL'
+  }
+}
+
+function parseBatchGQL (contents) {
+  if (!contents) return
+  if (!Array.isArray(contents)) contents = [contents]
+
+  const opNames = []
+  const opTypes = []
+  for (let content of contents) {
+    const operation = parseSingleGQL(content)
+    if (!operation) continue
+
+    opNames.push(operation.operationName)
+    opTypes.push(operation.operationType)
+  }
+
+  if (!opTypes.length) return
+  return {
+    operationName: opNames.join(','), // the operation name of the indiv query -- joined by ',' for batched results
+    operationType: opTypes.join(','), // query, mutation, or subscription -- joined by ',' for batched results
+    operationFramework: 'GraphQL'
+  }
+}
+
+function parseGQLContents (gqlContents) {
+  let contents
+
+  if (!gqlContents || (typeof gqlContents !== 'string' && typeof gqlContents !== 'object')) return
+  else if (typeof gqlContents === 'string') contents = JSON.parse(gqlContents)
+  else contents = gqlContents
+
+  if (!isPureObject(contents) && !Array.isArray(contents)) return
+
+  let isValid = false
+  if (Array.isArray(contents)) isValid = contents.some(x => validateGQLObject(x))
+  else isValid = validateGQLObject(contents)
+
+  if (!isValid) return
+  return contents
+}
+
+function parseGQLQueryString (gqlQueryString) {
+  if (!gqlQueryString || typeof gqlQueryString !== 'string') return
+  const params = new URLSearchParams(gqlQueryString)
+  return parseGQLContents(Object.fromEntries(params))
+}
+
+function validateGQLObject (obj) {
+  return !(typeof obj !== 'object' || !obj.query || typeof obj.query !== 'string')
+}

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

@@ -13,6 +13,7 @@ import { FEATURE_NAME } from '../constants'
 import { FEATURE_NAMES } from '../../../loaders/features/features'
 import { SUPPORTABILITY_METRIC_CHANNEL } from '../../metrics/constants'
 import { AggregateBase } from '../../utils/aggregate-base'
+import { parseGQL } from './gql'
 
 export class Aggregate extends AggregateBase {
   static featureName = FEATURE_NAME
@@ -119,6 +120,12 @@ export class Aggregate extends AggregateBase {
         event.spanTimestamp = xhrContext.dt.timestamp
       }
 
+      // parsed from the AJAX body, looking for operationName param & parsing query for operationType
+      event.gql = params.gql = parseGQL({
+        body: this.body,
+        query: this?.parsedOrigin?.search
+      })
+
       // if the ajax happened inside an interaction, hold it until the interaction finishes
       if (this.spaNode) {
         var interactionId = this.spaNode.interaction.id
@@ -221,7 +228,8 @@ export class Aggregate extends AggregateBase {
         var insert = '2,'
 
         // add custom attributes
-        var attrParts = addCustomAttributes(getInfo(agentIdentifier).jsAttributes || {}, this.addString)
+        // gql decorators are added as custom attributes to alleviate need for new BEL schema
+        var attrParts = addCustomAttributes({ ...(getInfo(agentIdentifier).jsAttributes || {}), ...(event.gql || {}) }, this.addString)
         fields.unshift(numeric(attrParts.length))
 
         insert += fields.join(',')

package/src/features/ajax/instrument/index.js

@@ -157,6 +157,8 @@ function subscribeToEvents (agentIdentifier, ee, handler, dt) {
 
     this.startTime = now()
 
+    this.body = data
+
     this.listener = function (evt) {
       try {
         if (evt.type === 'abort' && !(context.loadCaptureCalled)) {
@@ -329,6 +331,7 @@ function subscribeToEvents (agentIdentifier, ee, handler, dt) {
     var method = ('' + ((target && target instanceof origRequest && target.method) ||
       opts.method || 'GET')).toUpperCase()
     this.params.method = method
+    this.body = opts.body
 
     this.txSize = dataSize(opts.body) || 0
   }

package/src/features/spa/aggregate/serializer.js

@@ -102,7 +102,6 @@ export class Serializer extends SharedContext {
             nullable(attrs.firstPaint, numeric, true) +
             nullable(attrs.firstContentfulPaint, numeric, false)
           )
-
           var attrParts = addCustomAttributes(attrs.custom, addString)
           children = children.concat(attrParts)
           attrCount = attrParts.length
@@ -128,6 +127,13 @@ export class Serializer extends SharedContext {
             nullable(node.dt && node.dt.traceId, addString, true) +
             nullable(node.dt && node.dt.timestamp, numeric, false)
           )
+
+          // add params.gql here
+          if (Object.keys(params?.gql || {}).length) {
+            var ajaxAttrParts = addCustomAttributes(params.gql, addString)
+            children = children.concat(ajaxAttrParts)
+            attrCount = ajaxAttrParts.length
+          }
           break
 
         case 4:

package/src/index.js

@@ -1,6 +1,5 @@
 export { Agent } from './loaders/agent'
 export { BrowserAgent } from './loaders/browser-agent'
-export { WorkerAgent } from './loaders/worker-agent'
 export { MicroAgent } from './loaders/micro-agent'
 
 export { Ajax } from './features/ajax'

package/src/loaders/api/api.js

@@ -89,8 +89,8 @@ export function setAPI (agentIdentifier, forceDrain) {
       warn(`Failed to execute setCustomAttribute.\nName must be a string type, but a type of <${typeof name}> was provided.`)
       return
     }
-    if (!(['string', 'number'].includes(typeof value) || value === null)) {
-      warn(`Failed to execute setCustomAttribute.\nNon-null value must be a string or number type, but a type of <${typeof value}> was provided.`)
+    if (!(['string', 'number', 'boolean'].includes(typeof value) || value === null)) {
+      warn(`Failed to execute setCustomAttribute.\nNon-null value must be a string, number or boolean type, but a type of <${typeof value}> was provided.`)
       return
     }
     return appendJsAttribute(name, value, 'setCustomAttribute', persistAttribute)

package/dist/cjs/cdn/worker.js

@@ -1,16 +0,0 @@
-"use strict";
-
-var _agent = require("../loaders/agent");
-var _instrument = require("../features/metrics/instrument");
-var _instrument2 = require("../features/jserrors/instrument");
-var _instrument3 = require("../features/ajax/instrument");
-var _instrument4 = require("../features/page_action/instrument");
-/**
- * @file Creates a "Worker" agent loader bundle composed of the core Agent and the subset of feature modules applicable
- * in a service worker context.
- */
-
-new _agent.Agent({
-  features: [_instrument.Instrument, _instrument2.Instrument, _instrument3.Instrument, _instrument4.Instrument],
-  loaderType: 'worker'
-});

package/dist/cjs/loaders/worker-agent.js

@@ -1,24 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.WorkerAgent = void 0;
-var _agent = require("./agent");
-var _instrument = require("../features/metrics/instrument");
-var _instrument2 = require("../features/jserrors/instrument");
-var _instrument3 = require("../features/ajax/instrument");
-var _instrument4 = require("../features/page_action/instrument");
-/**
- * A streamlined agent class designed for the service worker context, limited to features relevant in that scope.
- */
-class WorkerAgent extends _agent.Agent {
-  constructor(args) {
-    super({
-      ...args,
-      features: [_instrument.Instrument, _instrument2.Instrument, _instrument3.Instrument, _instrument4.Instrument],
-      loaderType: 'worker-agent'
-    });
-  }
-}
-exports.WorkerAgent = WorkerAgent;

package/dist/esm/cdn/worker.js

@@ -1,14 +0,0 @@
-/**
- * @file Creates a "Worker" agent loader bundle composed of the core Agent and the subset of feature modules applicable
- * in a service worker context.
- */
-
-import { Agent } from '../loaders/agent';
-import { Instrument as InstrumentMetrics } from '../features/metrics/instrument';
-import { Instrument as InstrumentErrors } from '../features/jserrors/instrument';
-import { Instrument as InstrumentXhr } from '../features/ajax/instrument';
-import { Instrument as InstrumentPageAction } from '../features/page_action/instrument';
-new Agent({
-  features: [InstrumentMetrics, InstrumentErrors, InstrumentXhr, InstrumentPageAction],
-  loaderType: 'worker'
-});

package/dist/esm/loaders/worker-agent.js

@@ -1,18 +0,0 @@
-import { Agent } from './agent';
-import { Instrument as InstrumentMetrics } from '../features/metrics/instrument';
-import { Instrument as InstrumentErrors } from '../features/jserrors/instrument';
-import { Instrument as InstrumentXhr } from '../features/ajax/instrument';
-import { Instrument as InstrumentPageAction } from '../features/page_action/instrument';
-
-/**
- * A streamlined agent class designed for the service worker context, limited to features relevant in that scope.
- */
-export class WorkerAgent extends Agent {
-  constructor(args) {
-    super({
-      ...args,
-      features: [InstrumentMetrics, InstrumentErrors, InstrumentXhr, InstrumentPageAction],
-      loaderType: 'worker-agent'
-    });
-  }
-}

package/dist/types/cdn/worker.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=worker.d.ts.map

package/dist/types/cdn/worker.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"worker.d.ts","sourceRoot":"","sources":["../../../src/cdn/worker.js"],"names":[],"mappings":""}

package/dist/types/loaders/worker-agent.d.ts

@@ -1,8 +0,0 @@
-/**
- * A streamlined agent class designed for the service worker context, limited to features relevant in that scope.
- */
-export class WorkerAgent extends Agent {
-    constructor(args: any);
-}
-import { Agent } from './agent';
-//# sourceMappingURL=worker-agent.d.ts.map

package/dist/types/loaders/worker-agent.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"worker-agent.d.ts","sourceRoot":"","sources":["../../../src/loaders/worker-agent.js"],"names":[],"mappings":"AAOA;;GAEG;AACH;IACE,uBAWC;CACF;sBAvBqB,SAAS"}

package/src/cdn/worker.js

@@ -1,21 +0,0 @@
-/**
- * @file Creates a "Worker" agent loader bundle composed of the core Agent and the subset of feature modules applicable
- * in a service worker context.
- */
-
-import { Agent } from '../loaders/agent'
-
-import { Instrument as InstrumentMetrics } from '../features/metrics/instrument'
-import { Instrument as InstrumentErrors } from '../features/jserrors/instrument'
-import { Instrument as InstrumentXhr } from '../features/ajax/instrument'
-import { Instrument as InstrumentPageAction } from '../features/page_action/instrument'
-
-new Agent({
-  features: [
-    InstrumentMetrics,
-    InstrumentErrors,
-    InstrumentXhr,
-    InstrumentPageAction
-  ],
-  loaderType: 'worker'
-})

package/src/loaders/worker-agent.js

@@ -1,24 +0,0 @@
-import { Agent } from './agent'
-
-import { Instrument as InstrumentMetrics } from '../features/metrics/instrument'
-import { Instrument as InstrumentErrors } from '../features/jserrors/instrument'
-import { Instrument as InstrumentXhr } from '../features/ajax/instrument'
-import { Instrument as InstrumentPageAction } from '../features/page_action/instrument'
-
-/**
- * A streamlined agent class designed for the service worker context, limited to features relevant in that scope.
- */
-export class WorkerAgent extends Agent {
-  constructor (args) {
-    super({
-      ...args,
-      features: [
-        InstrumentMetrics,
-        InstrumentErrors,
-        InstrumentXhr,
-        InstrumentPageAction
-      ],
-      loaderType: 'worker-agent'
-    })
-  }
-}