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.

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

Bump elastic-apm-node from v3.10.0 to v3.14.0 #97509

Merged
merged 4 commits into from
Apr 28, 2021

Conversation

trentm
Copy link
Member

@trentm trentm commented Apr 19, 2021

Summary

Bumps the version of the elastic-apm-node dep used for self-APM of Kibana.

Changelog: https://www.elastic.co/guide/en/apm/agent/nodejs/current/release-notes-3.x.html
Notably:

  • Adds apm.addMetadataFilter(fn) that can be used for PII filtering
  • Improves communication with APM server to not be pathological if APM
    server is down for extended period of time and load is high.
  • Fixes bugs in data for the Dependencies and Service Map in the APM
    app.
  • The APM agent now collects cloud metadata.

For maintainers

/cc @joshdover @tylersmalley This adds the feature requested in elastic/apm-agent-nodejs#1916 so that metadata could now be filtered for PII there. I don't know if there is any urgency there (e.g. to try to get it in before 7.13 FF).

Changelog: https://www.elastic.co/guide/en/apm/agent/nodejs/current/release-notes-3.x.html
Notably:
- Adds apm.addMetadataFilter(fn) that can be used for PII filtering
- Improves communication with APM server to not be pathological if APM
  server is down for extended period of time and load is high.
- Fixes bugs in data for the Dependencies and Service Map in the APM
  app.
- The APM agent now collects cloud metadata.
@trentm
Copy link
Member Author

trentm commented Apr 21, 2021

@elasticmachine merge upstream

@trentm
Copy link
Member Author

trentm commented Apr 23, 2021

@elasticmachine merge upstream

@trentm
Copy link
Member Author

trentm commented Apr 27, 2021

@elasticmachine merge upstream

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

cc @trentm

Copy link
Contributor

@mshustov mshustov left a comment

Choose a reason for hiding this comment

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

Adds apm.addMetadataFilter(fn) that can be used for PII filtering

According to https://www.elastic.co/guide/en/apm/server/current/metadata-api.html#metadata-schema
Metadata includes user and account data from now on. Are they always collected? If so, the Kibana Core team has to address it in a follow-up PR.

@mshustov mshustov added the Team:Core Core services & architecture: plugins, logging, config, saved objects, http, ES client, i18n, etc label Apr 28, 2021
@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-core (Team:Core)

@joshdover
Copy link
Contributor

@kobelb Do you think we could consider backporting this to the 7.13 branch as a bug fix? It addresses some performance issues that we'd like to see fixed for rolling this instrumentation out more widely.

@kobelb
Copy link
Contributor

kobelb commented Apr 28, 2021

@kobelb Do you think we could consider backporting this to the 7.13 branch as a bug fix? It addresses some performance issues that we'd like to see fixed for rolling this instrumentation out more widely.

If it's a safe bugfix, backport away :)

@trentm trentm added auto-backport Deprecated - use backport:version if exact versions are needed v7.13.1 labels Apr 28, 2021
@trentm trentm merged commit 22b32c2 into elastic:master Apr 28, 2021
@kibanamachine
Copy link
Contributor

💔 Backport failed

Status Branch Result
7.13 Commit could not be cherrypicked due to conflicts
7.x Commit could not be cherrypicked due to conflicts

To backport manually run:
node scripts/backport --pr 97509

trentm added a commit to trentm/kibana that referenced this pull request Apr 28, 2021
Changelog: https://www.elastic.co/guide/en/apm/agent/nodejs/current/release-notes-3.x.html
Notably:
- Adds apm.addMetadataFilter(fn) that can be used for PII filtering
- Improves communication with APM server to not be pathological if APM
  server is down for extended period of time and load is high.
- Fixes bugs in data for the Dependencies and Service Map in the APM
  app.
- The APM agent now collects cloud metadata.

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
# Conflicts:
#	yarn.lock
trentm added a commit that referenced this pull request Apr 29, 2021
Changelog: https://www.elastic.co/guide/en/apm/agent/nodejs/current/release-notes-3.x.html
Notably:
- Adds apm.addMetadataFilter(fn) that can be used for PII filtering
- Improves communication with APM server to not be pathological if APM
  server is down for extended period of time and load is high.
- Fixes bugs in data for the Dependencies and Service Map in the APM
  app.
- The APM agent now collects cloud metadata.

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
# Conflicts:
#	yarn.lock
trentm added a commit that referenced this pull request Apr 29, 2021
Changelog: https://www.elastic.co/guide/en/apm/agent/nodejs/current/release-notes-3.x.html
Notably:
- Adds apm.addMetadataFilter(fn) that can be used for PII filtering
- Improves communication with APM server to not be pathological if APM
  server is down for extended period of time and load is high.
- Fixes bugs in data for the Dependencies and Service Map in the APM
  app.
- The APM agent now collects cloud metadata.

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
# Conflicts:
#	yarn.lock

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
@trentm
Copy link
Member Author

trentm commented Apr 29, 2021

Metadata includes user and account data from now on. Are they always collected? If so, the Kibana Core team has to address it in a follow-up PR.

Currently the Node.js APM agent:

This version of the agent added addMetadataFilter() because of @dover's request at elastic/apm-agent-nodejs#1916

So, yes, there should be a PR to filter:

  • metadata.cloud.account (or turn off metadata.cloud.* collection entirely)
  • metadata.user (in case a future node.js apm agent version adds collection of that)
  • metadata.process.{args,title}

@trentm trentm deleted the bump-apm-agent-to-3.14 branch April 29, 2021 15:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto-backport Deprecated - use backport:version if exact versions are needed release_note:skip Skip the PR/issue when compiling release notes Team:Core Core services & architecture: plugins, logging, config, saved objects, http, ES client, i18n, etc v7.13.1 v7.14.0 v8.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants