-
Notifications
You must be signed in to change notification settings - Fork 7
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.
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
Patch aws-lambda instrumentation to support ESM #101
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mxiamxia
force-pushed
the
lambda-esm
branch
3 times, most recently
from
October 10, 2024 04:26
adb8ed0
to
faaee6b
Compare
jj22ee
reviewed
Oct 10, 2024
aws-distro-opentelemetry-node-autoinstrumentation/src/patches/aws/services/aws-lambda.ts
Show resolved
Hide resolved
aws-distro-opentelemetry-node-autoinstrumentation/src/patches/aws/services/aws-lambda.ts
Outdated
Show resolved
Hide resolved
aws-distro-opentelemetry-node-autoinstrumentation/test/patches/aws/services/aws-lambda.test.ts
Show resolved
Hide resolved
aws-distro-opentelemetry-node-autoinstrumentation/test/patches/aws/services/aws-lambda.test.ts
Outdated
Show resolved
Hide resolved
commit d25c3c3 Author: Min Xia <xiami@amazon.com> Date: Tue Oct 8 15:45:36 2024 -0700 fix the lint error
jj22ee
approved these changes
Oct 11, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TY! 🚢
Great to have some ESM support for OTel in Lambda!
pxaws
reviewed
Oct 11, 2024
aws-distro-opentelemetry-node-autoinstrumentation/src/patches/aws/services/aws-lambda.ts
Show resolved
Hide resolved
pxaws
reviewed
Oct 11, 2024
aws-distro-opentelemetry-node-autoinstrumentation/src/patches/aws/services/aws-lambda.ts
Show resolved
Hide resolved
pxaws
approved these changes
Oct 11, 2024
mxiamxia
added a commit
that referenced
this pull request
Oct 11, 2024
*Issue #, if available:* *Description of changes:* Follow changes on #101. Instead of using a `otel-instrument-esm` wrapper which is redudent, we will have customer to use `HANDLER_IS_ESM` env var to enforce ESM instrumentation for the failed to detected cases. By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes:
IS_ESM
check inotel_instrument
wrapper before calling lambda handler. If it is EMS format, add ESM node-options supported by OTel community. Added a new wrapper scriptotel_instrument_esm
if the esm auto detection logic is failed, customer can opt-in to tell tell layer go with ESM instrumentation path.HANDLER_IS_ESM
for lambda function when ESM is detectedIS_ESM
env var is set, apply ESM supportedInstrumentationNodeModuleDefinition
to patch function handler, otherwise keep using the existing handler patcher.Note: this change add a new branch for supporting ESM, the existing CommonJS path should not be impacted.
Test
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.