newrelic 12.17.0 → 12.18.1

package/NEWS.md

@@ -1,32 +1,76 @@
-### v12.17.0 (2025-04-02)
-
-#### Features
-
-* Azure Function utilization ([#3017](https://github.com/newrelic/node-newrelic/pull/3017)) ([80ab93e](https://github.com/newrelic/node-newrelic/commit/80ab93ee5599800a823e3828f9730d5421b460c2))
-* Support honoring W3C `traceparent` sampled flag ([#3009](https://github.com/newrelic/node-newrelic/pull/3009)) ([d903413](https://github.com/newrelic/node-newrelic/commit/d903413a6216dae2cde3e6b6366c3a390d4ed4cd))
-  * By default the agent will not honor the `traceparent` sampled flag.
-  * To control how sampling works with `traceparent` set the following in config: 
-    * `distributed_tracing.sampler.remote_parent_sampled`(when the traceparent sampled flag is `01`) 
-        * `always_on`: the agent will sample spans
-        * `always_off`: the agent will not sample spans
-        * `default`: the agent will rely on existing priority sampling to make its decisions
-    * `distributed_tracing.sampler.remote_parent_not_sampled`(when the traceparent sampled flag is `00`)
-        * `always_on`: the agent will sample spans
-        * `always_off`: the agent will not sample spans
-        * `default`: the agent will rely on existing priority sampling to make its decisions
-
-#### Code refactoring
-
-* Updated otel bridge to centralize mapping rules for a given span attribute to accomondate semantic convention spec updates ([#3010](https://github.com/newrelic/node-newrelic/pull/3010)) ([c20c36b](https://github.com/newrelic/node-newrelic/commit/c20c36bbe0f63ab18fbbe85ad4bfaa3b80f1475d))
-
-#### Documentation
-
-* Updated compatibility report ([#3013](https://github.com/newrelic/node-newrelic/pull/3013)) ([8fab715](https://github.com/newrelic/node-newrelic/commit/8fab715581ccc5da7118884a0080557891329daa))
-
-#### Tests
-
-* Pinned `openai@4.90.0` to work with `@langchain/openai` ([#3019](https://github.com/newrelic/node-newrelic/pull/3019)) ([eaa3db0](https://github.com/newrelic/node-newrelic/commit/eaa3db0a556a19c44a05926dc339ea7bcbc9cebd))
-
+### v12.18.1 (2025-04-29)
+
+#### Bug fixes
+
+* Only add `newrelic` header to outgoing headers if has a value ([#3052](https://github.com/newrelic/node-newrelic/pull/3052)) ([6ef0a90](https://github.com/newrelic/node-newrelic/commit/6ef0a904291fb4efc6d6f111b3ec93aac720c3ad))
+
+#### Code refactoring
+
+* Added defensive code when calculating exclusive time on a segment where it cannot locate the segment in the transaction trace tree ([#3051](https://github.com/newrelic/node-newrelic/pull/3051)) ([b4aa25e](https://github.com/newrelic/node-newrelic/commit/b4aa25e2df861dab732bb812bffe961c0cc3da36))
+* Updated how otel bridge trace propagator assigns traceparent/tracestate headers ([#3046](https://github.com/newrelic/node-newrelic/pull/3046)) ([6e317b8](https://github.com/newrelic/node-newrelic/commit/6e317b889c68a2e0e69b1d4d2fa9fe2846a0e94f))
+
+#### Documentation
+
+* Updated compatibility report ([#3054](https://github.com/newrelic/node-newrelic/pull/3054)) ([#3050](https://github.com/newrelic/node-newrelic/pull/3050)) ([#3026](https://github.com/newrelic/node-newrelic/pull/3026)) 
+
+#### Tests
+
+* Skipped regressions in pg-native versioned tests ([#3053](https://github.com/newrelic/node-newrelic/pull/3053)) ([6ce3670](https://github.com/newrelic/node-newrelic/commit/6ce36706adc2e17a80b759b51c23807d617ad04f))
+* Updated elasticsearch image for versioned tests ([#3038](https://github.com/newrelic/node-newrelic/pull/3038)) ([3d73f9f](https://github.com/newrelic/node-newrelic/commit/3d73f9faffd45d2d1465210d168822494439c577))
+
+### v12.18.0 (2025-04-14)
+
+#### Features
+
+* Support Azure functions background trigger types ([#3028](https://github.com/newrelic/node-newrelic/pull/3028)) ([3bf17b0](https://github.com/newrelic/node-newrelic/commit/3bf17b03abaa713c1f9ad544c54c24a6374359c2))
+* Support Azure functions HTTP trigger type ([#3021](https://github.com/newrelic/node-newrelic/pull/3021)) ([90d894b](https://github.com/newrelic/node-newrelic/commit/90d894bf1eb4a48f4b7f314ae22eef2cc76c32b9))
+
+#### Bug fixes
+
+* Updated span streamer to properly retry failed batches and handle flushing batch queue every 5 seconds ([#3033](https://github.com/newrelic/node-newrelic/pull/3033)) ([7db0e7c](https://github.com/newrelic/node-newrelic/commit/7db0e7ca929d54858addd5255b46507f82333045))
+
+#### Code refactoring
+
+* Update otel bridge rules synthesizer to properly handle consumer kind rules ([#3003](https://github.com/newrelic/node-newrelic/pull/3003)) ([3295dd1](https://github.com/newrelic/node-newrelic/commit/3295dd12bbebb708f3eeca2ad32fbc157a892fec))
+
+#### Documentation
+
+* Updated compatibility report ([#3020](https://github.com/newrelic/node-newrelic/pull/3020)) ([ce32b67](https://github.com/newrelic/node-newrelic/commit/ce32b6754383b6b1fe95d1d37759810b4caaf34c))
+
+#### Miscellaneous chores
+
+* Fixed prisma CI issues ([#3031](https://github.com/newrelic/node-newrelic/pull/3031)) ([1349cae](https://github.com/newrelic/node-newrelic/commit/1349cae4d87941e4f55dffc2445c90e73d823bbc))
+* Improved logging within utilization detection ([#3034](https://github.com/newrelic/node-newrelic/pull/3034)) ([b47bd46](https://github.com/newrelic/node-newrelic/commit/b47bd46ad144723ac62192eb9cc474ddd1fce98d))
+
+### v12.17.0 (2025-04-02)
+
+#### Features
+
+* Azure Function utilization ([#3017](https://github.com/newrelic/node-newrelic/pull/3017)) ([80ab93e](https://github.com/newrelic/node-newrelic/commit/80ab93ee5599800a823e3828f9730d5421b460c2))
+* Support honoring W3C `traceparent` sampled flag ([#3009](https://github.com/newrelic/node-newrelic/pull/3009)) ([d903413](https://github.com/newrelic/node-newrelic/commit/d903413a6216dae2cde3e6b6366c3a390d4ed4cd))
+  * By default the agent will not honor the `traceparent` sampled flag.
+  * To control how sampling works with `traceparent` set the following in config: 
+    * `distributed_tracing.sampler.remote_parent_sampled`(when the traceparent sampled flag is `01`) 
+        * `always_on`: the agent will sample spans
+        * `always_off`: the agent will not sample spans
+        * `default`: the agent will rely on existing priority sampling to make its decisions
+    * `distributed_tracing.sampler.remote_parent_not_sampled`(when the traceparent sampled flag is `00`)
+        * `always_on`: the agent will sample spans
+        * `always_off`: the agent will not sample spans
+        * `default`: the agent will rely on existing priority sampling to make its decisions
+
+#### Code refactoring
+
+* Updated otel bridge to centralize mapping rules for a given span attribute to accomondate semantic convention spec updates ([#3010](https://github.com/newrelic/node-newrelic/pull/3010)) ([c20c36b](https://github.com/newrelic/node-newrelic/commit/c20c36bbe0f63ab18fbbe85ad4bfaa3b80f1475d))
+
+#### Documentation
+
+* Updated compatibility report ([#3013](https://github.com/newrelic/node-newrelic/pull/3013)) ([8fab715](https://github.com/newrelic/node-newrelic/commit/8fab715581ccc5da7118884a0080557891329daa))
+
+#### Tests
+
+* Pinned `openai@4.90.0` to work with `@langchain/openai` ([#3019](https://github.com/newrelic/node-newrelic/pull/3019)) ([eaa3db0](https://github.com/newrelic/node-newrelic/commit/eaa3db0a556a19c44a05926dc339ea7bcbc9cebd))
+
 ### v12.16.1 (2025-03-24)
 
 #### Features

package/THIRD_PARTY_NOTICES.md

@@ -91,7 +91,7 @@ code, the source code can be found at [https://github.com/newrelic/node-newrelic
 
 ### @grpc/grpc-js
 
-This product includes source derived from [@grpc/grpc-js](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js) ([v1.12.4](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/tree/v1.12.4)), distributed under the [Apache-2.0 License](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/blob/v1.12.4/LICENSE):
+This product includes source derived from [@grpc/grpc-js](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js) ([v1.13.2](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/tree/v1.13.2)), distributed under the [Apache-2.0 License](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/blob/v1.13.2/LICENSE):
 
 ```
                                  Apache License
@@ -509,7 +509,7 @@ This product includes source derived from [@grpc/proto-loader](https://github.co
 
 ### @newrelic/security-agent
 
-This product includes source derived from [@newrelic/security-agent](https://github.com/newrelic/csec-node-agent) ([v2.3.1](https://github.com/newrelic/csec-node-agent/tree/v2.3.1)), distributed under the [UNKNOWN License](https://github.com/newrelic/csec-node-agent/blob/v2.3.1/LICENSE):
+This product includes source derived from [@newrelic/security-agent](https://github.com/newrelic/csec-node-agent) ([v2.4.0](https://github.com/newrelic/csec-node-agent/tree/v2.4.0)), distributed under the [UNKNOWN License](https://github.com/newrelic/csec-node-agent/blob/v2.4.0/LICENSE):
 
 ```
 ## New Relic Software License v1.0
@@ -1271,7 +1271,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ### import-in-the-middle
 
-This product includes source derived from [import-in-the-middle](https://github.com/nodejs/import-in-the-middle) ([v1.13.0](https://github.com/nodejs/import-in-the-middle/tree/v1.13.0)), distributed under the [Apache-2.0 License](https://github.com/nodejs/import-in-the-middle/blob/v1.13.0/LICENSE):
+This product includes source derived from [import-in-the-middle](https://github.com/nodejs/import-in-the-middle) ([v1.13.1](https://github.com/nodejs/import-in-the-middle/tree/v1.13.1)), distributed under the [Apache-2.0 License](https://github.com/nodejs/import-in-the-middle/blob/v1.13.1/LICENSE):
 
 ```
                                  Apache License
@@ -1615,7 +1615,7 @@ IN THE SOFTWARE.
 
 ### require-in-the-middle
 
-This product includes source derived from [require-in-the-middle](https://github.com/elastic/require-in-the-middle) ([v7.4.0](https://github.com/elastic/require-in-the-middle/tree/v7.4.0)), distributed under the [MIT License](https://github.com/elastic/require-in-the-middle/blob/v7.4.0/LICENSE):
+This product includes source derived from [require-in-the-middle](https://github.com/elastic/require-in-the-middle) ([v7.5.0](https://github.com/elastic/require-in-the-middle/tree/v7.5.0)), distributed under the [MIT License](https://github.com/elastic/require-in-the-middle/blob/v7.5.0/LICENSE):
 
 ```
 The MIT License (MIT)
@@ -1701,7 +1701,7 @@ SOFTWARE.
 
 ### @aws-sdk/client-s3
 
-This product includes source derived from [@aws-sdk/client-s3](https://github.com/aws/aws-sdk-js-v3) ([v3.714.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.714.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.714.0/LICENSE):
+This product includes source derived from [@aws-sdk/client-s3](https://github.com/aws/aws-sdk-js-v3) ([v3.726.1](https://github.com/aws/aws-sdk-js-v3/tree/v3.726.1)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.726.1/LICENSE):
 
 ```
                                 Apache License
@@ -1910,7 +1910,7 @@ This product includes source derived from [@aws-sdk/client-s3](https://github.co
 
 ### @aws-sdk/s3-request-presigner
 
-This product includes source derived from [@aws-sdk/s3-request-presigner](https://github.com/aws/aws-sdk-js-v3) ([v3.714.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.714.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.714.0/LICENSE):
+This product includes source derived from [@aws-sdk/s3-request-presigner](https://github.com/aws/aws-sdk-js-v3) ([v3.726.1](https://github.com/aws/aws-sdk-js-v3/tree/v3.726.1)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.726.1/LICENSE):
 
 ```
                                 Apache License
@@ -3770,7 +3770,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ### eslint
 
-This product includes source derived from [eslint](https://github.com/eslint/eslint) ([v9.17.0](https://github.com/eslint/eslint/tree/v9.17.0)), distributed under the [MIT License](https://github.com/eslint/eslint/blob/v9.17.0/LICENSE):
+This product includes source derived from [eslint](https://github.com/eslint/eslint) ([v9.18.0](https://github.com/eslint/eslint/tree/v9.18.0)), distributed under the [MIT License](https://github.com/eslint/eslint/blob/v9.18.0/LICENSE):
 
 ```
 Copyright OpenJS Foundation and other contributors, <www.openjsf.org>

package/lib/config/default.js

@@ -1197,7 +1197,14 @@ defaultConfig.definition = () => ({
       port: {
         formatter: int,
         default: 443
-      }
+      },
+      /**
+       * For testing only. This allows the connection to an insecure gRPC server.
+       */
+      insecure: {
+        formatter: boolean,
+        default: false
+      },
     },
     span_events: {
       /**
@@ -1206,6 +1213,13 @@ defaultConfig.definition = () => ({
       queue_size: {
         formatter: int,
         default: 10000
+      },
+      /**
+       * Size of batches to post to 8T server
+       */
+      batch_size: {
+        formatter: int,
+        default: 750
       }
     },
     batching: {

package/lib/grpc/connection.js

@@ -62,6 +62,7 @@ class GrpcConnection extends EventEmitter {
 
     const traceObserverConfig = infiniteTracingConfig.trace_observer
     this._endpoint = this.getTraceObserverEndpoint(traceObserverConfig)
+    this._insecureConnection = traceObserverConfig.insecure
 
     this._client = null
     this.stream = null
@@ -202,11 +203,13 @@ class GrpcConnection extends EventEmitter {
 
   _disconnect() {
     logger.trace('Disconnecting from gRPC endpoint.')
+    this._setState(connectionStates.disconnected)
 
     if (this.stream) {
       this.stream.removeAllListeners()
 
       const oldStream = this.stream
+
       this.stream.on('status', function endStreamStatusHandler(grpcStatus) {
         logger.trace('End stream status received [%s]: %s', grpcStatus.code, grpcStatus.details)
 
@@ -228,8 +231,6 @@ class GrpcConnection extends EventEmitter {
 
       this.stream = null
     }
-
-    this._setState(connectionStates.disconnected)
   }
 
   /**
@@ -374,12 +375,10 @@ class GrpcConnection extends EventEmitter {
 
     const traceApi = protoDescriptor.com.newrelic.trace.v1
 
-    const credentials = this._generateCredentials(grpc)
-
-    // If you want to use mock server use insecure creds
-    // const credentials = grpc.credentials.createInsecure()
+    const credentials = this._insecureConnection ? grpc.credentials.createInsecure() : this._generateCredentials(grpc)
 
     const opts = {}
+
     if (this._compression) {
       // 2 = gzip compression
       // see: https://github.com/grpc/grpc-node/blob/master/packages/grpc-js/src/compression-algorithms.ts#L21
@@ -393,6 +392,27 @@ class GrpcConnection extends EventEmitter {
         .incrementCallCount()
     }
 
+    // this defines retries of writes to stream if it fails with `UNAVAILABLE` or `INTERNAL`
+    const serviceConfig = {
+      methodConfig: [
+        {
+          name: [
+            {
+              service: 'com.newrelic.trace.v1.IngestService'
+            }
+          ],
+          retryPolicy: {
+            maxAttempts: 10,
+            initialBackoff: '0.1s',
+            maxBackoff: '1s',
+            backoffMultiplier: 2,
+            retryableStatusCodes: ['UNAVAILABLE', 'INTERNAL']
+          }
+        }
+      ]
+    }
+    opts['grpc.service_config'] = JSON.stringify(serviceConfig)
+
     return new traceApi.IngestService(endpoint, credentials, opts)
   }
 }

package/lib/instrumentation/@azure/functions.js

@@ -0,0 +1,311 @@
+/*
+ * Copyright 2025 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+
+const defaultLogger = require('../../logger').child({ component: 'azure-functions' })
+const urltils = require('../../util/urltils')
+const headerProcessing = require('../../header-processing')
+const synthetics = require('../../synthetics')
+
+const backgroundRecorder = require('../../metrics/recorders/other.js')
+const recordWeb = require('../../metrics/recorders/http')
+
+const {
+  DESTINATIONS: DESTS,
+  TYPES
+} = require('../../transaction/index.js')
+
+const {
+  WEBSITE_OWNER_NAME,
+  WEBSITE_RESOURCE_GROUP,
+  WEBSITE_SITE_NAME
+} = process.env
+const SUBSCRIPTION_ID = WEBSITE_OWNER_NAME?.split('+').shift()
+const RESOURCE_GROUP_NAME = WEBSITE_RESOURCE_GROUP ?? WEBSITE_OWNER_NAME?.split('+').pop().split('-Linux').shift()
+const AZURE_FUNCTION_APP_NAME = WEBSITE_SITE_NAME
+
+let coldStart = true
+let _agent
+let _logger
+
+module.exports = function initialize(agent, azureFunctions, _moduleName, shim, { logger = defaultLogger } = {}) {
+  _agent = agent
+  _logger = logger
+  if (!SUBSCRIPTION_ID || !RESOURCE_GROUP_NAME || !AZURE_FUNCTION_APP_NAME) {
+    logger.warn(
+      {
+        data: {
+          expectedVars: ['WEBSITE_OWNER_NAME', 'WEBSITE_RESOURCE_GROUP', 'WEBSITE_SITE_NAME'],
+          found: { WEBSITE_OWNER_NAME, WEBSITE_RESOURCE_GROUP, WEBSITE_SITE_NAME }
+        },
+      },
+      'could not initialize azure functions instrumentation due to missing environment variables'
+    )
+    return
+  }
+
+  const httpMethods = ['http', 'get', 'put', 'post', 'patch', 'deleteRequest']
+  shim.wrap(azureFunctions.app, httpMethods, wrapAzureHttpMethods)
+
+  const backgroundMethods = [
+    'cosmosDB',
+    'eventGrid',
+    'eventHub',
+    'mySql',
+    'serviceBusQueue',
+    'serviceBusTopic',
+    'sql',
+    'storageBlob',
+    'storageQueue',
+    'timer',
+    'warmup',
+    'webPubSub'
+  ]
+  shim.wrap(azureFunctions.app, backgroundMethods, wrapAzureBackgroundMethods)
+}
+
+function wrapAzureHttpMethods(shim, appMethod) {
+  return async function wrappedAzureHttpMethod(...args) {
+    // If the app doesn't need an options object, the user can pass the
+    // handler function as the second argument
+    // (e.g. `app.get('name', handler)`).
+    // See https://learn.microsoft.com/en-us/azure/azure-functions/functions-reference-node?tabs=javascript%2Cwindows%2Cazure-cli&pivots=nodejs-model-v4#registering-a-function
+    let handler
+    if (typeof args[1] === 'function') {
+      handler = args[1]
+      args[1] = { handler }
+    } else {
+      handler = args[1].handler
+    }
+
+    const tracer = shim.tracer
+    args[1].handler = tracer.transactionProxy(async function wrappedHandler(...args) {
+      const [request, context] = args
+      const ctx = tracer.getContext()
+      const tx = tracer.getTransaction()
+
+      // Set the transaction name according to our spec (category + function name).
+      tx.setPartialName(`AzureFunction/${context.functionName}`)
+
+      const url = new URL(request.url)
+      const segment = tracer.createSegment({
+        name: request.url,
+        recorder: recordWeb,
+        parent: ctx.segment,
+        transaction: tx
+      })
+      segment.start()
+
+      const transport = url.protocol === 'https:' ? 'HTTPS' : 'HTTP'
+      tx.type = TYPES.WEB
+      tx.baseSegment = segment
+      tx.parsedUrl = url
+      tx.url = urltils.obfuscatePath(_agent.config, url.pathname)
+      tx.verb = request.method
+      if (url.port === '') {
+        tx.port = transport === 'HTTPS' ? '443' : '80'
+      } else {
+        tx.port = url.port
+      }
+
+      tx.trace.attributes.addAttribute(
+        DESTS.TRANS_EVENT | DESTS.ERROR_EVENT,
+        'request.uri',
+        tx.url
+      )
+      segment.addSpanAttribute('request.uri', tx.url)
+      if (request.method != null) {
+        segment.addSpanAttribute('request.method', request.method)
+      }
+      addAttributes({ transaction: tx, functionContext: context })
+
+      const queueTimeStamp = headerProcessing.getQueueTime(_logger, request.headers)
+      if (queueTimeStamp) {
+        tx.queueTime = Date.now() - queueTimeStamp
+      }
+
+      synthetics.assignHeadersToTransaction(_agent.config, tx, request.headers)
+      if (_agent.config.distributed_tracing.enabled === true) {
+        tx.acceptDistributedTraceHeaders(transport, request.headers)
+      }
+
+      const newContext = ctx.enterSegment({ segment })
+      const boundHandler = tracer.bindFunction(handler, newContext)
+
+      const result = await boundHandler(...args)
+      // Responses should have a shape as described at:
+      // https://learn.microsoft.com/en-us/azure/azure-functions/functions-reference-node?tabs=javascript%2Cwindows%2Cazure-cli&pivots=nodejs-model-v4#http-response
+      if (result.status) {
+        tx.trace.attributes.addAttribute(
+          DESTS.TRANS_COMMON,
+          'http.statusCode',
+          result.status
+        )
+      }
+
+      if (coldStart === true) {
+        tx.trace.attributes.addAttribute(DESTS.TRANS_COMMON, 'faas.coldStart', true)
+        coldStart = false
+      }
+
+      tx.end()
+      return result
+    })
+
+    await appMethod(...args)
+  }
+}
+
+function wrapAzureBackgroundMethods(shim, appMethod) {
+  return async function wrappedAzureBackgroundMethod(...args) {
+    let handler
+    if (typeof args[1] === 'function') {
+      handler = args[1]
+      args[1] = { handler }
+    } else {
+      handler = args[1].handler
+    }
+
+    const tracer = shim.tracer
+    args[1].handler = tracer.transactionProxy(async function wrappedHandler(...args) {
+      const [, context] = args
+      const ctx = tracer.getContext()
+      const tx = tracer.getTransaction()
+
+      tx.setPartialName(`AzureFunction/${context.functionName}`)
+
+      const segment = tracer.createSegment({
+        name: `${appMethod}-trigger`,
+        recorder: backgroundRecorder,
+        parent: ctx.segment,
+        transaction: tx
+      })
+      segment.start()
+
+      tx.type = TYPES.BG
+      tx.baseSegment = segment
+      addAttributes({ transaction: tx, functionContext: context })
+
+      const newContext = ctx.enterSegment({ segment })
+      const boundHandler = tracer.bindFunction(handler, newContext)
+
+      const result = await boundHandler(...args)
+      if (coldStart === true) {
+        tx.trace.attributes.addAttribute(DESTS.TRANS_COMMON, 'faas.coldStart', true)
+        coldStart = false
+      }
+
+      tx.end()
+      return result
+    })
+
+    await appMethod(...args)
+  }
+}
+
+/**
+ * Add required New Relic attributes to the transaction.
+ *
+ * @param {object} params Function parameters.
+ * @param {Transaction} params.transaction The transaction to update.
+ * @param {object} params.functionContext The function invocation context
+ * provided by the Azure functions runtime.
+ */
+function addAttributes({ transaction, functionContext }) {
+  transaction.trace.attributes.addAttribute(
+    DESTS.TRANS_COMMON,
+    'faas.invocation_id',
+    functionContext.invocationId ?? 'unknown'
+  )
+  transaction.trace.attributes.addAttribute(
+    DESTS.TRANS_COMMON,
+    'faas.name',
+    functionContext.functionName ?? 'unknown'
+  )
+  transaction.trace.attributes.addAttribute(
+    DESTS.TRANS_COMMON,
+    'faas.trigger',
+    mapTriggerType({ functionContext })
+  )
+  transaction.trace.attributes.addAttribute(
+    DESTS.TRANS_COMMON,
+    'cloud.resource_id',
+    buildCloudResourceId({ functionContext })
+  )
+}
+
+/**
+ * Inspects the provided function invocation context and returns a recognized
+ * trigger type suitable for sending to the collector as `faas.trigger`.
+ *
+ * @param {object} params Function parameters
+ * @param {object} params.functionContext The function context as provided by
+ * the Azure functions runtime.
+ *
+ * @returns {string} A string appropriate for New Relic.
+ */
+function mapTriggerType({ functionContext }) {
+  const input = functionContext.options?.trigger?.type
+
+  // Input types are found at:
+  // https://github.com/Azure/azure-functions-nodejs-library/blob/138c021/src/trigger.ts
+  // https://learn.microsoft.com/en-us/azure/azure-functions/functions-triggers-bindings?tabs=isolated-process%2Cnode-v4%2Cpython-v2&pivots=programming-language-javascript#supported-bindings
+  switch (input) {
+    case 'httpTrigger': {
+      return 'http'
+    }
+
+    case 'timerTrigger': {
+      return 'timer'
+    }
+
+    case 'blobTrigger':
+    case 'cosmosDBTrigger':
+    case 'daprBindingTrigger':
+    case 'mysqlTrigger':
+    case 'queueTrigger':
+    case 'sqlTrigger': {
+      return 'datasource'
+    }
+
+    case 'daprTopicTrigger':
+    case 'eventGridTrigger':
+    case 'eventHubTrigger':
+    case 'kafkaTrigger':
+    case 'rabbitMQTrigger':
+    case 'redisListTrigger':
+    case 'redisPubSubTrigger':
+    case 'redisStreamTrigger':
+    case 'serviceBusTrigger':
+    case 'signalRTrigger':
+    case 'webPubSubTrigger': {
+      return 'pubsub'
+    }
+
+    default: {
+      return 'other'
+    }
+  }
+}
+
+function buildCloudResourceId({ functionContext }) {
+  return [
+    '/subscriptions/',
+    SUBSCRIPTION_ID,
+    '/resourceGroups/',
+    RESOURCE_GROUP_NAME,
+    '/providers/Microsoft.Web/sites/',
+    AZURE_FUNCTION_APP_NAME,
+    '/functions/',
+    functionContext.functionName
+  ].join('')
+}
+
+module.exports.internals = {
+  addAttributes,
+  mapTriggerType,
+  buildCloudResourceId
+}

package/lib/instrumentations.js

@@ -10,6 +10,7 @@ const InstrumentationDescriptor = require('./instrumentation-descriptor')
 // Return a new copy of this array every time we're called
 module.exports = function instrumentations() {
   return {
+    '@azure/functions': { type: InstrumentationDescriptor.TYPE_GENERIC },
     '@elastic/elasticsearch': { type: InstrumentationDescriptor.TYPE_DATASTORE },
     '@opensearch-project/opensearch': { type: InstrumentationDescriptor.TYPE_DATASTORE },
     '@grpc/grpc-js': { module: './instrumentation/grpc-js' },