diff --git a/.tav.yml b/.tav.yml index 1098cec29d..fcca1426fa 100644 --- a/.tav.yml +++ b/.tav.yml @@ -467,14 +467,20 @@ aws-sdk: - node test/instrumentation/modules/aws-sdk/dynamodb.test.js '@aws-sdk/client-s3': - versions: - # - 3.377.0 was a bad release (https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1828#issuecomment-1834276719) - mode: max-7 - include: '>=3.15.0 <4' - exclude: '3.377.0' - commands: - - node test/instrumentation/modules/@aws-sdk/client-s3.test.js - node: '>=14' + - versions: + # - 3.377.0 was a bad release (https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1828#issuecomment-1834276719) + mode: max-5 + include: '>=3.15.0 <3.723.0' + exclude: '3.377.0' + node: '>=14' + commands: + - node test/instrumentation/modules/@aws-sdk/client-s3.test.js + - versions: + mode: max-5 + include: '>=3.723.0 <4' + node: '>=18' + commands: + - node test/instrumentation/modules/@aws-sdk/client-s3.test.js '@aws-sdk/client-dynamodb': versions: @@ -485,20 +491,32 @@ aws-sdk: node: '>=14' '@aws-sdk/client-sns': - versions: - mode: max-7 - include: '>=3.15.0 <4' - commands: - - node test/instrumentation/modules/@aws-sdk/client-sns.test.js - node: '>=14' + - versions: + mode: max-7 + include: '>=3.15.0 <3.723.0' + node: '>=14' + commands: + - node test/instrumentation/modules/@aws-sdk/client-sns.test.js + - versions: + mode: max-5 + include: '>=3.723.0 <4' + node: '>=18' + commands: + - node test/instrumentation/modules/@aws-sdk/client-sns.test.js '@aws-sdk/client-sqs': - versions: - mode: max-7 - include: '>=3.15.0 <4' - commands: - - node test/instrumentation/modules/@aws-sdk/client-sqs.test.js - node: '>=14' + - versions: + mode: max-7 + include: '>=3.15.0 <3.723.0' + node: '>=14' + commands: + - node test/instrumentation/modules/@aws-sdk/client-sqs.test.js + - versions: + mode: max-5 + include: '>=3.723.0 <4' + node: '>=18' + commands: + - node test/instrumentation/modules/@aws-sdk/client-sqs.test.js # - undici@4.7.0 added its diagnostics_channel support. # - In undici@4.7.1 the `request.origin` property was added, which we need diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 93a5792dad..3eff56acc0 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -33,6 +33,24 @@ Notes: See the <> guide. +==== Unreleased + +[float] +===== Breaking changes + +[float] +===== Features + +[float] +===== Bug fixes + +* Fix instrumentation of `@aws-sdk/client-s3`, `@aws-sdk/client-sqs`, and + `@aws-sdk/client-sns` for versions 3.723.0 and later. (Internally the AWS SDK + clients updated to `@smithy/smithy-client@4`.) + +[float] +===== Chores + [[release-notes-4.10.0]] ==== 4.10.0 - 2024/12/24 diff --git a/lib/instrumentation/modules/@smithy/smithy-client.js b/lib/instrumentation/modules/@smithy/smithy-client.js index e20eb767c6..fb128e53a9 100644 --- a/lib/instrumentation/modules/@smithy/smithy-client.js +++ b/lib/instrumentation/modules/@smithy/smithy-client.js @@ -110,7 +110,7 @@ module.exports = function (mod, agent, { name, version, enabled }) { // `@smithy/` npm org. if ( name === '@smithy/smithy-client' && - !semver.satisfies(version, '>=1 <4') + !semver.satisfies(version, '>=1 <5') ) { agent.logger.debug( 'cannot instrument @aws-sdk/client-*: @smithy/smithy-client version %s not supported',