Fix organization

Author: amychisholm03

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'),
@@ -33,7 +34,6 @@ 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/when/config'),
   ...require('./subscribers/winston/config')

lib/subscribers/smithy-client/config.js lib/subscribers/aws-sdk/config.jslib/subscribers/smithy-client/config.js renamed to lib/subscribers/aws-sdk/config.js

@@ -4,7 +4,7 @@
  */
 
 const sendConfig = {
-  path: './smithy-client/send.js',
+  path: './aws-sdk/send.js',
   instrumentations: [
     // CJS
     {

…rs/aws-sdk-v3/converse-stream-handler.js …eware/bedrock/converse-stream-handler.jslib/subscribers/aws-sdk-v3/converse-stream-handler.js renamed to lib/subscribers/aws-sdk/middleware/bedrock/converse-stream-handler.js lib/subscribers/aws-sdk-v3/converse-stream-handler.js renamed to lib/subscribers/aws-sdk/middleware/bedrock/converse-stream-handler.js

@@ -339,9 +339,9 @@ function bedrockMiddleware(subscriber, clientConfig, next, context) {
 
 /**
  * Bedrock middleware config following the same pattern as the old
- * bedrockMiddlewareConfig from lib/instrumentation/aws-sdk/v3/bedrock.js.
+ * `bedrockMiddlewareConfig` from `lib/instrumentation/aws-sdk/v3/bedrock.js`.
  *
- * The `init` function is called by SmithyClientSendSubscriber to determine
+ * The `init` function is called by `SmithyClientSendSubscriber` to determine
  * if the middleware should be registered. The `middleware` function is the
  * actual middleware added to the AWS client's middleware stack.
  */

lib/subscribers/aws-sdk-v3/bedrock.js …bers/aws-sdk/middleware/bedrock/index.jslib/subscribers/aws-sdk-v3/bedrock.js renamed to lib/subscribers/aws-sdk/middleware/bedrock/index.js lib/subscribers/aws-sdk-v3/bedrock.js renamed to lib/subscribers/aws-sdk/middleware/bedrock/index.js

@@ -5,7 +5,7 @@
 'use strict'
 
 const Subscriber = require('../base')
-const bedrockMiddlewareConfig = require('../aws-sdk-v3/bedrock')
+const bedrockMiddlewareConfig = require('./middleware/bedrock')
 
 const UNKNOWN = 'Unknown'
 const MIDDLEWARE = Symbol('nrMiddleware')
@@ -15,6 +15,17 @@ const middlewareByClient = {
   BedrockRuntime: [bedrockMiddlewareConfig]
 }
 
+/**
+ * Subscriber for `@smithy/smithy-client` `Client.send()` calls. Registers
+ * common AWS middleware (DT header suppression, response attributes) and
+ * dispatches service-specific middleware via the `middlewareByClient` map.
+ *
+ * Only clients listed in `middlewareByClient` are handled here; all others
+ * fall through to the existing shim-based instrumentation. This eliminates
+ * the need for separate subscriber configs per AWS service package — a single
+ * hook on `Client.send` covers every service, since all AWS SDK v3 clients
+ * extend `@smithy/smithy-client.Client`.
+ */
 module.exports = class SmithyClientSendSubscriber extends Subscriber {
   constructor({ agent, logger }) {
     super({ agent, logger, channelName: 'nr_send', packageName: '@smithy/smithy-client' })

…subscribers/aws-sdk-v3/stream-handler.js …sdk/middleware/bedrock/stream-handler.jslib/subscribers/aws-sdk-v3/stream-handler.js renamed to lib/subscribers/aws-sdk/middleware/bedrock/stream-handler.js lib/subscribers/aws-sdk-v3/stream-handler.js renamed to lib/subscribers/aws-sdk/middleware/bedrock/stream-handler.js

@@ -7,7 +7,7 @@
 
 const test = require('node:test')
 const assert = require('node:assert')
-const ConverseStreamHandler = require('#agentlib/subscribers/aws-sdk-v3/converse-stream-handler.js')
+const ConverseStreamHandler = require('#agentlib/subscribers/aws-sdk/middleware/bedrock/converse-stream-handler.js')
 
 test.beforeEach((ctx) => {
   ctx.nr = {}

lib/subscribers/smithy-client/send.js lib/subscribers/aws-sdk/send.jslib/subscribers/smithy-client/send.js renamed to lib/subscribers/aws-sdk/send.js

@@ -11,7 +11,7 @@ const {
   BedrockCommand,
   BedrockResponse,
 } = require('#agentlib/llm-events/aws-bedrock/index.js')
-const StreamHandler = require('#agentlib/subscribers/aws-sdk-v3/stream-handler.js')
+const StreamHandler = require('#agentlib/subscribers/aws-sdk/middleware/bedrock/stream-handler.js')
 
 test.beforeEach((ctx) => {
   ctx.nr = {}