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

feat: Azure Functions #3071

Merged
merged 50 commits into from
Jan 16, 2023
Merged

feat: Azure Functions #3071

merged 50 commits into from
Jan 16, 2023

Conversation

trentm
Copy link
Member

@trentm trentm commented Dec 13, 2022 •
edited
Loading

Spec: elastic/apm#716
Closes: #3015

Checklist

@trentm
feat: Azure Functions
338b9a5 
This first commit is just a start at working on require-in-the-middle
(pulling it in locally for now to work on it, before upstreaming).
@trentm
ritm and azure-functions-nodejs-worker module instr to get first basi…
97f0040 
…c auto-instrumentation of Azure Functions working
@trentm trentm self-assigned this Dec 13, 2022
@github-actions github-actions bot added the agent-nodejs Make available for APM Agents project planning. label Dec 13, 2022
@apmmachine
Copy link
Contributor

apmmachine commented Dec 13, 2022 •
edited
Loading

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2023-01-16T22:13:14.229+0000

  • Duration: 23 min 15 sec

Test stats 🧪

Test Results
Failed 0
Passed 321750
Skipped 0
Total 321750

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • run module tests for <modules> : Run TAV tests for one or more modules, where <modules> can be either a comma separated list of modules (e.g. memcached,redis) or the string literal ALL to test all modules

  • run benchmark tests : Run the benchmark test only.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

trentm added a commit to elastic/apm-nodejs-http-client that referenced this pull request Dec 15, 2022
@trentm
feat: add 'extraMetadata' config option
7b1cb50 
This is a way to provide additional metadata that is merged into the
metadata object created from the other individual config options. This
is similar to `expectExtraMetadata: true` && `setExtraMetadata(...)`,
but is a way to provide the metadata *synchronously*.

Refs: elastic/apm-agent-nodejs#3071
@trentm trentm mentioned this pull request Dec 15, 2022
Merged
trentm added a commit to elastic/apm-nodejs-http-client that referenced this pull request Dec 16, 2022
@trentm
feat: add 'extraMetadata' config option (#192)
36fd3ba 
This is a way to provide additional metadata that is merged into the
metadata object created from the other individual config options. This
is similar to `expectExtraMetadata: true` && `setExtraMetadata(...)`,
but is a way to provide the metadata *synchronously*.

Refs: elastic/apm-agent-nodejs#3071
@trentm trentm mentioned this pull request Dec 19, 2022
Closed
@trentm trentm marked this pull request as ready for review January 12, 2023 01:35
@trentm trentm mentioned this pull request Jan 12, 2023
Merged
6 tasks
@trentm
Copy link
Member Author

trentm commented Jan 12, 2023

I'll open an issue on Azure/azure-functions-nodejs-worker later asking about this and whether NODE_OPTIONS can get passed through to the workers on process start. However, for now we will have to resort to user code changes to enable Azure Function instrumentation.

I'm not bothering for now. An argument for this would be if one could add instrumentation to an Azure Function purely with config changes. However, given Azure Functions don't have an equivalent to Lambda "layers" to include the APM agent code itself, there will always be some non-config changes (to include the 'elastic-apm-node' dep). If that requirement is every dropped, then there would be value in supporting NODE_OPTIONS from initial creation of the extra worker processes.

@trentm
Copy link
Member Author

trentm commented Jan 13, 2023

@bmorelli25 Are you able to review the docs I've added? The main added doc page is: https://apm-agent-nodejs_3071.docs-preview.app.elstc.co/guide/en/apm/agent/nodejs/master/azure-functions.html Thanks.

bmorelli25
bmorelli25 reviewed Jan 13, 2023
View reviewed changes
Copy link
Member

@bmorelli25 bmorelli25 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The docs look great! Just a couple suggestions and one question.

docs/azure-functions.asciidoc Outdated Show resolved Hide resolved
docs/azure-functions.asciidoc Outdated Show resolved Hide resolved
docs/azure-functions.asciidoc Show resolved Hide resolved
docs/azure-functions.asciidoc Outdated Show resolved Hide resolved
trentm and others added 4 commits January 13, 2023 13:05
@trentm @bmorelli25
improve language
c118aab 
Co-authored-by: Brandon Morelli <brandon.morelli@elastic.co>
@trentm @bmorelli25
rm errant paren
6f3d663 
Co-authored-by: Brandon Morelli <brandon.morelli@elastic.co>
@trentm
docs: correct which step these are from
b7a5697
@trentm
add missing spec'd metadata.cloud. values; more defensive handling of…
e0f3a15 
… req not being set; remove some unnecessary test code in config.test.js
@trentm trentm merged commit b3cca90 into main Jan 16, 2023
@trentm trentm deleted the trentm/azure-functions branch January 16, 2023 22:39
trentm added a commit that referenced this pull request Jan 16, 2023
@trentm @bmorelli25
feat: Azure Functions (#3071)
513fe37 
Support for tracing/monitoring Azure Functions.
Supported triggers/bindings: HTTP (spec'd), Timer (not spec'd).

Spec: elastic/apm#716
Closes: #3015
Co-authored-by: Brandon Morelli <brandon.morelli@elastic.co>
trentm added a commit that referenced this pull request Jan 17, 2023
@trentm
chore: switch to transaction.type="scheduled" for timer-triggered Azu…
c5e472e 
…re Functions

From "timer". Neither value is in the APM agents shared spec, but
"scheduled" is prior art from some Java instrumentations (e.g. for
Quartz).

Refs: #3071
@trentm trentm mentioned this pull request Jan 17, 2023
Merged
trentm added a commit that referenced this pull request Jan 17, 2023
@trentm
chore: switch to transaction.type="scheduled" for timer-triggered Azu…
f76376c 
…re Functions (#3101)

From "timer". Neither value is in the APM agents shared spec, but
"scheduled" is prior art from some Java instrumentations (e.g. for
Quartz).

Refs: #3071
This was referenced Jan 18, 2023
Closed
Closed
fpm-peter pushed a commit to fpm-git/apm-agent-nodejs that referenced this pull request Aug 20, 2024
@trentm @bmorelli25 @fpm-peter
feat: Azure Functions (elastic#3071)
01d2d8d 
Support for tracing/monitoring Azure Functions.
Supported triggers/bindings: HTTP (spec'd), Timer (not spec'd).

Spec: elastic/apm#716
Closes: elastic#3015
Co-authored-by: Brandon Morelli <brandon.morelli@elastic.co>
fpm-peter pushed a commit to fpm-git/apm-agent-nodejs that referenced this pull request Aug 20, 2024
@trentm @fpm-peter
chore: switch to transaction.type="scheduled" for timer-triggered Azu…
16dec99 
…re Functions (elastic#3101)

From "timer". Neither value is in the APM agents shared spec, but
"scheduled" is prior art from some Java instrumentations (e.g. for
Quartz).

Refs: elastic#3071
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bmorelli25 bmorelli25 bmorelli25 left review comments

Assignees

@trentm trentm

Labels
agent-nodejs Make available for APM Agents project planning.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Support for Azure Functions
3 participants
@trentm @apmmachine @bmorelli25