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

[7.x] [APM] Show errors on the timeline instead of under the transaction (#53756) #54109

Merged
merged 1 commit into from
Jan 7, 2020

Conversation

cauemarcondes
Copy link
Contributor

Backports the following commits to 7.x:

…lastic#53756)

* creating error marker and refactoring some stuff

* styling popover

* adding agent marks and errors to waterfall items

* adding agent marks and errors to waterfall items

* adding agent marks and errors to waterfall items

* fixing tests and typescript checking

* refactoring helper

* changing transaction error badge style

* adding unit test

* fixing agent marker position

* fixing offset when error is registered before its parent

* refactoring error marker

* refactoring error marker

* refactoring error marker

* refactoring error marker

* refactoring error marker

* refactoring waterfall helper

* refactoring waterfall helper

* refactoring waterfall helper api

* refactoring waterfall helper

* removing unused code

* refactoring waterfall helper

* changing unit test

* removing comment

* refactoring marker component and waterfall helper

* removing servicecolor from waterfall item and adding it to errormark

* fixing trace order
@kibanamachine
Copy link
Contributor

💚 Build Succeeded

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

@cauemarcondes cauemarcondes merged commit 892dd5d into elastic:7.x Jan 7, 2020
@cauemarcondes cauemarcondes deleted the backport/7.x/pr-53756 branch January 7, 2020 14:00
jloleysens added a commit to jloleysens/kibana that referenced this pull request Jan 7, 2020
…52893

* '7.x' of github.com:elastic/kibana:
  [Console] Fix OSS build (elastic#53885) (elastic#54094)
  [Console] Console with better SQL support (elastic#51446) (elastic#54091)
  Fix suggested value for time_zone in range query (elastic#53841) (elastic#54092)
  [APM] Show errors on the timeline instead of under the transaction (elastic#53756) (elastic#54109)
  use NP deprecations in uiSettings (elastic#53755) (elastic#54009)
  adding message to transaction and span metadata (elastic#54017) (elastic#54090)

# Conflicts:
#	x-pack/legacy/plugins/console_extensions/spec/overrides/sql.query.json
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