newrelic 8.13.2 → 8.14.0

package/NEWS.md

@@ -1,3 +1,12 @@
+### v8.14.0 (2022-06-06)
+
+* Fixed issue with `api.getBrowserTimingHeader` optional script unwrapping issue with util.format.
+  Thanks for your contribution @github-dd-nicolas 🎉
+
+* Fixed winston instrumentation to not exit early when `winston.createLogger` is created without options.
+
+* Updated pino instrumentation to not override user log configurations.
+
 ### v8.13.2 (2022-05-31)
 
 * Upgraded `protobufjs` to resolve  CVE-2022-25878

package/THIRD_PARTY_NOTICES.md

@@ -1801,7 +1801,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ### @newrelic/test-utilities
 
-This product includes source derived from [@newrelic/test-utilities](https://github.com/newrelic/node-test-utilities) ([v6.5.4](https://github.com/newrelic/node-test-utilities/tree/v6.5.4)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-test-utilities/blob/v6.5.4/LICENSE):
+This product includes source derived from [@newrelic/test-utilities](https://github.com/newrelic/node-test-utilities) ([v6.5.5](https://github.com/newrelic/node-test-utilities/tree/v6.5.5)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-test-utilities/blob/v6.5.5/LICENSE):
 
 ```
                                  Apache License

package/api.js

@@ -27,8 +27,9 @@ const NAMES = require('./lib/metrics/names')
  * CONSTANTS
  *
  */
-const RUM_STUB = 'window.NREUM||(NREUM={});NREUM.info = %s;'
-const RUM_STUB_SHELL = `<script type='text/javascript' %s>${RUM_STUB} %s</script>`
+const RUM_STUB = 'window.NREUM||(NREUM={});NREUM.info = %s; %s'
+const RUM_STUB_SHELL = `<script type='text/javascript'>${RUM_STUB}</script>`
+const RUM_STUB_SHELL_WITH_NONCE_PARAM = `<script type='text/javascript' %s>${RUM_STUB}</script>`
 
 // these messages are used in the _gracefail() method below in getBrowserTimingHeader
 const RUM_ISSUES = [
@@ -653,12 +654,18 @@ API.prototype.getBrowserTimingHeader = function getBrowserTimingHeader(options)
   const tabs = config.browser_monitoring.debug ? 2 : 0
   const json = JSON.stringify(rumHash, null, tabs)
 
-  // set nonce attribute if passed in options
-  const nonce = options && options.nonce ? 'nonce="' + options.nonce + '"' : ''
-  const script = options && options.hasToRemoveScriptWrapper ? RUM_STUB : RUM_STUB_SHELL
-
   // the complete header to be written to the browser
-  const out = util.format(script, nonce, json, jsAgentLoader)
+  const out =
+    options && options.hasToRemoveScriptWrapper
+      ? util.format(RUM_STUB, json, jsAgentLoader)
+      : options && options.nonce
+      ? util.format(
+          RUM_STUB_SHELL_WITH_NONCE_PARAM,
+          'nonce="' + options.nonce + '"',
+          json,
+          jsAgentLoader
+        )
+      : util.format(RUM_STUB_SHELL, json, jsAgentLoader)
 
   logger.trace('generating RUM header', out)
 

package/lib/aggregators/log-aggregator.js

@@ -38,12 +38,12 @@ class LogAggregator extends EventAggregator {
 
     /**
      *  Due to logging library implementation details
-     *  some log lines are already JSON. We must de-serialize
-     *  so it can be serialized in RemoteMethod. I know, this sucks.
+     *  some "log lines" are a function that formats the
+     *  data accordingly into an Object, I know, this sucks.
      */
     const formattedLogs = logs.map((logLine) => {
-      if (typeof logLine === 'string') {
-        return JSON.parse(logLine)
+      if (typeof logLine === 'function') {
+        return logLine()
       }
 
       return logLine

package/lib/instrumentation/pino/pino.js

@@ -49,20 +49,6 @@ module.exports = function instrument(shim) {
 
   const symbols = shim.require('./lib/symbols')
 
-  /**
-   * Wraps the level cache so we can properly set a formatter to return the
-   * label as level in log line instead of number
-   */
-  shim.wrap(levelUtils, 'genLsCache', function genLsCache(shim, genLevelsCache) {
-    return function wrappedGenLsCache() {
-      const args = shim.argsToArray.apply(shim, arguments)
-      args[0][symbols.formattersSym].level = function nrLevelMapping(label) {
-        return { level: label }
-      }
-      return genLevelsCache.apply(this, args)
-    }
-  })
-
   shim.wrap(tools, 'asJson', function wrapJson(shim, asJson) {
     /**
      * Wraps function in pino that is used to construct/serialize a log
@@ -75,27 +61,14 @@ module.exports = function instrument(shim) {
      * @returns {string} serialized log line
      */
     return function wrappedAsJson() {
-      // overriding the symbol that defines the key for message(pino defaults this to `msg`)
-      this[symbols.messageKeySym] = 'message'
-
       const args = shim.argsToArray.apply(shim, arguments)
 
-      /**
-       * changing the label from time to timestamp
-       * and assign unix timestamp to match our specification
-       */
-      args[3] = `,"timestamp":${Date.now()}`
-
       if (isMetricsEnabled(config)) {
         const level = args[2]
         incrementLoggingLinesMetrics(levelMap[level], metrics)
       }
 
-      if (isLogForwardingEnabled(config, agent)) {
-        const metadata = agent.getLinkingMetadata()
-        const chindings = this[symbols.chindingsSym]
-        reformatLogLine(args[0], metadata, chindings)
-      } else if (isLocalDecoratingEnabled(config)) {
+      if (isLocalDecoratingEnabled(config)) {
         args[1] += agent.getNRLinkingMetadata()
       }
 
@@ -107,7 +80,10 @@ module.exports = function instrument(shim) {
       const logLine = asJson.apply(this, args)
 
       if (isLogForwardingEnabled(config, agent)) {
-        agent.logs.add(logLine)
+        const chindings = this[symbols.chindingsSym]
+        const formatLogLine = reformatLogLine({ msg: args[1], logLine, agent, chindings, levelMap })
+
+        agent.logs.add(formatLogLine)
       }
 
       return logLine
@@ -119,14 +95,18 @@ module.exports = function instrument(shim) {
  * reformats error and assigns NR context data
  * to log line
  *
+ * @param logLine.logLine
  * @param {object} logLine log line
  * @param {object} metadata NR context data
  * @param {string} chindings serialized string of all common log line data
+ * @param logLine.args
+ * @param logLine.agent
+ * @param logLine.chindings
+ * @param logLine.msg
+ * @param logLine.levelMap
  */
-function reformatLogLine(logLine, metadata, chindings = '') {
-  if (logLine.err) {
-    reformatError(logLine)
-  }
+function reformatLogLine({ logLine, msg, agent, chindings = '', levelMap }) {
+  const metadata = agent.getLinkingMetadata()
 
   /**
    * pino adds this already for us at times
@@ -137,7 +117,24 @@ function reformatLogLine(logLine, metadata, chindings = '') {
     delete metadata.hostname
   }
 
-  Object.assign(logLine, metadata)
+  const agentMeta = Object.assign({}, { timestamp: Date.now(), message: msg }, metadata)
+
+  /**
+   * A function that gets executed in `_toPayloadSync` of log aggregator.
+   * This will parse the serialized log line and then add the relevant NR
+   * context metadata and rename the time/msg keys to timestamp/message
+   */
+  return function formatLogLine() {
+    const formattedLog = JSON.parse(logLine)
+    if (formattedLog.err) {
+      reformatError(formattedLog)
+    }
+    Object.assign(formattedLog, agentMeta)
+    formattedLog.level = levelMap[formattedLog.level]
+    delete formattedLog.time
+    delete formattedLog.msg
+    return formattedLog
+  }
 }
 
 /**
@@ -150,7 +147,6 @@ function reformatLogLine(logLine, metadata, chindings = '') {
 function reformatError(logLine) {
   logLine['error.message'] = truncate(logLine.err.message)
   logLine['error.stack'] = truncate(logLine.err.stack)
-  logLine['error.class'] =
-    logLine.err.name === 'Error' ? logLine.err.constructor.name : logLine.err.name
+  logLine['error.class'] = logLine.err.type
   delete logLine.err
 }

package/lib/instrumentation/winston.js

@@ -29,8 +29,8 @@ module.exports = function instrument(agent, winston, _, shim) {
   shim.wrap(winston, 'createLogger', function wrapCreate(shim, createLogger) {
     return function createWrappedLogger() {
       const args = shim.argsToArray.apply(shim, arguments)
-      const opts = args[0]
-      if (!shim.isObject(opts) || isStream(opts)) {
+      const opts = args[0] || {}
+      if (isStream(opts)) {
         return createLogger.apply(this, args)
       }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newrelic",
-  "version": "8.13.2",
+  "version": "8.14.0",
   "author": "New Relic Node.js agent team <nodejs@newrelic.com>",
   "license": "Apache-2.0",
   "contributors": [
@@ -180,7 +180,7 @@
     "@newrelic/eslint-config": "^0.0.3",
     "@newrelic/newrelic-oss-cli": "^0.1.2",
     "@newrelic/proxy": "^2.0.0",
-    "@newrelic/test-utilities": "^6.5.4",
+    "@newrelic/test-utilities": "^6.5.5",
     "@octokit/rest": "^18.0.15",
     "@slack/bolt": "^3.7.0",
     "ajv": "^6.12.6",