newrelic 9.8.0 → 9.8.1

package/NEWS.md

@@ -1,3 +1,9 @@
+### 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: 
@@ -3168,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.
 
@@ -3257,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/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.8.0",
+  "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",