@smithy/smithy-client send subscriber with AWS Bedrock Middleware integration

Author: amychisholm03

lib/instrumentation/aws-sdk/v3/bedrock.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/instrumentation/aws-sdk/v3/smithy-client.js

@@ -33,6 +33,7 @@ const subscribers = {
   ...require('./subscribers/q/config'),
   ...require('./subscribers/redis/config'),
   ...require('./subscribers/redis-client/config'),
+  ...require('./subscribers/smithy-client/config'),
   ...require('./subscribers/undici/config'),
   ...require('./subscribers/winston/config')
 }