@newrelic/browser-agent 1.246.1 → 1.247.0

package/src/loaders/configure/configure.js

@@ -1,5 +1,5 @@
 import { setAPI, setTopLevelCallers } from '../api/api'
-import { addToNREUM, gosCDN, gosNREUMInitializedAgents } from '../../common/window/nreum'
+import { addToNREUM, gosCDN } from '../../common/window/nreum'
 import { getConfiguration, setConfiguration, setInfo, setLoaderConfig, setRuntime } from '../../common/config/config'
 import { activatedFeatures } from '../../common/util/feature-flags'
 import { isWorkerScope } from '../../common/constants/runtime'
@@ -7,7 +7,10 @@ import { redefinePublicPath } from './public-path'
 
 let alreadySetOnce = false // the configure() function can run multiple times in agent lifecycle
 
-export function configure (agentIdentifier, opts = {}, loaderType, forceDrain) {
+/**
+ * Sets or re-sets the agent's configuration values from global settings. This also attach those as properties to the agent instance.
+ */
+export function configure (agent, opts = {}, loaderType, forceDrain) {
   // eslint-disable-next-line camelcase
   let { init, info, loader_config, runtime = { loaderType }, exposed = true } = opts
   const nr = gosCDN()
@@ -18,38 +21,37 @@ export function configure (agentIdentifier, opts = {}, loaderType, forceDrain) {
     loader_config = nr.loader_config
   }
 
-  setConfiguration(agentIdentifier, init || {})
+  setConfiguration(agent.agentIdentifier, init || {})
   // eslint-disable-next-line camelcase
-  setLoaderConfig(agentIdentifier, loader_config || {})
+  setLoaderConfig(agent.agentIdentifier, loader_config || {})
 
   info.jsAttributes ??= {}
   if (isWorkerScope) { // add a default attr to all worker payloads
     info.jsAttributes.isWorker = true
   }
-  setInfo(agentIdentifier, info)
+  setInfo(agent.agentIdentifier, info)
 
-  const updatedInit = getConfiguration(agentIdentifier)
+  const updatedInit = getConfiguration(agent.agentIdentifier)
   const internalTrafficList = [info.beacon, info.errorBeacon]
+
   if (!alreadySetOnce) {
-    alreadySetOnce = true
     if (updatedInit.proxy.assets) {
       redefinePublicPath(updatedInit.proxy.assets)
       internalTrafficList.push(updatedInit.proxy.assets)
     }
     if (updatedInit.proxy.beacon) internalTrafficList.push(updatedInit.proxy.beacon)
+
+    setTopLevelCallers() // no need to set global APIs on newrelic obj more than once
+    addToNREUM('activatedFeatures', activatedFeatures)
   }
 
   runtime.denyList = [
     ...(updatedInit.ajax.deny_list || []),
     ...(updatedInit.ajax.block_internal ? internalTrafficList : [])
   ]
-  setRuntime(agentIdentifier, runtime)
-
-  setTopLevelCallers()
-  const api = setAPI(agentIdentifier, forceDrain)
-  gosNREUMInitializedAgents(agentIdentifier, api, 'api')
-  gosNREUMInitializedAgents(agentIdentifier, exposed, 'exposed')
-  addToNREUM('activatedFeatures', activatedFeatures)
+  setRuntime(agent.agentIdentifier, runtime)
 
-  return api
+  if (agent.api === undefined) agent.api = setAPI(agent.agentIdentifier, forceDrain)
+  if (agent.exposed === undefined) agent.exposed = exposed
+  alreadySetOnce = true
 }

package/src/loaders/configure/nonce.js

@@ -0,0 +1,12 @@
+/* global __webpack_require__ */
+
+__webpack_require__.nc = (() => {
+  try {
+    return document?.currentScript?.nonce
+  } catch (ex) {
+    // Swallow error and proceed like nonce is not defined
+    // This will happen when the agent is loaded in a worker scope
+  }
+
+  return ''
+})()

package/src/loaders/configure/nonce.npm.js

@@ -0,0 +1 @@
+// We don't support setting automating the nonce attribute in the npm package

package/src/loaders/micro-agent.js

@@ -4,7 +4,7 @@ import { getEnabledFeatures } from './features/enabled-features'
 import { configure } from './configure/configure'
 // core files
 import { Aggregator } from '../common/aggregate/aggregator'
-import { gosNREUMInitializedAgents } from '../common/window/nreum'
+import { setNREUMInitializedAgent } from '../common/window/nreum'
 import { generateRandomHexString } from '../common/ids/unique-id'
 import { getConfiguration, getConfigurationValue, getInfo, getLoaderConfig, getRuntime } from '../common/config/config'
 import { FEATURE_NAMES } from './features/features'
@@ -34,8 +34,10 @@ export class MicroAgent extends AgentBase {
     this.agentIdentifier = agentIdentifier
     this.sharedAggregator = new Aggregator({ agentIdentifier: this.agentIdentifier })
     this.features = {}
+    setNREUMInitializedAgent(agentIdentifier, this)
 
-    Object.assign(this, configure(this.agentIdentifier, { ...options, runtime: { isolatedBacklog: true } }, options.loaderType || 'micro-agent'))
+    configure(this, { ...options, runtime: { isolatedBacklog: true } }, options.loaderType || 'micro-agent')
+    Object.assign(this, this.api) // the APIs should be available at the class level for micro-agent
 
     /**
      * Starts a set of agent features if not running in "autoStart" mode
@@ -91,8 +93,7 @@ export class MicroAgent extends AgentBase {
           }
         })
       })
-      gosNREUMInitializedAgents(this.agentIdentifier, this.features, 'features')
-      return this
+      return true
     } catch (err) {
       warn('Failed to initialize instrument classes.', err)
       return false