refactor: Added @smithy/smithy-client send subscriber with AWS Bedrock Middleware

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

@@ -10,12 +10,10 @@ const { snsMiddlewareConfig } = require('./sns')
 const { sqsMiddlewareConfig } = require('./sqs')
 const { dynamoMiddlewareConfig } = require('./dynamodb')
 const { lambdaMiddlewareConfig } = require('./lambda')
-const { bedrockMiddlewareConfig } = require('./bedrock')
 const MIDDLEWARE = Symbol('nrMiddleware')
 
 const middlewareByClient = {
   Client: middlewareConfig,
-  BedrockRuntime: [...middlewareConfig, bedrockMiddlewareConfig],
   Lambda: [...middlewareConfig, lambdaMiddlewareConfig],
   SNS: [...middlewareConfig, snsMiddlewareConfig],
   SQS: [...middlewareConfig, sqsMiddlewareConfig],
@@ -31,13 +29,23 @@ module.exports = function instrumentSmithyClient(shim, smithyClientExport) {
   }
 }
 
+// Clients handled by subscriber-based instrumentation in
+// lib/subscribers/smithy-client/send.js. Skip them here to avoid
+// double middleware registration during the migration.
+const subscriberHandledClients = new Set(['BedrockRuntime'])
+
 function wrapSend(shim, send) {
   return function wrappedSend() {
     // most clients we want to instrument aside from smithy-client
     // extend themselves to provide different names(i.e. - SNS and SNSClient)
     // we want to handle these the same by registering the sns middleware
     const client = this.constructor.name.replace(/Client$/, '')
     shim.logger.trace('Sending with client %s', client)
+
+    if (subscriberHandledClients.has(client)) {
+      return send.apply(this, arguments)
+    }
+
     const config = this.config
     const middlewares = middlewareByClient[client] || middlewareByClient.Client
 

lib/subscriber-configs.js

@@ -9,6 +9,7 @@
 // 'package-name': [ { path: 'subscriberPath', instrumentations: [] }, ... ]
 const subscribers = {
   ...require('./subscribers/amqplib/config'),
+  ...require('./subscribers/aws-sdk/config'),
   ...require('./subscribers/bluebird/config'),
   ...require('./subscribers/bunyan/config'),
   ...require('./subscribers/cassandra-driver/config'),

lib/subscribers/aws-sdk/config.js

@@ -0,0 +1,55 @@
+/*
+ * Copyright 2026 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+const sendConfig = {
+  path: './aws-sdk/send.js',
+  instrumentations: [
+    // CJS
+    {
+      channelName: 'nr_send',
+      module: { name: '@smithy/smithy-client', versionRange: '>=4.0.0', filePath: 'dist-cjs/index.js' },
+      functionQuery: {
+        className: 'Client',
+        methodName: 'send',
+        kind: 'Sync'
+      }
+    },
+    {
+      channelName: 'nr_send',
+      module: { name: '@smithy/smithy-client', versionRange: '>=1.0.0 <4.0.0', filePath: 'dist-cjs/index.js' },
+      functionQuery: {
+        className: '_Client',
+        methodName: 'send',
+        kind: 'Sync'
+      }
+    },
+    // ESM
+    {
+      channelName: 'nr_send',
+      module: { name: '@smithy/smithy-client', versionRange: '>=4.0.0', filePath: 'dist-es/index.js' },
+      functionQuery: {
+        className: 'Client',
+        methodName: 'send',
+        kind: 'Sync'
+      }
+    },
+    {
+      channelName: 'nr_send',
+      module: { name: '@smithy/smithy-client', versionRange: '>=1.0.0 <4.0.0', filePath: 'dist-es/index.js' },
+      functionQuery: {
+        className: '_Client',
+        methodName: 'send',
+        kind: 'Sync'
+      }
+    }
+  ]
+}
+
+module.exports = {
+  '@smithy/smithy-client':
+    [
+      sendConfig
+    ]
+}