newrelic 9.7.5 → 9.8.1

package/NEWS.md

@@ -1,15 +1,32 @@
-### v9.7.5 (2023-01-03)
-
-* Added a check to the code level metrics utility to ensure filePath was set before adding the `code.*` attributes.
-
-* Updated to latest version of `@newrelic/test-utilities`
-
-* Fixed issue where listing of dependencies and packages from symlinked nested directories created an infinite loop which caused the agent to never connect.
-
-### v9.7.4 (2022-12-15)
-
-* Fixed system info gathering to prevent unhandled promise rejection when an error occurs reading `/proc` information.
-
+### v9.8.1 (2023-01-25)
+
+* Changed GCP metadata parsing to use `json-bigint` to avoid loss of precision from numerical instance ID.
+
+* Instrumented `winston.loggers.add` so it works like `winston.createLogger`.
+
+### v9.8.0 (2023-01-17)
+
+* Updated `getBrowserTimingHeader` to allow Browser Agent to be generated even when not in a Transaction by adding `allowTransactionlessInjection` to function options. `allowTransactionlessInjection` is a boolean option, and when set to `true`, will allow injection of the Browser Agent when not in a transaction. This is intended to be used in frameworks that build Static Site Generation(SSG). Note that if you are using this option, you may need to wait until the Node agent has established a connection before calling `getBrowserTimingHeader`. To wait until the agent is connected, you can add the following check to your code: 
+```js
+if (!newrelic.agent.collector.isConnected()) {
+  await new Promise((resolve) => {
+    newrelic.agent.on('connected', resolve)
+  })
+}
+```
+
+### v9.7.5 (2023-01-03)
+
+* Added a check to the code level metrics utility to ensure filePath was set before adding the `code.*` attributes.
+
+* Updated to latest version of `@newrelic/test-utilities`
+
+* Fixed issue where listing of dependencies and packages from symlinked nested directories created an infinite loop which caused the agent to never connect.
+
+### v9.7.4 (2022-12-15)
+
+* Fixed system info gathering to prevent unhandled promise rejection when an error occurs reading `/proc` information.
+
 ### v9.7.3 (2022-12-12)
 
 * Added support for Code Level Metrics on API methods: `startSegment`, `startBackgroundTransaction`, and `startWebTransaction`.
@@ -3157,7 +3174,7 @@ Special thanks to Ryan Copley (@RyanCopley) for the contribution.
     used for instrumenting web frameworks like `restify` or `express`.
 
   Documentation and tutorials for the new API can be found on our GitHub
-  documentation page: http://newrelic.github.io/node-newrelic/docs/
+  documentation page: http://newrelic.github.io/node-newrelic/
 
 * Rewrote built-in instrumentation using the new `Shim` classes.
 
@@ -3246,7 +3263,7 @@ Special thanks to Ryan Copley (@RyanCopley) for the contribution.
   meaning every instrumentation will create Middleware metrics for your server.
 
   Tutorials on using the new instrumentation shim can be found on our API docs:
-  http://newrelic.github.io/node-newrelic/docs/.
+  http://newrelic.github.io/node-newrelic/.
 
 * Removed `express_segments` feature flag.
 

package/README.md

