Skip to content

Conversation

@smith
Copy link
Contributor

@smith smith commented Nov 11, 2020

Backports the following commits to 7.x:

...and into x-pack.

Also remove `PromiseReturnType` from APM and use the copy in observability everywhere.

All of the additional changes to APM imports are just automatic sorting.

This makes doing elastic#77720 a little easier and removes some implicit circular dependencies for elastic#80508.

Co-authored-by: Dario Gieselaar <[email protected]>
# Conflicts:
#	x-pack/plugins/apm/public/utils/testHelpers.tsx
@smith smith added the backport This PR is a backport of another PR label Nov 11, 2020
@smith
Copy link
Contributor Author

smith commented Nov 12, 2020

@elasticmachine run the e2e

@smith
Copy link
Contributor Author

smith commented Nov 12, 2020

retest

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

Distributable file count

id before after diff
default 43130 43128 -2

History

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

@smith smith merged commit fabfc54 into elastic:7.x Nov 12, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport This PR is a backport of another PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants