[uptime/usage-collector] add missing await#66079
Merged
spalger merged 5 commits intoelastic:masterfrom May 12, 2020
Merged
Conversation
Contributor
|
Pinging @elastic/uptime (Team:uptime) |
…ait-query-in-usage-collector
spalger
commented
May 11, 2020
Comment on lines
+9
to
+11
| jest | ||
| .spyOn(KibanaTelemetryAdapter, 'countNoOfUniqueMonitorAndLocations') | ||
| .mockResolvedValue(undefined as any); |
Contributor
Author
There was a problem hiding this comment.
@elastic/uptime This is necessary to get the tests passing because the error thrown by this method no longer is ignored. I'm assuming we want to write tests for this method, but I'm not familiar enough to fix it in this little path. Could someone from the uptime team make sure I'm not making things worse with this mock?
Contributor
There was a problem hiding this comment.
I'm OK with merging this so long as tests are passing for now since it seems to affect CI stability. We'll make sure that the tests are fixed if need be.
Contributor
Author
|
@elasticmachine merge upstream |
Contributor
Author
|
@elasticmachine merge upstream |
Contributor
💚 Build SucceededHistory
To update your PR or re-run it, just comment with: |
spalger
pushed a commit
to spalger/kibana
that referenced
this pull request
May 12, 2020
This was referenced May 12, 2020
spalger
pushed a commit
to spalger/kibana
that referenced
this pull request
May 12, 2020
spalger
pushed a commit
that referenced
this pull request
May 13, 2020
spalger
pushed a commit
that referenced
this pull request
May 13, 2020
v1v
added a commit
to v1v/kibana
that referenced
this pull request
May 13, 2020
* upstream/master: (223 commits) [Ingest] Support root level yaml variables in agent stream template (elastic#66120) [Snapshot Restore] Fix error when deleting snapshots behind reverse proxy (elastic#66147) [Lens] fix empty state for pie (elastic#66206) [APM] Improve e2e tests (elastic#66373) [ML] Data Frame Analytics: Fix steps to be named phases. (elastic#65855) [Discover] Encode context link filter part (elastic#63831) [APM] Scope APM alert creation to environment (elastic#65681) Move Kibana Usage collectors outside the telemetry plugin (elastic#65663) [ML] Data Frame Analytics: Fix confusion matrix data grid width. (elastic#65818) Switch to core application service (elastic#63443) Removes use of prefer_v2_templates (elastic#66316) [Maps] handle case where fit to bounds does not match any documents (elastic#66307) log error instead of throw (elastic#66254) [plugin-helpers] remove outdated postinstall task (elastic#66324) Spaces - migrate default space and enter space view to KP (elastic#66098) [APM] Change plugin id for `apm_oss` to `apmOss` (elastic#66164) [Maps] convert map_selectors to TS (elastic#65905) [uptime/usage-collector] add missing await (elastic#66079) [Ingest] Add additional attributes to the Datasources Saved Object (elastic#66127) [Endpoint]EMT-339: add new policy response schema (elastic#66264) ...
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Fixes: #65232
This method is called when usage is collected, and when an error occurs the error is unhandled, triggering a process shutdown. Instead, the error should be handled by actually awaiting the query.