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

[6.5] [APM] Hoist loading of waterfall and flatten it (#24651) #24968

Merged
merged 1 commit into from
Nov 1, 2018

Conversation

sorenlouv
Copy link
Member

Backports the following commits to 6.5:

@elasticmachine
Copy link
Contributor

💚 Build Succeeded

* [APM] Hoist loading of waterfall and flatten it

Remove unused test

Convert to typescript

* Address feedback

* Make `totalDuration` optional

* Renamed rootTransaction to traceRoot

* [APM] Only show relevant service legends

* Adds services label to the service legend

* [APM] Clock skew fix

Only skew child spans from the same service

Take parent skew into account when finding diff

# Conflicts:
#	x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/Waterfall/waterfall_helpers/__snapshots__/waterfall_helpers.test.ts.snap
#	x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.test.ts
#	x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.ts

* Use switch statement
@sorenlouv sorenlouv force-pushed the backport/6.5/pr-24651 branch from 3a11e92 to 6f1110d Compare November 1, 2018 12:48
@elasticmachine
Copy link
Contributor

💚 Build Succeeded

@sorenlouv sorenlouv merged commit c71ae78 into elastic:6.5 Nov 1, 2018
@sorenlouv sorenlouv deleted the backport/6.5/pr-24651 branch November 1, 2018 15:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants