add event.ingested to APM events #3279
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## master #3279 +/- ##
=======================================
Coverage 79.48% 79.48%
=======================================
Files 107 107
Lines 5607 5607
=======================================
Hits 4457 4457
Misses 1150 1150 |
simitt
reviewed
Feb 4, 2020
simitt
approved these changes
Feb 4, 2020
graphaelli
commented
Feb 4, 2020
tests/system/test_integration.py
Outdated
| @@ -69,6 +69,11 @@ def test_load_docs_with_template_and_add_transaction(self): | |||
| # compare existing ES documents for transactions with new ones | |||
| rs = self.es.search(index=index_transaction) | |||
There was a problem hiding this comment.
looks like we can change these to wait_for_events and consolidate the event.ingested munging
so they do not match @timestamp exactly
simitt
reviewed
Feb 5, 2020
| @@ -31,6 +31,9 @@ | |||
| "us": 1494342245999000 | |||
| }, | |||
| "@timestamp": "2017-05-09T15:04:05.999Z", | |||
| "event": { | |||
| "ingested": "2017-05-09T15:04:05.998Z" | |||
There was a problem hiding this comment.
The timestamps look odd - have you set them once manually? (They should be some date yesterday)
There was a problem hiding this comment.
Good eye - yes, I set them manually
simitt
reviewed
Feb 5, 2020
| rs = self.es.search(index=index_transaction) | ||
| assert rs['hits']['total']['value'] == 4, "found {} documents".format(rs['count']) | ||
| self.approve_docs('transaction', rs['hits']['hits']) | ||
| transaction_docs = self.wait_for_events('transaction', 4, index=index_transaction) |
|
does this need a backport? |
|
yes please! |
jalvz
pushed a commit
to jalvz/apm-server
that referenced
this pull request
Mar 11, 2020
jalvz
pushed a commit
to jalvz/apm-server
that referenced
this pull request
Mar 11, 2020
jalvz
pushed a commit
to jalvz/apm-server
that referenced
this pull request
Mar 11, 2020
jalvz
pushed a commit
to jalvz/apm-server
that referenced
this pull request
Mar 11, 2020
jalvz
pushed a commit
to jalvz/apm-server
that referenced
this pull request
Mar 11, 2020
jalvz
pushed a commit
to jalvz/apm-server
that referenced
this pull request
Mar 12, 2020
jalvz
added a commit
that referenced
this pull request
Mar 12, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
closes #2934