@@ -199,7 +199,7 @@ Here are some resources for learning more about the agent:
 
 - [New Relic's official Node.js agent documentation](https://docs.newrelic.com/docs/agents/nodejs-agent)
 
-- [Developer docs](http://newrelic.github.io/node-newrelic/docs/)
+- [Developer docs](http://newrelic.github.io/node-newrelic/)
 
 - [Configuring the agent using `newrelic.js` or environment variables](https://docs.newrelic.com/docs/agents/nodejs-agent/installation-configuration/nodejs-agent-configuration)
 

package/THIRD_PARTY_NOTICES.md

@@ -22,6 +22,7 @@ code, the source code can be found at [https://github.com/newrelic/node-newrelic
 * [@tyriar/fibonacci-heap](#tyriarfibonacci-heap)
 * [concat-stream](#concat-stream)
 * [https-proxy-agent](#https-proxy-agent)
+* [json-bigint](#json-bigint)
 * [json-stringify-safe](#json-stringify-safe)
 * [readable-stream](#readable-stream)
 * [semver](#semver)
@@ -1202,6 +1203,34 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ```
 
+### json-bigint
+
+This product includes source derived from [json-bigint](https://github.com/sidorares/json-bigint) ([v1.0.0](https://github.com/sidorares/json-bigint/tree/v1.0.0)), distributed under the [MIT License](https://github.com/sidorares/json-bigint/blob/v1.0.0/LICENSE):
+
+```
+The MIT License (MIT)
+
+Copyright (c) 2013 Andrey Sidorov
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+```
+
 ### json-stringify-safe
 
 This product includes source derived from [json-stringify-safe](https://github.com/isaacs/json-stringify-safe) ([v5.0.1](https://github.com/isaacs/json-stringify-safe/tree/v5.0.1)), distributed under the [ISC License](https://github.com/isaacs/json-stringify-safe/blob/v5.0.1/LICENSE):

package/api.js

@@ -40,7 +40,7 @@ const RUM_STUB_SHELL_WITH_NONCE_PARAM = `<script type='text/javascript' %s>${RUM
 // these messages are used in the _gracefail() method below in getBrowserTimingHeader
 const RUM_ISSUES = [
   'NREUM: no browser monitoring headers generated; disabled',
-  'NREUM: transaction missing or ignored while generating browser monitoring headers',
+  'NREUM: transaction ignored while generating browser monitoring headers',
   'NREUM: config.browser_monitoring missing, something is probably wrong',
   'NREUM: browser_monitoring headers need a transaction name',
   'NREUM: browser_monitoring requires valid application_id',
@@ -640,144 +640,180 @@ function _generateRUMHeader(options = {}, metadata, loader) {
 }
 
 /**
- * Get the script header necessary for Browser Monitoring
- * This script must be manually injected into your templates, as high as possible
- * in the header, but _after_ any X-UA-COMPATIBLE HTTP-EQUIV meta tags.
- * Otherwise you may hurt IE!
- *
- * By default this method will return a script wrapped by `<script>` tags, but with
- * option `hasToRemoveScriptWrapper` it can send back only the script content
- * without the `<script>` wrapper. Useful for React component based frontend.
- *
- * This method must be called _during_ a transaction, and must be called every
- * time you want to generate the headers.
+ * Helper method for determining if we have the minimum required
+ * information to generate our Browser Agent script tag
  *
- * Do *not* reuse the headers between users, or even between requests.
- *
- * @param {object} options configuration options
- * @param {string} [options.nonce] - Nonce to inject into `<script>` header.
- * @param {boolean} [options.hasToRemoveScriptWrapper] - Used to import agent script without `<script>` tag wrapper.
- * @returns {string} The script content to be injected in `<head>` or put inside `<script>` tag (depending on options)
+ * @param {object} config agent configuration settings
+ * @param {Transaction} transaction the active transaction or null
+ * @param {boolean} allowTransactionlessInjection whether or not to allow the Browser Agent to be injected when there is no active transaction
+ * @returns {{ isValidConfig: boolean, failureIdx?: number, quietMode?: boolean }} object containing validation results
  */
-API.prototype.getBrowserTimingHeader = function getBrowserTimingHeader(options) {
-  const metric = this.agent.metrics.getOrCreateMetric(
-    NAMES.SUPPORTABILITY.API + '/getBrowserTimingHeader'
-  )
-  metric.incrementCallCount()
-
-  const config = this.agent.config
-
-  const browserMonitoring = config.browser_monitoring
-
-  // config.browser_monitoring should always exist, but we don't want the agent
-  // to bail here if something goes wrong
-  if (!browserMonitoring) {
-    return _gracefail(2)
+function validateBrowserMonitoring(config, transaction, allowTransactionlessInjection) {
+  /*
+   * config.browser_monitoring should always exist, but we don't want the agent
+   * to bail here if something goes wrong
+   */
+  if (!config.browser_monitoring) {
+    return { isValidConfig: false, failureIdx: 2 }
   }
 
-  /* Can control header generation with configuration this setting is only
+  /*
+   * Can control header generation with configuration this setting is only
    * available in the newrelic.js config file, it is not ever set by the
    * server.
    */
-  if (!browserMonitoring.enable) {
+  if (!config.browser_monitoring.enable) {
     // It has been disabled by the user; no need to warn them about their own
     // settings so fail quietly and gracefully.
-    return _gracefail(0, true)
-  }
-
-  const trans = this.agent.getTransaction()
-
-  // bail gracefully outside a transaction
-  if (!trans || trans.isIgnored()) {
-    return _gracefail(1)
+    return { isValidConfig: false, failureIdx: 0, quietMode: true }
   }
 
-  const name = trans.getFullName()
-
-  /* If we're in an unnamed transaction, add a friendly warning this is to
-   * avoid people going crazy, trying to figure out why browser monitoring is
-   * not working when they're missing a transaction name.
-   */
-  if (!name) {
-    return _gracefail(3)
-  }
-
-  const time = trans.timer.getDurationInMillis()
-
   /*
-   * Only the first 13 chars of the license should be used for hashing with
-   * the transaction name.
-   */
-  const key = config.license_key.substr(0, 13)
-  const appid = config.application_id
-
-  /* This is only going to work if the agent has successfully handshaked with
+   * This is only going to work if the agent has successfully handshaked with
    * the collector. If the networks is bad, or there is no license key set in
    * newrelic.js, there will be no application_id set.  We bail instead of
    * outputting null/undefined configuration values.
    */
-  if (!appid) {
-    return _gracefail(4)
+  if (!config.application_id) {
+    return { isValidConfig: false, failureIdx: 4 }
   }
 
-  /* If there is no browser_key, the server has likely decided to disable
+  /*
+   * If there is no browser_key, the server has likely decided to disable
    * browser monitoring.
    */
-  const licenseKey = browserMonitoring.browser_key
-  if (!licenseKey) {
-    return _gracefail(5)
+  if (!config.browser_monitoring.browser_key) {
+    return { isValidConfig: false, failureIdx: 5 }
   }
 
-  /* If there is no agent_loader script, there is no point
+  /*
+   * If there is no agent_loader script, there is no point
    * in setting the rum data
    */
-  const jsAgentLoader = browserMonitoring.js_agent_loader
-  if (!jsAgentLoader) {
-    return _gracefail(6)
+  if (!config.browser_monitoring.js_agent_loader) {
+    return { isValidConfig: false, failureIdx: 6 }
   }
 
-  /* If rum is enabled, but then later disabled on the server,
+  /*
+   * If rum is enabled, but then later disabled on the server,
    * this is the only parameter that gets updated.
    *
    * This condition should only be met if rum is disabled during
    * the lifetime of an application, and it should be picked up
    * on the next ForceRestart by the collector.
    */
-  const loader = browserMonitoring.loader
-  if (loader === 'none') {
-    return _gracefail(7)
+  if (config.browser_monitoring.loader === 'none') {
+    return { isValidConfig: false, failureIdx: 7 }
   }
 
+  if (!allowTransactionlessInjection && !transaction) {
+    return { isValidConfig: false, failureIdx: 1 }
+  }
+
+  return { isValidConfig: true }
+}
+
+/**
+ * Get the script header necessary for Browser Monitoring
+ * This script must be manually injected into your templates, as high as possible
+ * in the header, but _after_ any X-UA-COMPATIBLE HTTP-EQUIV meta tags.
+ * Otherwise you may hurt IE!
+ *
+ * By default this method will return a script wrapped by `<script>` tags, but with
+ * option `hasToRemoveScriptWrapper` it can send back only the script content
+ * without the `<script>` wrapper. Useful for React component based frontend.
+ *
+ * This method must be called every time you want to generate the headers.
+ *
+ * Do *not* reuse the headers between users, or even between requests.
+ *
+ * @param {object} options configuration options
+ * @param {string} [options.nonce] - Nonce to inject into `<script>` header.
+ * @param {boolean} [options.hasToRemoveScriptWrapper] - Used to import agent script without `<script>` tag wrapper.
+ * @param {options} [options.allowTransactionlessInjection] Whether or not to allow the Browser Agent to be injected when there is no active transaction
+ * @returns {string} The script content to be injected in `<head>` or put inside `<script>` tag (depending on options)
+ */
+API.prototype.getBrowserTimingHeader = function getBrowserTimingHeader(options = {}) {
+  const metric = this.agent.metrics.getOrCreateMetric(
+    NAMES.SUPPORTABILITY.API + '/getBrowserTimingHeader'
+  )
+  metric.incrementCallCount()
+
+  const trans = this.agent.getTransaction()
+
+  const { isValidConfig, failureIdx, quietMode } = validateBrowserMonitoring(
+    this.agent.config,
+    trans,
+    options.allowTransactionlessInjection
+  )
+
+  if (!isValidConfig) {
+    return _gracefail(failureIdx, quietMode)
+  }
+
+  const config = this.agent.config
+
   // This hash gets written directly into the browser.
   const rumHash = {
-    agent: browserMonitoring.js_agent_file,
-    beacon: browserMonitoring.beacon,
-    errorBeacon: browserMonitoring.error_beacon,
-    licenseKey: licenseKey,
-    applicationID: appid,
-    applicationTime: time,
-    transactionName: hashes.obfuscateNameUsingKey(name, key),
-    queueTime: trans.queueTime,
-    ttGuid: trans.id,
+    agent: config.browser_monitoring.js_agent_file,
+    beacon: config.browser_monitoring.beacon,
+    errorBeacon: config.browser_monitoring.error_beacon,
+    licenseKey: config.browser_monitoring.browser_key,
+    applicationID: config.application_id,
 
     // we don't use these parameters yet
     agentToken: null
   }
 
-  const attrs = Object.create(null)
+  const hasActiveTransaction = trans !== null
 
-  const customAttrs = trans.trace.custom.get(ATTR_DEST.BROWSER_EVENT)
-  if (!properties.isEmpty(customAttrs)) {
-    attrs.u = customAttrs
-  }
+  if (hasActiveTransaction) {
+    // bail gracefully outside an ignored transaction
+    if (trans.isIgnored()) {
+      return _gracefail(1)
+    }
 
-  const agentAttrs = trans.trace.attributes.get(ATTR_DEST.BROWSER_EVENT)
-  if (!properties.isEmpty(agentAttrs)) {
-    attrs.a = agentAttrs
-  }
+    /* If we're in an unnamed transaction, add a friendly warning this is to
+     * avoid people going crazy, trying to figure out why browser monitoring is
+     * not working when they're missing a transaction name.
+     */
+    const name = trans.getFullName()
+    if (!name) {
+      return _gracefail(3)
+    }
+
+    const time = trans.timer.getDurationInMillis()
+    rumHash.applicationTime = time
+
+    /*
+     * Only the first 13 chars of the license should be used for hashing with
+     * the transaction name.
+     */
+    const key = config.license_key.substr(0, 13)
+    rumHash.transactionName = hashes.obfuscateNameUsingKey(name, key)
 
-  if (!properties.isEmpty(attrs)) {
-    rumHash.atts = hashes.obfuscateNameUsingKey(JSON.stringify(attrs), key)
+    rumHash.queueTime = trans.queueTime
+    rumHash.ttGuid = trans.id
+
+    const attrs = Object.create(null)
+
+    const customAttrs = trans.trace.custom.get(ATTR_DEST.BROWSER_EVENT)
+    if (!properties.isEmpty(customAttrs)) {
+      attrs.u = customAttrs
+    }
+
+    const agentAttrs = trans.trace.attributes.get(ATTR_DEST.BROWSER_EVENT)
+    if (!properties.isEmpty(agentAttrs)) {
+      attrs.a = agentAttrs
+    }
+
+    if (!properties.isEmpty(attrs)) {
+      rumHash.atts = hashes.obfuscateNameUsingKey(JSON.stringify(attrs), key)
+    }
+  } else {
+    logger.debug(
+      'No transaction detected when generating RUM header, continuing without transaction info'
+    )
   }
 
   // if debugging, do pretty format of JSON
@@ -785,7 +821,11 @@ API.prototype.getBrowserTimingHeader = function getBrowserTimingHeader(options)
   const json = JSON.stringify(rumHash, null, tabs)
 
   // the complete header to be written to the browser
-  const out = _generateRUMHeader(options, json, jsAgentLoader)
+  const out = _generateRUMHeader(
+    { nonce: options.nonce, hasToRemoveScriptWrapper: options.hasToRemoveScriptWrapper },
+    json,
+    config.browser_monitoring.js_agent_loader
+  )
 
   logger.trace('generating RUM header', out)
 

package/lib/instrumentation/winston.js

@@ -27,28 +27,62 @@ module.exports = function instrument(agent, winston, _, shim) {
   }
 
   shim.wrap(winston, 'createLogger', function wrapCreate(shim, createLogger) {
-    return function createWrappedLogger() {
+    return function wrappedCreateLogger() {
       const args = shim.argsToArray.apply(shim, arguments)
       const opts = args[0] || {}
       if (isStream(opts)) {
         return createLogger.apply(this, args)
       }
+      return performInstrumentation({
+        obj: this,
+        args,
+        opts,
+        agent,
+        winston,
+        registerLogger: createLogger
+      })
+    }
+  })
 
-      createModuleUsageMetric('winston', agent.metrics)
-
-      if (isLocalDecoratingEnabled(config) || isMetricsEnabled(config)) {
-        registerFormatter({ opts, agent, winston })
+  shim.wrap(winston.loggers, 'add', function wrapAdd(shim, add) {
+    return function wrappedAdd() {
+      const args = shim.argsToArray.apply(shim, arguments)
+      const id = args[0]
+      const opts = args[1] || {}
+      // add does nothing if the logger has already been added, so we
+      // have to do the same nothingness here.
+      const alreadyAdded = this.loggers.has(id)
+      if (alreadyAdded || isStream(opts)) {
+        return add.apply(this, args)
       }
+      return performInstrumentation({
+        obj: this,
+        args,
+        opts,
+        agent,
+        winston,
+        registerLogger: add
+      })
+    }
+  })
+}
+
+function performInstrumentation({ obj, args, opts, agent, winston, registerLogger }) {
+  const config = agent.config
 
-      const winstonLogger = createLogger.apply(this, args)
+  createModuleUsageMetric('winston', agent.metrics)
 
-      if (isLogForwardingEnabled(config, agent)) {
-        winstonLogger.add(new NrTransport({ agent }))
-      }
+  if (isLocalDecoratingEnabled(config) || isMetricsEnabled(config)) {
+    registerFormatter({ opts, agent, winston })
+  }
 
-      return winstonLogger
-    }
-  })
+  const winstonLogger = registerLogger.apply(obj, args)
+
+  if (isLogForwardingEnabled(config, agent)) {
+    winstonLogger.add(new NrTransport({ agent }))
+  }
+
+  return winstonLogger
 }
 
 /**

package/lib/utilization/gcp-info.js

@@ -8,6 +8,7 @@
 const logger = require('../logger.js').child({ component: 'gcp-info' })
 const common = require('./common')
 const NAMES = require('../metrics/names.js')
+const JSONbig = require('json-bigint')({ useNativeBigInt: true })
 let resultDict = null
 
 module.exports = fetchGCPInfo
@@ -37,9 +38,11 @@ function fetchGCPInfo(agent, callback) {
       if (err) {
         return callback(err)
       }
-
       try {
-        data = JSON.parse(data)
+        data = JSONbig.parse(data)
+        if (typeof data.id !== 'string') {
+          data.id = data.id.toString()
+        }
       } catch (e) {
         logger.debug(e, 'Failed to parse GCP metadata.')
         data = null

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newrelic",
-  "version": "9.7.5",
+  "version": "9.8.1",
   "author": "New Relic Node.js agent team <nodejs@newrelic.com>",
   "license": "Apache-2.0",
   "contributors": [
@@ -187,6 +187,7 @@
     "@tyriar/fibonacci-heap": "^2.0.7",
     "concat-stream": "^2.0.0",
     "https-proxy-agent": "^5.0.0",
+    "json-bigint": "^1.0.0",
     "json-stringify-safe": "^5.0.0",
     "readable-stream": "^3.6.0",
     "semver": "^5.3.0",