newrelic 8.11.1 → 8.11.2

package/NEWS.md

@@ -1,3 +1,7 @@
+### v8.11.2 (2022-05-23)
+
+* Fixed winston instrumentation to no longer coerce every log line to be json.
+
 ### v8.11.1 (2022-05-13)
 
 * Fixed an issue with winston instrumentation that caused agent to crash when creating a winston logger from an existing instantiated logger.

package/THIRD_PARTY_NOTICES.md

@@ -19,7 +19,6 @@ code, the source code can be found at [https://github.com/newrelic/node-newrelic
 * [@newrelic/aws-sdk](#newrelicaws-sdk)
 * [@newrelic/koa](#newrelickoa)
 * [@newrelic/superagent](#newrelicsuperagent)
-* [@newrelic/winston-enricher](#newrelicwinston-enricher)
 * [@tyriar/fibonacci-heap](#tyriarfibonacci-heap)
 * [async](#async)
 * [concat-stream](#concat-stream)
@@ -1129,215 +1128,6 @@ This product includes source derived from [@newrelic/superagent](https://github.
 
 ```
 
-### @newrelic/winston-enricher
-
-This product includes source derived from [@newrelic/winston-enricher](https://github.com/newrelic/newrelic-node-log-extensions) ([v3.1.1](https://github.com/newrelic/newrelic-node-log-extensions/tree/v3.1.1)), distributed under the [Apache-2.0 License](https://github.com/newrelic/newrelic-node-log-extensions/blob/v3.1.1/LICENSE):
-
-```
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2019 New Relic, Inc.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-```
-
 ### @tyriar/fibonacci-heap
 
 This product includes source derived from [@tyriar/fibonacci-heap](https://github.com/gwtw/ts-fibonacci-heap) ([v2.0.9](https://github.com/gwtw/ts-fibonacci-heap/tree/v2.0.9)), distributed under the [MIT License](https://github.com/gwtw/ts-fibonacci-heap/blob/v2.0.9/LICENSE):

package/api.js

@@ -150,32 +150,7 @@ API.prototype.getLinkingMetadata = function getLinkingMetadata(omitSupportabilit
     metric.incrementCallCount()
   }
 
-  const agent = this.agent
-
-  const segment = agent.tracer.getSegment()
-  const config = agent.config
-
-  const linkingMetadata = {
-    'entity.name': config.applications()[0],
-    'entity.type': 'SERVICE',
-    'hostname': config.getHostnameSafe()
-  }
-
-  if (config.distributed_tracing.enabled && segment) {
-    linkingMetadata['trace.id'] = segment.transaction.traceId
-    const spanId = segment.getSpanId()
-    if (spanId) {
-      linkingMetadata['span.id'] = spanId
-    }
-  } else {
-    logger.debug('getLinkingMetadata with no active transaction')
-  }
-
-  if (config.entity_guid) {
-    linkingMetadata['entity.guid'] = config.entity_guid
-  }
-
-  return linkingMetadata
+  return this.agent.getLinkingMetadata()
 }
 
 /**

package/lib/agent.js

@@ -923,6 +923,76 @@ Agent.prototype._listenForConfigChanges = function _listenForConfigChanges() {
   })
 }
 
+/**
+ * This method returns an object with the following keys/data:
+ * - `trace.id`: The current trace ID
+ * - `span.id`: The current span ID
+ * - `entity.name`: The application name specified in the connect request as
+ *   app_name. If multiple application names are specified this will only be
+ *   the first name
+ * - `entity.type`: The string "SERVICE"
+ * - `entity.guid`: The entity ID returned in the connect reply as entity_guid
+ * - `hostname`: The hostname as specified in the connect request as
+ *   utilization.full_hostname. If utilization.full_hostname is null or empty,
+ *   this will be the hostname specified in the connect request as host.
+ *
+ * @returns {LinkingMetadata} The linking object with the data above
+ */
+Agent.prototype.getLinkingMetadata = function getLinkingMetadata() {
+  const segment = this.tracer.getSegment()
+  const config = this.config
+
+  const linkingMetadata = {
+    'entity.name': config.applications()[0],
+    'entity.type': 'SERVICE',
+    'hostname': config.getHostnameSafe()
+  }
+
+  if (config.distributed_tracing.enabled && segment) {
+    linkingMetadata['trace.id'] = segment.transaction.traceId
+    const spanId = segment.getSpanId()
+    if (spanId) {
+      linkingMetadata['span.id'] = spanId
+    }
+  } else {
+    logger.debug('getLinkingMetadata with no active transaction')
+  }
+
+  if (config.entity_guid) {
+    linkingMetadata['entity.guid'] = config.entity_guid
+  }
+
+  return linkingMetadata
+}
+
+/**
+ * Formats the NR-LINKING blob that matches the spec
+ *
+ * @returns {string} formatted NR-LINKING string
+ */
+Agent.prototype.getNRLinkingMetadata = function getNRLinkingMetadata() {
+  const metadata = this.getLinkingMetadata()
+  const nrLinkingMeta = [
+    getValue('entity.guid'),
+    getValue('hostname'),
+    getValue('trace.id'),
+    getValue('span.id'),
+    encodeURIComponent(getValue('entity.name'))
+  ]
+
+  return ` NR-LINKING|${nrLinkingMeta.join('|')}|`
+
+  /**
+   * Retries value for a given key but defaults to `` if falsey
+   *
+   * @param {string} key in linking metadata
+   * @returns {string}
+   */
+  function getValue(key) {
+    return metadata[key] || ''
+  }
+}
+
 function generateEventHarvestSupportMetrics(agent, harvestConfig) {
   const harvestLimits = harvestConfig.harvest_limits
 

package/lib/instrumentation/winston.js

@@ -5,44 +5,26 @@
 
 'use strict'
 
-const createFormatter = require('@newrelic/winston-enricher/lib/createFormatter')
-const API = require('../../api')
 const Stream = require('stream')
-
-/**
- * winston allows you to compose a logger
- * from an instantiated logger.  Through a series
- * of inherited classes, this logger instance is a Stream.
- * Check what gets passed into `winston.createLogger` to avoid
- * instrumenting an already instrumented instance of a logger.
- *
- * @param {*} obj obj to check if a stream
- * @returns {boolean}
- */
-function isStream(obj) {
-  return obj instanceof Stream
-}
+const {
+  isApplicationLoggingEnabled,
+  isLogForwardingEnabled,
+  isLocalDecoratingEnabled,
+  isMetricsEnabled,
+  createModuleUsageMetric,
+  incrementLoggingLinesMetrics,
+  truncate
+} = require('../util/application-logging')
+const logger = require('../logger').child({ component: 'winston' })
 
 module.exports = function instrument(agent, winston, _, shim) {
   const config = agent.config
-  if (
-    !(
-      config.application_logging.enabled &&
-      (config.application_logging.forwarding.enabled ||
-        config.application_logging.metrics.enabled ||
-        config.application_logging.local_decorating.enabled)
-    )
-  ) {
-    shim.logger.debug('Application logging not enabled. Not instrumenting winston...')
+
+  if (!isApplicationLoggingEnabled(config)) {
+    logger.debug('Application logging not enabled. Not instrumenting winston.')
     return
   }
 
-  // create an instrumented formatter to enrich and report logs
-  const api = new API(agent)
-  api.shim = shim
-  const instrumentedFormatter = createFormatter(api, winston)
-
-  // wrap logger creation to combine or insert our formatter
   shim.wrap(winston, 'createLogger', function wrapCreate(shim, createLogger) {
     return function createWrappedLogger() {
       const args = shim.argsToArray.apply(shim, arguments)
@@ -51,24 +33,155 @@ module.exports = function instrument(agent, winston, _, shim) {
         return createLogger.apply(this, args)
       }
 
-      if ('transports' in opts) {
-        // combine transport-level formatters with our own
-        opts.transports = opts.transports.map((transport) => {
-          if (transport.format) {
-            transport.format = winston.format.combine(transport.format, instrumentedFormatter())
-          } else {
-            transport.format = instrumentedFormatter()
-          }
-          return transport
-        })
-      } else if ('format' in opts) {
-        // combine top-level formatter with our own
-        opts.format = winston.format.combine(opts.format, instrumentedFormatter())
-      } else {
-        opts.format = instrumentedFormatter()
-      }
+      registerFormatter({ opts, config, agent, winston })
 
       return createLogger.apply(this, args)
     }
   })
 }
+
+/**
+ * There is no right way to do this.  But since we are automagical
+ * it is hard to predict how a customer uses winston.  We will iterate over the formatters specified on the logger and add last if forwarder or first if local decorating.
+ * This is because we want all the customizations of previous formatters before adding log log to log aggregator.  But in the case of local decorating we want to do this first so any formatter that is transforming data will have the changes.
+ *
+ * Note: The logic explained above does not apply if a customer specifies multiple formats for a given transport.
+ * We cannot instrument the formats on the transport because if a customer has multiple transports we would be duplicating logs when forwaring.
+ *
+ * @param {object} params object passed to function
+ * @param {object} params.opts options from winston.createLogger
+ * @param {object} params.config agent config
+ * @param {object} params.agent NR agent
+ * @param {object} params.winston exported winston package
+ */
+function registerFormatter({ opts, config, agent, winston }) {
+  const instrumentedFormatter = nrWinstonFormatter(agent, winston)
+
+  if ('format' in opts) {
+    const formatters = [opts.format]
+
+    if (isLogForwardingEnabled(config, agent)) {
+      formatters.push(instrumentedFormatter())
+    } else {
+      formatters.unshift(instrumentedFormatter())
+    }
+
+    opts.format = winston.format.combine(...formatters)
+  } else {
+    opts.format = instrumentedFormatter()
+  }
+}
+
+/**
+ * This formatter is being used to facilitate
+ * the application logging use cases.
+ * It is worth noting that the features below are mutually
+ * exclusive.
+ *
+ * The application logging use cases are local log decorating
+ * and log forwarding.
+ *
+ * Local log decorating appends `NR-LINKING` piped metadata to
+ * the message key in log line. You must configure a log forwarder to get
+ * this data to NR1.
+ *
+ * Log forwarding includes the linking metadata as keys on logging
+ * object as well as adds the log line to the agent log aggregator.
+ *
+ * @param {object} agent NR agent
+ * @param {object} winston exported winston package
+ * @returns {object} log line with NR context or NR-LINKING metadata on message
+ */
+function nrWinstonFormatter(agent, winston) {
+  const config = agent.config
+  const metrics = agent.metrics
+  createModuleUsageMetric('winston', metrics)
+
+  return winston.format((logLine) => {
+    if (isMetricsEnabled(config)) {
+      incrementLoggingLinesMetrics(logLine.level, metrics)
+    }
+
+    if (isLogForwardingEnabled(config, agent)) {
+      const metadata = agent.getLinkingMetadata()
+      reformatLogLine(logLine, metadata, agent)
+      agent.logs.add(logLine)
+    } else if (isLocalDecoratingEnabled(config)) {
+      logLine.message += agent.getNRLinkingMetadata()
+    }
+
+    return logLine
+  })
+}
+
+/**
+ * Reformats a log line by reformatting errors, timestamp and adding
+ * new relic linking metadata(context)
+ *
+ * @param {object} logLine log line
+ * @param {object} metadata linking metadata
+ * @param {object} agent NR agent
+ */
+function reformatLogLine(logLine, metadata, agent) {
+  if (logLine.exception === true) {
+    reformatError(logLine)
+  }
+
+  reformatTimestamp(logLine, agent)
+
+  // Add the metadata to the logLine object being logged
+  Object.assign(logLine, metadata)
+}
+
+/**
+ * Decorates the log line with  truncated error.message, error.class, and error.stack and removes
+ * trace and stack
+ *
+ * @param {object} logLine a log line
+ */
+function reformatError(logLine) {
+  // Due to Winston internals sometimes the error on the logLine object is a string or an
+  // empty object, and so the message property is all we have
+  const errorMessage = logLine.error.message || logLine.message || ''
+
+  logLine['error.message'] = truncate(errorMessage)
+  logLine['error.class'] =
+    logLine.error.name === 'Error' ? logLine.error.constructor.name : logLine.error.name
+  logLine['error.stack'] = truncate(logLine.error.stack)
+  logLine.message = truncate(logLine.message)
+
+  // Removes additional capture of stack to reduce overall payload/log-line size.
+  // The server has a maximum of ~4k characters per line allowed.
+  delete logLine.trace
+  delete logLine.stack
+}
+
+/**
+ * Turns timestamp into unix timestamp. If timestamp existed it will move original
+ * to `original_timestamp` key
+ *
+ * @param {object} logLine a log line
+ */
+function reformatTimestamp(logLine) {
+  if (logLine.timestamp) {
+    logger.traceOnce(
+      'Overwriting `timestamp` key; assigning original value to `original_timestamp`.'
+    )
+    logLine.original_timestamp = logLine.timestamp
+  }
+  logLine.timestamp = Date.now()
+}
+
+/**
+ * winston allows you to compose a logger
+ * from an instantiated logger.  Through a series
+ * of inherited classes, this logger instance is a Stream.
+ * Check what gets passed into `winston.createLogger` to avoid
+ * instrumenting an already instrumented instance of a logger.
+ *
+ * @param {*} obj obj to check if a stream
+ * @returns {boolean} is object is a stream or not
+ */
+function isStream(obj) {
+  return obj instanceof Stream
+}

package/lib/metrics/names.js

@@ -273,6 +273,10 @@ const LOGGING = {
     DEBUG: `${LOGGING_LINES_PREFIX}/DEBUG`,
     TRACE: `${LOGGING_LINES_PREFIX}/TRACE`
   },
+  LIBS: {
+    PINO: `${SUPPORTABILITY.LOGGING}/${NODEJS.PREFIX}pino/enabled`,
+    WINSTON: `${SUPPORTABILITY.LOGGING}/${NODEJS.PREFIX}winston/enabled`
+  },
   DROPPED: `Logging/Forwarding/Dropped`,
   SEEN: `${LOGGING_FORWARDING_PREFIX}/Seen`,
   SENT: `${LOGGING_FORWARDING_PREFIX}/Sent`,

package/lib/util/application-logging.js

@@ -0,0 +1,97 @@
+/*
+ * Copyright 2022 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+const utils = module.exports
+const MAX_LENGTH = 1021
+const OUTPUT_LENGTH = 1024
+const { LOGGING } = require('../metrics/names')
+
+/**
+ * Truncates a string to MAX_LENGTH constant above.
+ *
+ * @param {string} str string to truncate
+ * @returns {string}
+ */
+utils.truncate = function truncate(str) {
+  if (str.length > OUTPUT_LENGTH) {
+    return str.substring(0, MAX_LENGTH) + '...'
+  }
+
+  return str
+}
+
+/**
+ * Checks if application_logging and one of the features are enabled
+ *
+ * @param {object} config agent config
+ * @returns {boolean} is application logging enabled
+ */
+utils.isApplicationLoggingEnabled = function isApplicationLoggingEnabled(config) {
+  return !!(
+    config.application_logging.enabled &&
+    (config.application_logging.metrics.enabled ||
+      config.application_logging.forwarding.enabled ||
+      config.application_logging.local_decorating.enabled)
+  )
+}
+
+/**
+ * Checks if application_logging and application_logging.metrics are both enabled
+ *
+ * @param {object} config agent config
+ * @returns {boolean} is metrics enabled
+ */
+utils.isMetricsEnabled = function isMetricsEnabled(config) {
+  return !!(config.application_logging.enabled && config.application_logging.metrics.enabled)
+}
+
+/**
+ * Checks if application_logging and application_logging.local_decorating are both enabled
+ *
+ * @param {object} config agent config
+ * @returns {boolean} is forwarding enabled
+ */
+utils.isLocalDecoratingEnabled = function isLocalDecoratingEnabled(config) {
+  return !!(
+    config.application_logging.enabled && config.application_logging.local_decorating.enabled
+  )
+}
+
+/**
+ * Checks if log aggregator exists on agent & application_logging and application_logging.forwarding are both enabled
+ *
+ * @param {object} config agent config
+ * @param {Agent} agent Node.js agent
+ * @returns {boolean} is forwarding enabled
+ */
+utils.isLogForwardingEnabled = function isLogForwardingEnabled(config, agent) {
+  return !!(
+    agent.logs &&
+    config.application_logging.enabled &&
+    config.application_logging.forwarding.enabled
+  )
+}
+
+/**
+ * Increments both `Logging/lines` and `Logging/lines/<level>` call count
+ *
+ * @param {string} level log level
+ * @param {object} metrics metrics module
+ */
+utils.incrementLoggingLinesMetrics = function incrementLoggingLinesMetrics(level, metrics) {
+  metrics.getOrCreateMetric(LOGGING.LINES).incrementCallCount()
+  metrics.getOrCreateMetric(LOGGING.LEVELS[level.toUpperCase()]).incrementCallCount()
+}
+
+/**
+ * Increments call count when instrumentation for a logging library is loaded
+ *
+ * @param {string} lib name of library
+ * @param {object} metrics agent metrics instance
+ */
+utils.createModuleUsageMetric = function createModuleUsageMetric(lib, metrics) {
+  metrics.getOrCreateMetric(LOGGING.LIBS[lib.toUpperCase()]).incrementCallCount()
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newrelic",
-  "version": "8.11.1",
+  "version": "8.11.2",
   "author": "New Relic Node.js agent team <nodejs@newrelic.com>",
   "license": "Apache-2.0",
   "contributors": [
@@ -164,7 +164,6 @@
     "@newrelic/aws-sdk": "^4.1.1",
     "@newrelic/koa": "^6.1.1",
     "@newrelic/superagent": "^5.1.0",
-    "@newrelic/winston-enricher": "^3.1.1",
     "@tyriar/fibonacci-heap": "^2.0.7",
     "async": "^3.2.3",
     "concat-stream": "^2.0.0",