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.x] multiple backports #1067

Merged
merged 15 commits into from
Jul 4, 2018
Merged

[6.x] multiple backports #1067

merged 15 commits into from
Jul 4, 2018

Conversation

simitt
Copy link
Contributor

@simitt simitt commented Jul 4, 2018

This backports following commits:

Copy link
Contributor

@jalvz jalvz left a comment

Choose a reason for hiding this comment

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

guess that #1061 wasn't even necessary.

probably ok now, but in the future maybe we should update docs copied from beats from the release branch itself in the same way as update, instead of just backporting.

@simitt
Copy link
Contributor Author

simitt commented Jul 4, 2018

That's a good point @jalvz. I suggest to merge this in and then do a make update-docs as a separate update.

graphaelli and others added 15 commits July 4, 2018 11:09
* add trailing newline to approvals

* add trailing newline to elasticsearch docs
* store navigationTiming marks as scaled floats

* test that navigationTiming marks are the only ones impacted
* benchmark each phase of request processing

* remove now redundant benchmarks

BenchmarkEventFileLoadingOnce in the processor/error panics anyway

* cache sourcemap fetch when benchmarking
* don't panic if expected error isn't there

* remove superfluous max length directive

error.transaction.id already must be a UUID with a specific length requirement.
Remove dependency to archived `github.com/fatih/set`.
Add simple `Set` implementation instead.
* Fix bugs uncovered with improved tests
* Do automatic validation for keyword limitations
* Remove files for invalid payloads, instead
  create invalid payloads out of valid payload
* Allow to define simple and conditional rules for testing payloads.
* Add context.http.url to spans.

implements elastic#777
@simitt simitt force-pushed the 6.x-multiple-backports branch from d87130d to cb99414 Compare July 4, 2018 09:09
@simitt
Copy link
Contributor Author

simitt commented Jul 4, 2018

I had to rebase onto elastic/6.x again, as something has been merge to 6.x in the mean time.

@simitt simitt merged commit cb9bb39 into elastic:6.x Jul 4, 2018
@simitt simitt deleted the 6.x-multiple-backports branch July 10, 2018 13:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants