@newrelic/browser-agent 1.301.0-rc.1 → 1.301.0-rc.3

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

@@ -10,10 +10,10 @@ import { FEATURE_NAME, LOGGING_EVENT_EMITTER_CHANNEL, LOG_LEVELS, LOGGING_MODE }
 import { Log } from '../shared/log'
 import { isValidLogLevel } from '../shared/utils'
 import { applyFnToProps } from '../../../common/util/traverse'
-import { isContainerAgentTarget } from '../../../common/util/target'
 import { SESSION_EVENT_TYPES, SESSION_EVENTS } from '../../../common/session/constants'
 import { ABORT_REASONS } from '../../session_replay/constants'
 import { canEnableSessionTracking } from '../../utils/feature-gates'
+import { getVersion2Attributes } from '../../../common/util/mfe'
 
 export class Aggregate extends AggregateBase {
   static featureName = FEATURE_NAME
@@ -21,6 +21,8 @@ export class Aggregate extends AggregateBase {
     super(agentRef, FEATURE_NAME)
     this.isSessionTrackingEnabled = canEnableSessionTracking(agentRef.init) && agentRef.runtime.session
 
+    /** set up agg-level behaviors specific to this feature */
+    this.harvestOpts.raw = true
     super.customAttributesAreSeparate = true
 
     // The SessionEntity class can emit a message indicating the session was cleared and reset (expiry, inactivity). This feature must abort and never resume if that occurs.
@@ -34,7 +36,6 @@ export class Aggregate extends AggregateBase {
       else this.loggingMode = data.loggingMode
     })
 
-    this.harvestOpts.raw = true
     this.waitForFlags(['log']).then(([loggingMode]) => {
       const session = this.agentRef.runtime.session ?? {}
       if (this.loggingMode === LOGGING_MODE.OFF || (session.isNew && loggingMode === LOGGING_MODE.OFF)) {
@@ -63,11 +64,17 @@ export class Aggregate extends AggregateBase {
     })
   }
 
-  handleLog (timestamp, message, attributes = {}, level = LOG_LEVELS.INFO, targetEntityGuid) {
-    if (!this.agentRef.runtime.entityManager.get(targetEntityGuid)) return warn(56, this.featureName)
+  handleLog (timestamp, message, attributes = {}, level = LOG_LEVELS.INFO, target) {
     if (this.blocked || !this.loggingMode) return
 
     if (!attributes || typeof attributes !== 'object') attributes = {}
+
+    attributes = {
+      ...attributes,
+      /** Specific attributes only supplied if harvesting to endpoint version 2 */
+      ...(getVersion2Attributes(target, this))
+    }
+
     if (typeof level === 'string') level = level.toUpperCase()
     if (!isValidLogLevel(level)) return warn(30, level)
     if (this.loggingMode < (LOGGING_MODE[level] || Infinity)) {
@@ -100,25 +107,26 @@ export class Aggregate extends AggregateBase {
       level
     )
 
-    this.events.add(log, targetEntityGuid)
+    this.events.add(log)
   }
 
-  serializer (eventBuffer, targetEntityGuid) {
-    const target = this.agentRef.runtime.entityManager.get(targetEntityGuid)
+  serializer (eventBuffer) {
     const sessionEntity = this.agentRef.runtime.session
     return [{
       common: {
         /** Attributes in the `common` section are added to `all` logs generated in the payload */
         attributes: {
           ...this.agentRef.info.jsAttributes, // user-provided custom attributes
-          'entity.guid': target.entityGuid, // browser entity guid as provided API target OR the default from RUM response if not supplied
+          ...(this.harvestEndpointVersion === 1 && {
+            'entity.guid': this.agentRef.runtime.appMetadata.agents[0].entityGuid,
+            appId: this.agentRef.info.applicationID
+          }),
           ...(sessionEntity && {
             session: sessionEntity.state.value || '0', // The session ID that we generate and keep across page loads
-            hasReplay: sessionEntity.state.sessionReplayMode === 1 && isContainerAgentTarget(target, this.agentRef), // True if a session replay recording is running
+            hasReplay: sessionEntity.state.sessionReplayMode === 1, // True if a session replay recording is running
             hasTrace: sessionEntity.state.sessionTraceMode === 1 // True if a session trace recording is running
           }),
           ptid: this.agentRef.runtime.ptid, // page trace id
-          appId: target.applicationID || this.agentRef.info.applicationID, // Application ID from info object,
           standalone: Boolean(this.agentRef.info.sa), // copy paste (true) vs APM (false)
           agentVersion: this.agentRef.runtime.version, // browser agent version
           // The following 3 attributes are evaluated and dropped at ingest processing time and do not get stored on NRDB:
@@ -135,9 +143,8 @@ export class Aggregate extends AggregateBase {
     }]
   }
 
-  queryStringsBuilder (_, targetEntityGuid) {
-    const target = this.agentRef.runtime.entityManager.get(targetEntityGuid)
-    return { browser_monitoring_key: target.licenseKey }
+  queryStringsBuilder () {
+    return { browser_monitoring_key: this.agentRef.info.licenseKey }
   }
 
   /** Abort the feature, once aborted it will not resume */

package/src/features/logging/shared/utils.js

@@ -13,11 +13,11 @@ import { LOGGING_EVENT_EMITTER_CHANNEL, LOG_LEVELS } from '../constants'
    * @param {string} message - the log message string
    * @param {{[key: string]: *}} customAttributes - The log's custom attributes if any
    * @param {enum} level - the log level enum
-   * @param {object=} targetEntityGuid - the optional target entity guid provided by an api call
+   * @param {object=} target - the optional target provided by an api call
    */
-export function bufferLog (ee, message, customAttributes = {}, level = LOG_LEVELS.INFO, targetEntityGuid, timestamp = now()) {
+export function bufferLog (ee, message, customAttributes = {}, level = LOG_LEVELS.INFO, target, timestamp = now()) {
   handle(SUPPORTABILITY_METRIC_CHANNEL, [`API/logging/${level.toLowerCase()}/called`], undefined, FEATURE_NAMES.metrics, ee)
-  handle(LOGGING_EVENT_EMITTER_CHANNEL, [timestamp, message, customAttributes, level, targetEntityGuid], undefined, FEATURE_NAMES.logging, ee)
+  handle(LOGGING_EVENT_EMITTER_CHANNEL, [timestamp, message, customAttributes, level, target], undefined, FEATURE_NAMES.logging, ee)
 }
 
 /**

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

@@ -17,8 +17,6 @@ import { timeToFirstByte } from '../../../common/vitals/time-to-first-byte'
 import { now } from '../../../common/timing/now'
 import { TimeKeeper } from '../../../common/timing/time-keeper'
 import { applyFnToProps } from '../../../common/util/traverse'
-import { registerHandler } from '../../../common/event-emitter/register-handler'
-import { isContainerAgentTarget } from '../../../common/util/target'
 
 export class Aggregate extends AggregateBase {
   static featureName = CONSTANTS.FEATURE_NAME
@@ -29,10 +27,6 @@ export class Aggregate extends AggregateBase {
     this.firstByteToWindowLoad = 0 // our "frontend" duration
     this.firstByteToDomContent = 0 // our "dom processing" duration
 
-    registerHandler('send-rum', (customAttibutes, target) => {
-      this.sendRum(customAttibutes, target)
-    }, this.featureName, this.ee)
-
     if (!isValid(agentRef.info)) {
       this.ee.abort()
       return warn(43)
@@ -58,7 +52,7 @@ export class Aggregate extends AggregateBase {
    *
    * @param {Function} cb A function to run once the RUM call has finished - Defaults to activateFeatures
    * @param {*} customAttributes custom attributes to attach to the RUM call - Defaults to info.js
-   * @param {*} target The target to harvest to - Since we will not know the entityGuid before harvesting, this must be an object directly supplied from the info object or API, not an entityGuid string for lookup with the entityManager - Defaults to { licenseKey: this.agentRef.info.licenseKey, applicationID: this.agentRef.info.applicationID }
+   * @param {*} target The target to harvest to
    */
   sendRum (customAttributes = this.agentRef.info.jsAttributes, target = { licenseKey: this.agentRef.info.licenseKey, applicationID: this.agentRef.info.applicationID }) {
     const info = this.agentRef.info
@@ -122,7 +116,7 @@ export class Aggregate extends AggregateBase {
 
     this.agentRef.runtime.harvester.triggerHarvestFor(this, {
       directSend: {
-        targetApp: target,
+        target,
         payload: { qs: queryParameters, body }
       },
       needResponse: true,
@@ -130,20 +124,16 @@ export class Aggregate extends AggregateBase {
     })
   }
 
-  postHarvestCleanup ({ status, responseText, xhr, targetApp }) {
+  postHarvestCleanup ({ status, responseText, xhr }) {
     const rumEndTime = now()
     let app, flags
     try {
       ({ app, ...flags } = JSON.parse(responseText))
-      this.processEntities(app.agents, targetApp)
     } catch (error) {
       // wont set entity stuff here, if main agent will later abort, if registered agent, nothing will happen
       warn(53, error)
     }
 
-    /** Only run agent-wide side-effects if the harvest was for the main agent */
-    if (!isContainerAgentTarget(targetApp, this.agentRef)) return
-
     if (status >= 400 || status === 0) {
       warn(18, status)
       // Adding retry logic for the rum call will be a separate change; this.blocked will need to be changed since that prevents another triggerHarvestFor()
@@ -176,19 +166,4 @@ export class Aggregate extends AggregateBase {
     this.agentRef.runtime.harvester.startTimer()
     activateFeatures(flags, this.agentRef)
   }
-
-  processEntities (entities, targetApp) {
-    if (!entities || !targetApp) return
-    entities.forEach(agent => {
-      const entityManager = this.agentRef.runtime.entityManager
-      const entityGuid = agent.entityGuid
-      const entity = entityManager.get(entityGuid)
-      if (entity) return // already processed
-
-      if (isContainerAgentTarget(targetApp, this.agentRef)) {
-        entityManager.setDefaultEntity({ ...targetApp, entityGuid })
-      }
-      entityManager.set(agent.entityGuid, { ...targetApp, entityGuid })
-    })
-  }
 }

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

@@ -37,6 +37,8 @@ export class Aggregate extends AggregateBase {
     this.gzipper = undefined
     /** populated with the u8 string lib async */
     this.u8 = undefined
+    /** flips to false if the compressor libraries cannot import */
+    this.shouldCompress = true
 
     /** set by BCS response */
     this.entitled = false
@@ -200,14 +202,15 @@ export class Aggregate extends AggregateBase {
       this.gzipper = gzipSync
       this.u8 = strToU8
     } catch (err) {
-      // compressor failed to load, but we can still record without compression as a last ditch effort
+      this.shouldCompress = false
+      // compressor failed to load, but we can still try to record without compression as a last ditch effort
     }
   }
 
-  makeHarvestPayload (shouldRetryOnFail) {
-    const payloadOutput = { targetApp: undefined, payload: undefined }
-    if (this.mode !== MODE.FULL || this.blocked) return
-    if (!this.recorder || !this.timeKeeper?.ready || !this.recorder.hasSeenSnapshot) return
+  makeHarvestPayload () {
+    if (this.mode !== MODE.FULL || this.blocked) return // harvests should only be made in FULL mode, and not if the feature is blocked
+    if (this.shouldCompress && !this.gzipper) return // if compression is enabled, but the libraries have not loaded, wait for them to load
+    if (!this.recorder || !this.timeKeeper?.ready || !(this.recorder.hasSeenSnapshot && this.recorder.hasSeenMeta)) return // if the recorder or the timekeeper is not ready, or the recorder has not yet seen a snapshot, do not harvest
 
     const recorderEvents = this.recorder.getEvents()
     // get the event type and use that to trigger another harvest if needed
@@ -216,7 +219,7 @@ export class Aggregate extends AggregateBase {
     const payload = this.getHarvestContents(recorderEvents)
     if (!payload.body.length) {
       this.recorder.clearBuffer()
-      return [payloadOutput]
+      return
     }
 
     this.reportSupportabilityMetric('SessionReplay/Harvest/Attempts')
@@ -232,19 +235,18 @@ export class Aggregate extends AggregateBase {
 
     if (len > MAX_PAYLOAD_SIZE) {
       this.abort(ABORT_REASONS.TOO_BIG, len)
-      return [payloadOutput]
+      return
     }
+
     // TODO -- Gracefully handle the buffer for retries.
     if (!this.agentRef.runtime.session.state.sessionReplaySentFirstChunk) this.syncWithSessionManager({ sessionReplaySentFirstChunk: true })
     this.recorder.clearBuffer()
-    if (recorderEvents.type === 'preloaded') this.agentRef.runtime.harvester.triggerHarvestFor(this)
-    payloadOutput.payload = payload
 
     if (!this.agentRef.runtime.session.state.traceHarvestStarted) {
       warn(59, JSON.stringify(this.agentRef.runtime.session.state))
     }
 
-    return [payloadOutput]
+    return payload
   }
 
   /**

package/src/features/session_replay/shared/recorder.js

@@ -47,6 +47,7 @@ export class Recorder {
     this.backloggedEvents = new RecorderEvents(this.shouldFix)
     /** Only set to true once a snapshot node has been processed.  Used to block harvests from sending before we know we have a snapshot */
     this.hasSeenSnapshot = false
+    this.hasSeenMeta = false
     /** Hold on to the last meta node, so that it can be re-inserted if the meta and snapshot nodes are broken up due to harvesting */
     this.lastMeta = false
     /** The method to stop recording. This defaults to a noop, but is overwritten once the recording library is imported and initialized */
@@ -191,9 +192,9 @@ export class Recorder {
     }
 
     // meta event
-    this.events.hasMeta ||= event.type === RRWEB_EVENT_TYPES.Meta
+    this.hasSeenMeta ||= this.events.hasMeta ||= event.type === RRWEB_EVENT_TYPES.Meta
     // snapshot event
-    this.events.hasSnapshot ||= this.hasSeenSnapshot ||= event.type === RRWEB_EVENT_TYPES.FullSnapshot
+    this.hasSeenSnapshot ||= this.events.hasSnapshot ||= event.type === RRWEB_EVENT_TYPES.FullSnapshot
 
     //* dont let the EventBuffer class double evaluate the event data size, it's a performance burden and we have special reasons to do it outside the event buffer */
     this.events.add(event, eventBytes)

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

@@ -97,8 +97,6 @@ export class Aggregate extends AggregateBase {
     }
     this.agentRef.runtime.session.write({ sessionTraceMode: this.mode })
     this.drain()
-    /** try to harvest immediately. This will not send if the trace is not running in FULL mode due to the pre-harvest checks. */
-    this.agentRef.runtime.harvester.triggerHarvestFor(this)
   }
 
   preHarvestChecks () {

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

@@ -46,7 +46,6 @@ export class Aggregate extends AggregateBase {
     this.waitForFlags(['spa']).then(([spaOn]) => {
       if (spaOn) {
         this.drain()
-        setTimeout(() => agentRef.runtime.harvester.triggerHarvestFor(this), 0) // send the IPL ixn on next tick, giving some time for any ajax to finish; we may want to just remove this?
       } else {
         this.blocked = true // if rum response determines that customer lacks entitlements for spa endpoint, this feature shouldn't harvest
         this.deregisterDrain()
@@ -148,7 +147,7 @@ export class Aggregate extends AggregateBase {
     */
     if (this.interactionInProgress?.isActiveDuring(timestamp)) return this.interactionInProgress
     let saveIxn
-    const interactionsBuffer = this.interactionsToHarvest.get()?.[0]?.data
+    const interactionsBuffer = this.interactionsToHarvest.get()
     if (!interactionsBuffer) return undefined // no interactions have been staged yet, so nothing to search through)
     for (let idx = interactionsBuffer.length - 1; idx >= 0; idx--) { // reverse search for the latest completed interaction for efficiency
       const finishedInteraction = interactionsBuffer[idx]

package/src/features/utils/aggregate-base.js

@@ -10,15 +10,12 @@ import { drain } from '../../common/drain/drain'
 import { activatedFeatures } from '../../common/util/feature-flags'
 import { Obfuscator } from '../../common/util/obfuscate'
 import { FEATURE_NAMES } from '../../loaders/features/features'
-import { EventStoreManager } from './event-store-manager'
 import { Harvester } from '../../common/harvest/harvester'
-import { warn } from '../../common/util/console'
-import { EntityManager } from './entity-manager'
 import { EventBuffer } from './event-buffer'
 import { handle } from '../../common/event-emitter/handle'
 import { SUPPORTABILITY_METRIC_CHANNEL } from '../metrics/constants'
 import { EventAggregator } from '../../common/aggregate/event-aggregator'
-import { IDEAL_PAYLOAD_SIZE } from '../../common/constants/agent-constants'
+import { MAX_PAYLOAD_SIZE, IDEAL_PAYLOAD_SIZE, SUPPORTS_REGISTERED_ENTITIES } from '../../common/constants/agent-constants'
 
 export class AggregateBase extends FeatureBase {
   /**
@@ -41,16 +38,9 @@ export class AggregateBase extends FeatureBase {
 
     this.harvestOpts = {} // features aggregate classes can define custom opts for when their harvest is called
 
-    const agentEntityGuid = this.agentRef?.runtime?.appMetadata?.agents?.[0]?.entityGuid
-    this.#setupEventStore(agentEntityGuid)
-    if (!agentEntityGuid) {
-      /** wait for the entity guid from the rum response and use to it to further configure things to set the default entity to share an indexed entity with entityGuid */
-      this.ee.on('entity-added', entity => {
-        // not all event managers have this fn, like ST and SR
-        // this allows the lookup to work for the default and an entityGuid without creating two separate buffers
-        this.events?.setEventStore?.(entity.entityGuid)
-      })
-    }
+    this.#setupEventStore()
+
+    this.waitForDrain()
   }
 
   /**
@@ -58,7 +48,7 @@ export class AggregateBase extends FeatureBase {
    * @param {string} entityGuid
    * @returns {void}
    */
-  #setupEventStore (entityGuid) {
+  #setupEventStore () {
     if (this.events) return
     switch (this.featureName) {
     // SessionReplay has its own storage mechanisms.
@@ -67,17 +57,40 @@ export class AggregateBase extends FeatureBase {
         // Jserror and Metric features uses a singleton EventAggregator instead of a regular EventBuffer.
       case FEATURE_NAMES.jserrors:
       case FEATURE_NAMES.metrics:
-        this.events = this.agentRef.sharedAggregator ??= new EventStoreManager(this.agentRef, EventAggregator, entityGuid, { featureName: 'shared_aggregator' })
+        this.events = this.agentRef.sharedAggregator ??= new EventAggregator()
         break
-        /** All other features get EventBuffer in the ESM by default. Note: PVE is included here, but event buffer will always be empty so future harvests will still not happen by interval or EOL.
+        /** All other features get EventBuffer by default. Note: PVE is included here, but event buffer will always be empty so future harvests will still not happen by interval or EOL.
     This was necessary to prevent race cond. issues where the event buffer was checked before the feature could "block" itself.
     Its easier to just keep an empty event buffer in place. */
       default:
-        this.events = new EventStoreManager(this.agentRef, EventBuffer, entityGuid, this)
+        this.events = new EventBuffer(MAX_PAYLOAD_SIZE, this)
         break
     }
   }
 
+  /** @type {Boolean} indicates if the feature supports registered entities and the harvest requirements therein. Also read by getter "harvestEndpointVersion". Controlled by feature flag in pre-release phase. */
+  get supportsRegisteredEntities () {
+    return this.featureName in SUPPORTS_REGISTERED_ENTITIES && (SUPPORTS_REGISTERED_ENTITIES[this.featureName] || this.agentRef.init.feature_flags.includes('register.' + this.featureName))
+  }
+
+  /**
+   * the endpoint version the feature uses during harvests
+   * @type {number}
+   * @returns {boolean}
+   */
+  get harvestEndpointVersion () {
+    return (this.supportsRegisteredEntities && !!this.agentRef.runtime.registeredEntities.length) ? 2 : 1
+  }
+
+  waitForDrain () {
+    /** emitted when the feature successfully drains */
+    this.ee.on('drain-' + this.featureName, () => {
+      /** make an immediate harvest for all the features to help with harvestability for pre-load dervied data on short lived pages */
+      if (!this.drained) setTimeout(() => this.agentRef.runtime.harvester.triggerHarvestFor(this), 1)
+      this.drained = true
+    })
+  }
+
   /**
    * Evaluates whether a harvest should be made early by estimating the size of the current payload.  Currently, this only happens if the event storage is EventBuffer, since that triggers this method directly.
    * If conditions are met, a new harvest will be triggered immediately.
@@ -125,7 +138,6 @@ export class AggregateBase extends FeatureBase {
    */
   drain () {
     drain(this.agentIdentifier, this.featureName)
-    this.drained = true
   }
 
   preHarvestChecks (opts) {
@@ -136,44 +148,39 @@ export class AggregateBase extends FeatureBase {
    * Return harvest payload. A "serializer" function can be defined on a derived class to format the payload.
    * @param {Boolean} shouldRetryOnFail - harvester flag to backup payload for retry later if harvest request fails; this should be moved to harvester logic
    * @param {object|undefined} opts - opts passed from the harvester to help form the payload
-   * @param {string} opts.targetEntityGuid - the entity guid of the target app
+   * @param {string} opts.target - the target app metadata
    * @returns {Array} Final payload tagged with their targeting browser app. The value of `payload` can be undefined if there are no pending events for an app. This should be a minimum length of 1.
    */
   makeHarvestPayload (shouldRetryOnFail = false, opts = {}) {
-    if (!this.events || this.events.isEmpty(this.harvestOpts, opts.targetEntityGuid)) return
+    if (!this.events || this.events.isEmpty(this.harvestOpts)) return
     // Other conditions and things to do when preparing harvest that is required.
     if (this.preHarvestChecks && !this.preHarvestChecks(opts)) return
 
-    if (shouldRetryOnFail) this.events.save(this.harvestOpts, opts.targetEntityGuid)
-    const returnedDataArr = this.events.get(this.harvestOpts, opts.targetEntityGuid)
-    if (!returnedDataArr.length) return warn(52)
-    this.events.clear(this.harvestOpts, opts.targetEntityGuid)
-
-    return returnedDataArr.map(({ targetApp, data }) => {
-      // A serializer or formatter assists in creating the payload `body` from stored events on harvest when defined by derived feature class.
-      const body = this.serializer ? this.serializer(data, targetApp?.entityGuid) : data
-      const payload = {
-        body
-      }
-      // Constructs the payload `qs` for relevant features on harvest.
-      if (this.queryStringsBuilder) payload.qs = this.queryStringsBuilder(data, targetApp?.entityGuid)
+    if (shouldRetryOnFail) this.events.save(this.harvestOpts)
+    const data = this.events.get(this.harvestOpts)
+    if (!data) return
+    this.events.clear(this.harvestOpts)
 
-      return { targetApp, payload }
-    })
+    // A serializer or formatter assists in creating the payload `body` from stored events on harvest when defined by derived feature class.
+    const body = this.serializer ? this.serializer(data) : data
+    const payload = {
+      body
+    }
+    // Constructs the payload `qs` for relevant features on harvest.
+    if (this.queryStringsBuilder) payload.qs = this.queryStringsBuilder(data)
+    return payload
   }
 
   /**
    * Cleanup task after a harvest.
    * @param {object} result - the cbResult object from the harvester's send method
-   * @param {object=} result.targetApp - the target app object that was used to point the harvest to the correct app
-   * @param {string=} result.targetApp.entityGuid - the entity guid of the target app
    * @param {boolean=} result.sent - whether the harvest was sent successfully
    * @param {boolean=} result.retry - whether the harvest should be retried
    */
   postHarvestCleanup (result = {}) {
     this.isRetrying = result.sent && result.retry
-    if (this.isRetrying) this.events.reloadSave(this.harvestOpts, result.targetApp?.entityGuid)
-    this.events.clearSave(this.harvestOpts, result.targetApp?.entityGuid)
+    if (this.isRetrying) this.events.reloadSave(this.harvestOpts)
+    this.events.clearSave(this.harvestOpts)
   }
 
   /**
@@ -212,8 +219,6 @@ export class AggregateBase extends FeatureBase {
     if (!agentRef.runtime.obfuscator) agentRef.runtime.obfuscator = new Obfuscator(agentRef)
     this.obfuscator = agentRef.runtime.obfuscator
 
-    if (!agentRef.runtime.entityManager) agentRef.runtime.entityManager = new EntityManager(this.agentRef)
-
     if (!agentRef.runtime.harvester) agentRef.runtime.harvester = new Harvester(agentRef)
   }
 

package/src/loaders/api/addPageAction.js

@@ -12,6 +12,6 @@ export function setupAddPageActionAPI (agent) {
   setupAPI(ADD_PAGE_ACTION, (name, attributes) => addPageAction(name, attributes, agent), agent)
 }
 
-export function addPageAction (name, attributes, agentRef, targetEntityGuid, timestamp = now()) {
-  handle(prefix + ADD_PAGE_ACTION, [timestamp, name, attributes, targetEntityGuid], undefined, FEATURE_NAMES.genericEvents, agentRef.ee)
+export function addPageAction (name, attributes, agentRef, target, timestamp = now()) {
+  handle(prefix + ADD_PAGE_ACTION, [timestamp, name, attributes, target], undefined, FEATURE_NAMES.genericEvents, agentRef.ee)
 }

package/src/loaders/api/log.js

@@ -13,6 +13,6 @@ export function setupLogAPI (agent) {
   setupAPI(LOG, (message, options) => log(message, options, agent), agent)
 }
 
-export function log (message, { customAttributes = {}, level = LOG_LEVELS.INFO } = {}, agentRef, targetEntityGuid, timestamp = now()) {
-  bufferLog(agentRef.ee, message, customAttributes, level, targetEntityGuid, timestamp)
+export function log (message, { customAttributes = {}, level = LOG_LEVELS.INFO } = {}, agentRef, target, timestamp = now()) {
+  bufferLog(agentRef.ee, message, customAttributes, level, target, timestamp)
 }

package/src/loaders/api/noticeError.js

@@ -12,8 +12,8 @@ export function setupNoticeErrorAPI (agent) {
   setupAPI(NOTICE_ERROR, (err, customAttributes) => noticeError(err, customAttributes, agent), agent)
 }
 
-export function noticeError (err, customAttributes, agentRef, targetEntityGuid, timestamp = now()) {
+export function noticeError (err, customAttributes, agentRef, target, timestamp = now()) {
   if (typeof err === 'string') err = new Error(err)
-  handle('err', [err, timestamp, false, customAttributes, agentRef.runtime.isRecording, undefined, targetEntityGuid], undefined, FEATURE_NAMES.jserrors, agentRef.ee)
+  handle('err', [err, timestamp, false, customAttributes, agentRef.runtime.isRecording, undefined, target], undefined, FEATURE_NAMES.jserrors, agentRef.ee)
   handle('uaErr', [], undefined, FEATURE_NAMES.genericEvents, agentRef.ee)
 }

package/src/loaders/api/register-api-types.js

@@ -17,17 +17,17 @@
 /**
  * @typedef {Object} RegisterAPIConstructor
  * @property {Object} opts - The options for the registered entity.
- * @property {string} opts.licenseKey - The license key for the registered entity.
- * @property {string} opts.applicationID - The application ID for the registered entity.
+ * @property {string} opts.id - The unique id for the registered entity. This will be assigned to any synthesized entities.
+ * @property {string} opts.name - The readable name for the registered entity. This will be assigned to any synthesized entities.
  */
 
 /**
  * @typedef {Object} RegisterAPIMetadata
  * @property {Object} customAttributes - The custom attributes for the registered entity.
  * @property {Object} target - The options for the registered entity.
- * @property {string} target.licenseKey - The license key for the registered entity.
- * @property {string} target.applicationID - The application ID for the registered entity.
- * @property {string} target.entityGuid - The entity guid returned for the registered entity.
+ * @property {string} target.licenseKey - The license key for the registered entity. If none was supplied, it will assume the license key from the main agent.
+ * @property {string} target.id - The ID for the registered entity.
+ * @property {string} target.name - The name returned for the registered entity.
  */
 
 export default {}