Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: patch @smithy/smithy-client@3 for release @aws-sdk/client-* releases #4036

Merged
merged 4 commits into from
May 31, 2024
Merged

fix: patch @smithy/smithy-client@3 for release @aws-sdk/client-* releases #4036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
96eca3c
fix: patch @smithy/smithy-client@3 for release @aws-sdk/client-* rele…
trentm May 21, 2024
1aaebb6
changelog tweak
trentm May 23, 2024
1cb68d5
Merge branch 'main' into trentm/fix-aws-sdk-smithy-client-v3
trentm May 28, 2024
e9bf823
changelog space tweak post-merge
trentm May 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ See the <<upgrade-to-v4>> guide.
[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.) 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])
Expand Down
4 changes: 2 additions & 2 deletions lib/instrumentation/modules/@smithy/smithy-client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down