fix: @aws-sdk/client-s3 instrumentation was broken with 3.363.0 release

In aws/aws-sdk-js-v3#4873 aws-sdk v3 moved
@aws-sdk/smithy-client to @smithy/smithy-client. This will now
instrument either package name.

Fixes: #3454

lib/instrumentation/index.js

@@ -37,7 +37,7 @@ const nodeHasInstrumentableFetch = typeof (global.fetch) === 'function'
 
 var MODULES = [
  '@apollo/server',
- '@aws-sdk/smithy-client', // Instrument the base client which all AWS-SDK v3 clients extends
+ ['@aws-sdk/smithy-client', '@smithy/smithy-client'], // Instrument the base client which all AWS-SDK v3 clients extends.
  ['@elastic/elasticsearch', '@elastic/elasticsearch-canary'],
  '@opentelemetry/api',
  '@opentelemetry/sdk-metrics',
@@ -430,7 +430,7 @@ Instrumentation.prototype._patchModule = function (modExports, name, version, en
  continue
  }
 
- modExports = patch(modExports, this._agent, { version, enabled, isImportMod })
+ modExports = patch(modExports, this._agent, { name, version, enabled, isImportMod })
  }
  }
  return modExports

lib/instrumentation/modules/@aws-sdk/smithy-client.js

@@ -5,6 +5,7 @@
  */
 
 'use strict'
+
 const semver = require('semver')
 const shimmer = require('../../shimmer')
 const elasticAPMMiddlewares = Symbol('elasticAPMMiddlewares')
@@ -57,11 +58,15 @@ const clientsConfig = {
  }
 }
 
-module.exports = function (mod, agent, { version, enabled }) {
+module.exports = function (mod, agent, { name, version, enabled }) {
  if (!enabled) return mod
 
- // We have to do this check since npm view reveals RC versions below 3
- if (!semver.satisfies(version, '>=3 <4')) {
+ // As of `@aws-sdk/*@3.363.0` the underlying smithy-client is under the
+ // `@smithy/` npm org and is 1.x.
+ if (name === '@smithy/smithy-client' && !semver.satisfies(version, '>=1 <2')) {
+ agent.logger.debug('cannot instrument @aws-sdk/client-*: @smithy/smithy-client version %s not supported', version)
+ return mod
+ } else if (name === '@aws-sdk/smithy-client' && !semver.satisfies(version, '>=3 <4')) {
  agent.logger.debug('cannot instrument @aws-sdk/client-*: @aws-sdk/smithy-client version %s not supported', version)
  return mod
  }