From 96eca3ce7dfc01f7d56d7bcbb51c8cb896167f8c Mon Sep 17 00:00:00 2001 From: Trent Mick Date: Tue, 21 May 2024 12:16:11 -0700 Subject: [PATCH 1/3] fix: patch @smithy/smithy-client@3 for release @aws-sdk/client-* releases Recently @aws-sdk/client-* releases started using v3 of smithy/smithy-client. This updates our instr to allow patching v3. --- CHANGELOG.asciidoc | 19 +++++++++++++++++++ .../modules/@smithy/smithy-client.js | 4 ++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 040814c4d0..efdf1f7c1d 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -33,6 +33,25 @@ Notes: See the <> guide. +==== Unreleased + +[float] +===== Breaking changes + +[float] +===== Features + +[float] +===== Bug fixes + +* Fix instrumentation for recent `@aws-sdk/client-*` releases that use + `@smithy/smithy-client` v3. (For example `@aws-sdk/client-s3@3.575.0` released + 2024-05-13 updated to smithy-client v3.) The APM agent had been limiting + patching of `@smithy/smithy-client` to `>=1 <3`. + +[float] +===== Chores + [[release-notes-4.5.4]] ==== 4.5.4 - 2024/05/13 diff --git a/lib/instrumentation/modules/@smithy/smithy-client.js b/lib/instrumentation/modules/@smithy/smithy-client.js index e54b868600..e20eb767c6 100644 --- a/lib/instrumentation/modules/@smithy/smithy-client.js +++ b/lib/instrumentation/modules/@smithy/smithy-client.js @@ -107,10 +107,10 @@ module.exports = function (mod, agent, { name, version, enabled }) { if (!enabled) return mod; // As of `@aws-sdk/*@3.363.0` the underlying smithy-client is under the - // `@smithy/` npm org and is 1.x. + // `@smithy/` npm org. if ( name === '@smithy/smithy-client' && - !semver.satisfies(version, '>=1 <3') + !semver.satisfies(version, '>=1 <4') ) { agent.logger.debug( 'cannot instrument @aws-sdk/client-*: @smithy/smithy-client version %s not supported', From 1aaebb68c42fa3721b62a387106a75fee33b7d7f Mon Sep 17 00:00:00 2001 From: Trent Mick Date: Thu, 23 May 2024 16:50:05 -0700 Subject: [PATCH 2/3] changelog tweak --- CHANGELOG.asciidoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index efdf1f7c1d..65d4a5565c 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -46,8 +46,8 @@ See the <> guide. * Fix instrumentation for recent `@aws-sdk/client-*` releases that use `@smithy/smithy-client` v3. (For example `@aws-sdk/client-s3@3.575.0` released - 2024-05-13 updated to smithy-client v3.) The APM agent had been limiting - patching of `@smithy/smithy-client` to `>=1 <3`. + 2024-05-13 updated to smithy-client v3.) Before this change the APM agent had + been limiting patching of `@smithy/smithy-client` to `>=1 <3`. [float] ===== Chores From e9bf823ba520287df60cd46b1c948509b76fb746 Mon Sep 17 00:00:00 2001 From: Trent Mick Date: Tue, 28 May 2024 09:08:11 -0700 Subject: [PATCH 3/3] changelog space tweak post-merge --- CHANGELOG.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 4d3c973c40..b6acc77975 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -49,6 +49,7 @@ See the <> guide. `@smithy/smithy-client` v3. (For example `@aws-sdk/client-s3@3.575.0` released 2024-05-13 updated to smithy-client v3.) Before this change the APM agent had been limiting patching of `@smithy/smithy-client` to `>=1 <3`. + * Mark the published AWS Lambda layers as supporting the "nodejs20.x" Lambda Runtime (`--compatible-runtimes`). The "nodejs20.x" runtime was released by AWS on 2023-11-15. ({issues}4033[#4033])