newrelic 12.6.1 → 12.8.0

package/NEWS.md

@@ -1,3 +1,61 @@
+### v12.8.0 (2024-11-19)
+
+#### Features
+
+* Added `labels.enabled` and `labels.exclude` to config defaults ([#2727](https://github.com/newrelic/node-newrelic/pull/2727)) ([36adb13](https://github.com/newrelic/node-newrelic/commit/36adb13caad41a5df5a5fa9345b9dcb9061db969))
+* Added new configuration options to add custom tags (labels) to logs ([#2743](https://github.com/newrelic/node-newrelic/pull/2743)) ([d20c874](https://github.com/newrelic/node-newrelic/commit/d20c874638ebb19f8888003d4402bce17e56360f))
+    * With custom tags on logs, platform engineers can easily filter, search, and correlate log data for faster and more efficient troubleshooting, improved performance, and optimized resource utilization. To learn more about this feature see the [documentation](https://docs.newrelic.com/docs/logs/logs-context/custom-tags-agent-forwarder-logs/)
+* Added support for Bedrock Claude 3.5 invoke model user request ([#2721](https://github.com/newrelic/node-newrelic/pull/2721)) ([a901a24](https://github.com/newrelic/node-newrelic/commit/a901a2499e73e0f1142054ead53e7b99df94b201))
+
+* Moved `entity.guid`, `entity.name`, `entity.type`, and `hostname` to `common.attributes` on logs payload instead of in every log message ([#2736](https://github.com/newrelic/node-newrelic/pull/2736)) ([a7f14de](https://github.com/newrelic/node-newrelic/commit/a7f14def489000ab7492b01155069b1a084eeb36))
+
+#### Bug fixes
+
+* Corrected expected shape of user input in get Prompt() ([#2741](https://github.com/newrelic/node-newrelic/pull/2741)) ([a8eef8b](https://github.com/newrelic/node-newrelic/commit/a8eef8b0f80ec2b0db5834a722a69f58a32b5676))
+
+#### Documentation
+
+* Updated compatibility report ([#2755](https://github.com/newrelic/node-newrelic/pull/2755)) ([459a3f1](https://github.com/newrelic/node-newrelic/commit/459a3f19ee080a3a2e560636ce087f9e91bc529e))
+
+#### Miscellaneous chores
+
+* Fixed test reporter ([#2751](https://github.com/newrelic/node-newrelic/pull/2751)) ([5878ef9](https://github.com/newrelic/node-newrelic/commit/5878ef9844fd56038d08e3b2f8cd9e26ba8c4c92))
+* Improved unit test speed ([#2728](https://github.com/newrelic/node-newrelic/pull/2728)) ([9640030](https://github.com/newrelic/node-newrelic/commit/96400304e451502ce2f09b569b46eaff271fd9ab))
+
+#### Tests
+
+* Fixed two assertions to work against older versions of `openai` ([#2726](https://github.com/newrelic/node-newrelic/pull/2726)) ([8996fc3](https://github.com/newrelic/node-newrelic/commit/8996fc3538735d7ad2d447bc7c4221b08c6c2be5))
+* Migrated `ioredis`, `prisma` and `undici` versioned tests to `node:test` ([#2746](https://github.com/newrelic/node-newrelic/pull/2746)) ([449ae03](https://github.com/newrelic/node-newrelic/commit/449ae03883d2a5e92d11590372993eedc976ab99))
+* Migrated `memcached`, `nestjs`, and `restify` versioned tests to `node:test` ([#2752](https://github.com/newrelic/node-newrelic/pull/2752)) ([653f614](https://github.com/newrelic/node-newrelic/commit/653f61410a0258683ac104cd8b8b2e7ae7c61043))
+* Migrated `nextjs` versioned tests to `node:test` ([#2749](https://github.com/newrelic/node-newrelic/pull/2749)) ([d385af6](https://github.com/newrelic/node-newrelic/commit/d385af69c84a5425cee9ff19eaeadcba9e63a761))
+* Migrated `redis` versioned tests to `node:test` ([#2725](https://github.com/newrelic/node-newrelic/pull/2725)) ([9752827](https://github.com/newrelic/node-newrelic/commit/97528270c70ecaac9161f4eb0cc78ffcc482be36))
+* Updated `hapi` tests to `node:test` ([#2722](https://github.com/newrelic/node-newrelic/pull/2722)) ([636899b](https://github.com/newrelic/node-newrelic/commit/636899b487e196572a3bc0970e7338d0c9f113cf))
+* Updated `kafkajs`, `langchain`, & `openai` tests to `node:test` ([#2723](https://github.com/newrelic/node-newrelic/pull/2723)) ([b6e4c5d](https://github.com/newrelic/node-newrelic/commit/b6e4c5d4c59032a615fea6d12623a881a6211917))
+* Updated `koa` tests to `node:test` ([#2744](https://github.com/newrelic/node-newrelic/pull/2744)) ([86c22a4](https://github.com/newrelic/node-newrelic/commit/86c22a4813ec5a63ae8bd04f7d9d013979ac34ed))
+* Updated `mongodb` tests to `node:test` ([#2738](https://github.com/newrelic/node-newrelic/pull/2738)) ([295e7e6](https://github.com/newrelic/node-newrelic/commit/295e7e6441b7220022ce4fcaaf33054945a678b0))
+* Updated `pg` and `pg-esm` tests to `node:test` ([#2750](https://github.com/newrelic/node-newrelic/pull/2750)) ([40aea36](https://github.com/newrelic/node-newrelic/commit/40aea36320d15b201800431268be2c3d4c794a7b))
+
+### v12.7.0 (2024-11-11)
+
+#### Features
+
+* Added `cloud.resource_id` attribute to dynamo spans ([#2701](https://github.com/newrelic/node-newrelic/pull/2701)) ([904f41b](https://github.com/newrelic/node-newrelic/commit/904f41b26637394a24aa13f31ff94b100ae6d090))
+* Enhance Proxy Request Handling to Display Actual External URLs ([#2698](https://github.com/newrelic/node-newrelic/pull/2698)) ([3ef7bbe](https://github.com/newrelic/node-newrelic/commit/3ef7bbe595860234c021a02235e6fd0615da5f69))
+    * Thanks for the contribution @mstarzec386
+
+#### Documentation
+
+* Updated compatibility report ([#2712](https://github.com/newrelic/node-newrelic/pull/2712)) ([82f0e98](https://github.com/newrelic/node-newrelic/commit/82f0e9806c88d14cba2e0cdf47593e036107bd7d)) ([#2699](https://github.com/newrelic/node-newrelic/pull/2699)) ([4432c42](https://github.com/newrelic/node-newrelic/commit/4432c4215d68cc79333ee3828f1ecd55476c63d8))
+
+#### Miscellaneous chores
+
+* Added a benchmark script for our sql parser ([#2708](https://github.com/newrelic/node-newrelic/pull/2708)) ([9b6de68](https://github.com/newrelic/node-newrelic/commit/9b6de6852747230b87a9873faffba6e5b39669f3))
+* Updated express-esm, generic-pool, grpc, & grpc-esm tests to node:test ([#2702](https://github.com/newrelic/node-newrelic/pull/2702)) ([a229bbf](https://github.com/newrelic/node-newrelic/commit/a229bbf0dd92c43fb2da077d8dce831b84c0c972))
+
+#### Tests
+
+* Migrated `mysql` and `mysql2` versioned tests to `node:test` ([#2711](https://github.com/newrelic/node-newrelic/pull/2711)) ([fc767e0](https://github.com/newrelic/node-newrelic/commit/fc767e08d8b546d14c53c07bc2cfe65f3fb55368))
+
 ### v12.6.1 (2024-11-07)
 
 #### Features

package/lib/agent.js

@@ -40,6 +40,7 @@ const {
 } = require('./util/attributes')
 const synthetics = require('./synthetics')
 const Harvester = require('./harvester')
+const { createFeatureUsageMetrics } = require('./util/application-logging')
 
 // Map of valid states to whether or not data collection is valid
 const STATES = {
@@ -405,7 +406,7 @@ Agent.prototype.startStreaming = function startStreaming() {
  */
 Agent.prototype.onConnect = function onConnect(shouldImmediatelyHarvest, callback) {
   this.harvester.update(this.config)
-  generateLoggingSupportMetrics(this)
+  createFeatureUsageMetrics(this)
 
   if (this.config.certificates && this.config.certificates.length > 0) {
     this.metrics.getOrCreateMetric(NAMES.FEATURES.CERTIFICATES).incrementCallCount()
@@ -821,6 +822,8 @@ 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
+ *
+ * If `excludeServiceLinks` is false it will also include the following:
  * - `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
@@ -830,17 +833,14 @@ Agent.prototype._listenForConfigChanges = function _listenForConfigChanges() {
  *   utilization.full_hostname. If utilization.full_hostname is null or empty,
  *   this will be the hostname specified in the connect request as host.
  *
+ * @param {boolean} excludeServiceLinks flag to indicate if you should include `entity.guid`, `entity.type`, `entity.name` and `hostname` from linking metadata
  * @returns {object} The LinkingMetadata object with the data above
  */
-Agent.prototype.getLinkingMetadata = function getLinkingMetadata() {
+Agent.prototype.getLinkingMetadata = function getLinkingMetadata(excludeServiceLinks = false) {
   const segment = this.tracer.getSegment()
   const config = this.config
 
-  const linkingMetadata = {
-    'entity.name': config.applications()[0],
-    'entity.type': 'SERVICE',
-    'hostname': config.getHostnameSafe()
-  }
+  const linkingMetadata = {}
 
   if (config.distributed_tracing.enabled && segment) {
     linkingMetadata['trace.id'] = segment.transaction.traceId
@@ -852,10 +852,37 @@ Agent.prototype.getLinkingMetadata = function getLinkingMetadata() {
     logger.debug('getLinkingMetadata with no active transaction')
   }
 
+  if (!excludeServiceLinks) {
+    this.getServiceLinkingMetadata(linkingMetadata)
+  }
+
+  return linkingMetadata
+}
+
+/**
+ * This methods returns an object with the following keys/data:
+ * - `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.
+ *
+ * @param {object} linkingMetadata object to add service linking keys
+ * @returns {object} with service linking metadata
+ */
+Agent.prototype.getServiceLinkingMetadata = function getServiceLinkingMetadata(
+  linkingMetadata = {}
+) {
+  const config = this.config
   if (config.entity_guid) {
     linkingMetadata['entity.guid'] = config.entity_guid
   }
-
+  linkingMetadata['entity.name'] = config.applications()[0]
+  linkingMetadata['entity.type'] = 'SERVICE'
+  linkingMetadata.hostname = config.getHostnameSafe()
   return linkingMetadata
 }
 
@@ -927,23 +954,4 @@ function generateEventHarvestSupportMetrics(agent, harvestConfig) {
   }
 }
 
-/**
- * Increments the call counts of application logging supportability metrics
- * on every connect cycle
- *
- * @param {object} agent Instantiation of Node.js agent
- */
-function generateLoggingSupportMetrics(agent) {
-  const loggingConfig = agent.config.application_logging
-  const logNames = NAMES.LOGGING
-
-  const configKeys = ['metrics', 'forwarding', 'local_decorating']
-  configKeys.forEach((configValue) => {
-    const configFlag =
-      loggingConfig.enabled && loggingConfig[`${configValue}`].enabled ? 'enabled' : 'disabled'
-    const metricName = logNames[`${configValue.toUpperCase()}`]
-    agent.metrics.getOrCreateMetric(`${metricName}${configFlag}`).incrementCallCount()
-  })
-}
-
 module.exports = Agent

package/lib/aggregators/log-aggregator.js

@@ -6,6 +6,7 @@
 'use strict'
 
 const logger = require('../logger').child({ component: 'logs_aggregator' })
+const { isLogLabelingEnabled } = require('../../lib/util/application-logging')
 const EventAggregator = require('./event-aggregator')
 
 const NAMES = require('../metrics/names')
@@ -56,7 +57,18 @@ class LogAggregator extends EventAggregator {
       return
     }
 
-    return [{ logs: formattedLogs }]
+    let commonAttrs = this.agent.getServiceLinkingMetadata()
+
+    if (isLogLabelingEnabled(this.agent.config)) {
+      commonAttrs = { ...commonAttrs, ...this.agent.config.loggingLabels }
+    }
+
+    return [
+      {
+        common: { attributes: commonAttrs },
+        logs: formattedLogs
+      }
+    ]
   }
 
   add(logLine) {

package/lib/collector/facts.js

@@ -8,7 +8,6 @@
 const fetchSystemInfo = require('../system-info')
 const defaultLogger = require('../logger').child({ component: 'facts' })
 const os = require('os')
-const parseLabels = require('../util/label-parser')
 
 module.exports = facts
 
@@ -49,7 +48,7 @@ async function facts(agent, callback, { logger = defaultLogger } = {}) {
     environment: environment,
     settings: agent.config.publicSettings(),
     high_security: agent.config.high_security,
-    labels: parseLabels(agent.config.labels),
+    labels: agent.config.parsedLabels,
     metadata: Object.keys(process.env).reduce((obj, key) => {
       if (key.startsWith('NEW_RELIC_METADATA_')) {
         obj[key] = process.env[key]

package/lib/config/default.js

@@ -1185,6 +1185,22 @@ defaultConfig.definition = () => ({
       max_samples_stored: {
         formatter: int,
         default: 10000
+      },
+      labels: {
+        /**
+         * If `true`, the agent attaches labels to log records.
+         */
+        enabled: {
+          formatter: boolean,
+          default: false
+        },
+        /**
+         * A case-insensitive array containing the labels to exclude from log records.
+         */
+        exclude: {
+          formatter: array,
+          default: []
+        }
       }
     },
     metrics: {

package/lib/config/index.js

@@ -24,6 +24,7 @@ const harvestConfigValidator = require('./harvest-config-validator')
 const mergeServerConfig = new MergeServerConfig()
 const { boolean: isTruthular } = require('./formatters')
 const configDefinition = definition()
+const parseLabels = require('../util/label-parser')
 
 /**
  * CONSTANTS -- we gotta lotta 'em
@@ -195,9 +196,38 @@ function Config(config) {
 
   // 9. Set instance attribute filter using updated context
   this.attributeFilter = new AttributeFilter(this)
+
+  // 10. Setup labels for both `collector/facts` and application logging
+  this.parsedLabels = parseLabels(this.labels, logger)
+  this.loggingLabels = this._setApplicationLoggingLabels()
 }
 util.inherits(Config, EventEmitter)
 
+/**
+ * Compares the labels list to the application logging excluded label list and removes any labels that need to be excluded.
+ * Then prefixing each label with "tags."
+ *
+ * assigns labels to `config.loggingLabels`
+ */
+Config.prototype._setApplicationLoggingLabels = function setApplicationLoggingLabels() {
+  if (this.application_logging.forwarding.labels.enabled === false) {
+    return
+  }
+
+  this.application_logging.forwarding.labels.exclude =
+    this.application_logging.forwarding.labels.exclude.map((k) => k.toLowerCase())
+
+  return this.parsedLabels.reduce((filteredLabels, label) => {
+    if (
+      !this.application_logging.forwarding.labels.exclude.includes(label.label_type.toLowerCase())
+    ) {
+      filteredLabels[`tags.${label.label_type}`] = label.label_value
+    }
+
+    return filteredLabels
+  }, {})
+}
+
 /**
  * Because this module and logger depend on each other, the logger needs
  * a way to inject the actual logger instance once it's constructed.

package/lib/instrumentation/aws-sdk/v3/dynamodb.js

@@ -72,21 +72,66 @@ function dynamoMiddleware(shim, config, next, context) {
   }
 }
 
-const dynamoMiddlewareConfig = {
-  middleware: dynamoMiddleware,
-  init(shim) {
-    shim.setDatastore(shim.DYNAMODB)
-    return true
-  },
-  type: InstrumentationDescriptor.TYPE_DATASTORE,
-  config: {
-    name: 'NewRelicDynamoMiddleware',
-    step: 'initialize',
-    priority: 'high',
-    override: true
+/**
+ * Wraps the deserialize middleware step to add the
+ * cloud.resource_id segment attributes for the AWS command
+ *
+ * @param {Shim} shim
+ * @param {Object} config AWS command configuration
+ * @param {function} next next function in middleware chain
+ * @returns {function}
+ */
+function resourceIdMiddlerware(shim, config, next) {
+  return async function wrappedResourceIdMiddlerware(args) {
+    let region
+    try {
+      region = await config.region()
+      const segment = shim.getSegment()
+
+      const accountId = shim.agent.config.cloud.aws.account_id
+
+      if (accountId) {
+        const attributes = segment.getAttributes()
+        segment.addAttribute(
+          'cloud.resource_id',
+          `arn:aws:dynamodb:${region}:${accountId}:table/${attributes.collection}`
+        )
+      }
+    } catch (err) {
+      shim.logger.debug(err, 'Failed to add AWS cloud resource id to segment')
+    }
+
+    return next(args)
   }
 }
 
+const dynamoMiddlewareConfig = [
+  {
+    middleware: dynamoMiddleware,
+    init(shim) {
+      shim.setDatastore(shim.DYNAMODB)
+      return true
+    },
+    type: InstrumentationDescriptor.TYPE_DATASTORE,
+    config: {
+      name: 'NewRelicDynamoMiddleware',
+      step: 'initialize',
+      priority: 'high',
+      override: true
+    }
+  },
+  {
+    middleware: resourceIdMiddlerware,
+    type: InstrumentationDescriptor.TYPE_GENERIC,
+    config: {
+      name: 'NewRelicCloudResource',
+      step: 'deserialize',
+      priority: 'low',
+      override: true
+    }
+  }
+]
+
 module.exports = {
   dynamoMiddlewareConfig
 }

package/lib/instrumentation/aws-sdk/v3/smithy-client.js

@@ -17,8 +17,8 @@ const middlewareByClient = {
   BedrockRuntime: [...middlewareConfig, bedrockMiddlewareConfig],
   SNS: [...middlewareConfig, snsMiddlewareConfig],
   SQS: [...middlewareConfig, sqsMiddlewareConfig],
-  DynamoDB: [...middlewareConfig, dynamoMiddlewareConfig],
-  DynamoDBDocument: [...middlewareConfig, dynamoMiddlewareConfig]
+  DynamoDB: [...middlewareConfig, ...dynamoMiddlewareConfig],
+  DynamoDBDocument: [...middlewareConfig, ...dynamoMiddlewareConfig]
 }
 
 module.exports = function instrumentSmithyClient(shim, smithyClientExport) {

package/lib/instrumentation/core/http-outbound.js

@@ -15,6 +15,7 @@ const copy = require('../../util/copy')
 const symbols = require('../../symbols')
 const http = require('http')
 const synthetics = require('../../synthetics')
+const { URL } = require('node:url')
 
 const NAMES = require('../../metrics/names')
 const DEFAULT_HOST = 'localhost'
@@ -93,6 +94,27 @@ function extractHostPort(opts) {
   return { host, hostname, port }
 }
 
+/**
+ * Extracts the host, hostname, and port from HTTP request options when using a proxy
+ *
+ * @param {object} opts HTTP request options
+ * @returns {object|null} { host, hostname, port } if proxy request is detected, or null otherwise.
+ */
+function extractHostPortViaProxy(opts) {
+  const pathname = opts.pathname || opts.path
+
+  if (pathname && (pathname.startsWith('https://') || pathname.startsWith('http://'))) {
+    const url = new URL(pathname)
+    return {
+      host: url.host,
+      hostname: url.hostname,
+      port: url.port || url.protocol === 'https:' ? '443' : '80'
+    }
+  }
+
+  return null
+}
+
 /**
  * Instruments an outbound HTTP request.
  *
@@ -103,7 +125,9 @@ function extractHostPort(opts) {
  */
 module.exports = function instrumentOutbound(agent, opts, makeRequest) {
   opts = parseOpts(opts)
-  const { host, hostname, port } = extractHostPort(opts)
+
+  const viaProxy = extractHostPortViaProxy(opts)
+  const { host, hostname, port } = viaProxy ? viaProxy : extractHostPort(opts)
 
   if (!hostname || port < 1) {
     logger.warn('Invalid host name (%s) or port (%s) for outbound request.', hostname, port)

package/lib/instrumentation/express.js

@@ -127,7 +127,7 @@ function wrapResponse(shim, response) {
         if (!shim.isFunction(cb)) {
           ++cbIdx
           cb = function defaultRenderCB(err, str) {
-            // https://github.com/expressjs/express/blob/4.x/lib/response.js#L961-L962
+            // https://github.com/expressjs/express/blob/4.x/lib/response.js#L961-L962
             if (err) {
               return res.req.next(err)
             }

package/lib/instrumentation/nr-winston-transport.js

@@ -35,7 +35,7 @@ class NrTransport extends TransportStream {
    * @param {Function} callback callback to invoke once we are done
    */
   log(logLine, callback) {
-    const metadata = this.agent.getLinkingMetadata()
+    const metadata = this.agent.getLinkingMetadata(true)
     const formattedLine = reformatLogLine(logLine, metadata)
     this.agent.logs.add(formattedLine)
     callback()

package/lib/instrumentation/pino/pino.js

@@ -45,7 +45,6 @@ module.exports = function instrument(shim, tools) {
  * @param {object} params.tools exported `pino/lib/tools`
  */
 function wrapAsJson({ shim, tools }) {
-  const symbols = shim.require('./lib/symbols')
   const { agent } = shim
   const { config, metrics } = agent
 
@@ -88,12 +87,10 @@ function wrapAsJson({ shim, tools }) {
       const logLine = asJson.apply(this, args)
 
       if (isLogForwardingEnabled(config, agent)) {
-        const chindings = this[symbols.chindingsSym]
         const formatLogLine = reformatLogLine({
           msg: useMergeObj === true ? args[0].msg : args[1],
           logLine,
           agent,
-          chindings,
           level,
           logger: shim.logger
         })
@@ -114,22 +111,12 @@ function wrapAsJson({ shim, tools }) {
  * @param {object} params.logLine log line
  * @param {string} params.msg message of log line
  * @param {object} params.agent instance of agent
- * @param {string} params.chindings serialized string of all common log line data
  * @param {string} params.level log level
  * @param {object} params.logger instance of agent logger
  * @returns {function} wrapped log formatter function
  */
-function reformatLogLine({ logLine, msg, agent, chindings = '', level, logger }) {
-  const metadata = agent.getLinkingMetadata()
-
-  /**
-   * pino adds this already for us at times
-   * since asJson manually constructs the json string,
-   * it will have hostname twice if we do not delete ours.
-   */
-  if (chindings.includes('hostname')) {
-    delete metadata.hostname
-  }
+function reformatLogLine({ logLine, msg, agent, level, logger }) {
+  const metadata = agent.getLinkingMetadata(true)
 
   const agentMeta = Object.assign({}, { timestamp: Date.now() }, metadata)
   // eslint-disable-next-line eqeqeq

package/lib/llm-events/aws-bedrock/bedrock-command.js

@@ -84,10 +84,19 @@ class BedrockCommand {
     ) {
       result = this.#body.prompt
     } else if (this.isClaude3() === true) {
-      result = this.#body?.messages?.reduce((acc, curr) => {
-        acc += curr?.content ?? ''
-        return acc
-      }, '')
+      const collected = []
+      for (const message of this.#body?.messages) {
+        if (message?.role === 'assistant') {
+          continue
+        }
+        if (typeof message?.content === 'string') {
+          collected.push(message?.content)
+          continue
+        }
+        const mappedMsgObj = message?.content.map((msgContent) => msgContent.text)
+        collected.push(mappedMsgObj)
+      }
+      result = collected.join(' ')
     }
     return result
   }

package/lib/metrics/names.js

@@ -337,7 +337,8 @@ const LOGGING = {
   SENT: `${LOGGING_FORWARDING_PREFIX}/Sent`,
   FORWARDING: `${LOGGING_FORWARDING_PREFIX}/${NODEJS.PREFIX}`,
   METRICS: `${SUPPORTABILITY.LOGGING}/Metrics/${NODEJS.PREFIX}`,
-  LOCAL_DECORATING: `${SUPPORTABILITY.LOGGING}/LocalDecorating/${NODEJS.PREFIX}`
+  LOCAL_DECORATING: `${SUPPORTABILITY.LOGGING}/LocalDecorating/${NODEJS.PREFIX}`,
+  LABELS: `${SUPPORTABILITY.LOGGING}/Labels/${NODEJS.PREFIX}`
 }
 
 const KAFKA = {

package/lib/util/application-logging.js

@@ -75,6 +75,16 @@ utils.isLogForwardingEnabled = function isLogForwardingEnabled(config, agent) {
   )
 }
 
+/**
+ * Checks if application_logging.forwarding.labels is enabled
+ *
+ * @param {object} config agent config
+ * @returns {boolean} is labeling enabled
+ */
+utils.isLogLabelingEnabled = function isLogLabelingEnabled(config) {
+  return !!config.application_logging.forwarding.labels.enabled
+}
+
 /**
  * Increments both `Logging/lines` and `Logging/lines/<level>` call count
  *
@@ -108,3 +118,51 @@ function getLogLevel(level) {
   }
   return logLevel
 }
+
+/**
+ * Increments the enabled/disabled metrics for the top line application logging features:
+ *  1. Supportability/Logging/Metrics/Nodejs/<enabled|disabled>
+ *  2. Supportability/Logging/Forwarding/Nodejs/<enabled|disabled>
+ *  3. Supportability/Logging/LocalDecorating/Nodejs/<enabled|disabled>
+ *  4. Supportability/Logging/Labels/Nodejs/<enabled|disabled>
+ *
+ *  Run in `agent.onConnect`
+ *
+ * @param {Agent} agent instance
+ */
+utils.createFeatureUsageMetrics = function createFeatureUsageMetrics(agent) {
+  const { config, metrics } = agent
+  const loggingConfig = config.application_logging.enabled
+  metrics
+    .getOrCreateMetric(
+      `${LOGGING.METRICS}${
+        loggingConfig && config.application_logging.metrics.enabled ? 'enabled' : 'disabled'
+      }`
+    )
+    .incrementCallCount()
+  metrics
+    .getOrCreateMetric(
+      `${LOGGING.FORWARDING}${
+        loggingConfig && config.application_logging.forwarding.enabled ? 'enabled' : 'disabled'
+      }`
+    )
+    .incrementCallCount()
+  metrics
+    .getOrCreateMetric(
+      `${LOGGING.LOCAL_DECORATING}${
+        loggingConfig && config.application_logging.local_decorating.enabled
+          ? 'enabled'
+          : 'disabled'
+      }`
+    )
+    .incrementCallCount()
+  metrics
+    .getOrCreateMetric(
+      `${LOGGING.LABELS}${
+        loggingConfig && config.application_logging.forwarding.labels.enabled
+          ? 'enabled'
+          : 'disabled'
+      }`
+    )
+    .incrementCallCount()
+}

package/lib/util/label-parser.js

@@ -11,10 +11,11 @@ module.exports.fromMap = fromMap
 
 // this creates a copy of trim that can be used with map
 const trim = Function.prototype.call.bind(String.prototype.trim)
-const logger = require('../logger').child({ component: 'label-parser' })
 const stringify = require('json-stringify-safe')
 
-function parse(labels) {
+// pass in parent logger to avoid circular deps
+function parse(labels, parentLogger) {
+  const logger = parentLogger.child({ component: 'label-parser' })
   let results
 
   if (!labels) {
@@ -25,8 +26,8 @@ function parse(labels) {
     results = fromMap(labels)
   }
 
-  results.warnings.forEach(function logWarnings(messaage) {
-    logger.warn(messaage)
+  results.warnings.forEach(function logWarnings(message) {
+    logger.warn(message)
   })
 
   return results.labels
@@ -106,11 +107,11 @@ function fromMap(map) {
     try {
       warnings.unshift('Partially Invalid Label Setting: ' + stringify(map))
     } catch (err) {
-      logger.debug(err, 'Failed to stringify labels')
+      warnings.unshift('Failed to stringify labels: ' + err.message)
     }
   }
 
-  return { labels: labels, warnings: warnings }
+  return { labels, warnings }
 }
 
 function truncate(str, max) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newrelic",
-  "version": "12.6.1",
+  "version": "12.8.0",
   "author": "New Relic Node.js agent team <nodejs@newrelic.com>",
   "license": "Apache-2.0",
   "contributors": [