[APM] Upgrade ES client #86594
Merged
[APM] Upgrade ES client #86594
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
|
Pinging @elastic/apm-ui (Team:apm) |
02ccf9f to
34ede87
Compare
|
@elasticmachine merge upstream |
dgieselaar
commented
Dec 29, 2020
x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/index.ts
Show resolved
Hide resolved
… upgrade-es-client
smith
approved these changes
Jan 5, 2021
|
|
||
| promise.then( | ||
| () => subscription.unsubscribe(), | ||
| () => subscription.unsubscribe() |
There was a problem hiding this comment.
Why do we do this twice? It looks intentional but a comment explaining would help me understand.
There was a problem hiding this comment.
The second argument to .then() is a failure callback. The difference between .then(onSuccess, onFailure) and .then(onSuccess).catch(onFailure) is that the former calls onFailure only when the original promise is rejected, the second is also called when the onSuccess handler throws. I will add a comment.
There was a problem hiding this comment.
Isn't this what finally is for (available since Node 10).
promise.finally(() => subscription.unsubscribe())There was a problem hiding this comment.
Yes, it's what I used initially but it failed on CI (with the API tests). Admittedly I was too lazy to figure out why that happened 😀 I'll have another look.
There was a problem hiding this comment.
Oh duh I knew that I was just reading it as two chained thens for some reason. Thanks.
There was a problem hiding this comment.
Yeah, .finally() doesn't work on CI: https://kibana-ci.elastic.co/job/elastic+kibana+pipeline-pull-request/99947/execution/node/595/log/
There was a problem hiding this comment.
bummer. Okay, thanks for trying.
| import { contextServiceMock } from 'src/core/server/mocks'; | ||
| import supertest from 'supertest'; | ||
| import { createApmEventClient } from '.'; | ||
| import { createHttpServer } from '../../../../../../../../src/core/server/test_utils'; |
There was a problem hiding this comment.
You don't need a relative path if you're importing from src/core.
| import { createApmEventClient } from '.'; | ||
| import { createHttpServer } from '../../../../../../../../src/core/server/test_utils'; | ||
|
|
||
| describe('create_apm_event_client', () => { |
There was a problem hiding this comment.
I'd name this createApmEventClient after the function, not after the module file name.
| @@ -49,18 +58,32 @@ export function createInternalESClient({ | |||
| >( | |||
| params: TSearchRequest | |||
| ): Promise<ESSearchResponse<TDocument, TSearchRequest>> => { | |||
| return callEs('search', params); | |||
| return callEs({ | |||
| operationName: 'search', | |||
There was a problem hiding this comment.
Are these values defined as constants anywhere? It's clear as-is, but just wondering.
There was a problem hiding this comment.
No, it's used for logging only as well, the actual ES client call is separate from it.
sorenlouv
reviewed
Jan 6, 2021
| request.route.path | ||
| }`; | ||
|
|
||
| const { title, body } = getMessage(); |
There was a problem hiding this comment.
Nit: for clarity
Suggested change
| const { title, body } = getMessage(); | |
| const { title, body } = getDebugMessage(); |
sorenlouv
reviewed
Jan 6, 2021
Comment on lines
62
to
71
| export const getSearchDebugBody = (params: Record<string, any>) => | ||
| `GET ${params.index}/_search\n${formatObj(params.body)}`; | ||
|
|
||
| export const getDefaultDebugBody = ( | ||
| params: Record<string, any>, | ||
| operationName: string | ||
| ) => | ||
| `${chalk.bold('ES operation:')} ${operationName}\n${chalk.bold( | ||
| 'ES query:' | ||
| )}\n${formatObj(params)}`; |
There was a problem hiding this comment.
nit: perhaps a co-locating the debug message in a single function will make it easier to understand when one is used over the other:
Suggested change
| export const getSearchDebugBody = (params: Record<string, any>) => | |
| `GET ${params.index}/_search\n${formatObj(params.body)}`; | |
| export const getDefaultDebugBody = ( | |
| params: Record<string, any>, | |
| operationName: string | |
| ) => | |
| `${chalk.bold('ES operation:')} ${operationName}\n${chalk.bold( | |
| 'ES query:' | |
| )}\n${formatObj(params)}`; | |
| export const getDebugBody = ( | |
| params: Record<string, any>, | |
| operationName: string | |
| ) => { | |
| if (operationName === 'search') { | |
| return `GET ${params.index}/_search\n${formatObj(params.body)}`; | |
| } | |
| // message for all but 'search' operatins | |
| return `${chalk.bold('ES operation:')} ${operationName}\n${chalk.bold( | |
| 'ES query:' | |
| )}\n${formatObj(params)}`; | |
| } |
sorenlouv
approved these changes
Jan 6, 2021
|
@elasticmachine merge upstream |
… upgrade-es-client
💛 Build succeeded, but was flaky
Test FailuresX-Pack Saved Object Tagging Functional Tests.x-pack/test/saved_object_tagging/functional/tests/maps_integration·ts.saved objects tagging - functional tests maps integration creating "before each" hook for "allows to select tags for a new map"Standard OutStack TraceMetrics [docs]Async chunks
History
To update your PR or re-run it, just comment with: |
dgieselaar
added a commit
to dgieselaar/kibana
that referenced
this pull request
Jan 27, 2021
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
jloleysens
added a commit
to jloleysens/kibana
that referenced
this pull request
Jan 27, 2021
…y-tests * 'master' of github.com:elastic/kibana: (276 commits) [Telemetry] Settings Collector: redact sensitive reported values (elastic#88675) [CI] Combines Jest test jobs (elastic#85850) [Upgrade Assistant] Migrate server to new es-js client (elastic#89207) Migrate maps_legacy, maps_oss, region_map, and tile_map plugions to TS projects (elastic#89351) [Vega Docs] Add experimental flag on the vega maps title (elastic#89402) Increase the time needed to locate the save viz toast (elastic#89301) [Enterprise Search] Add links to doc links service (elastic#89260) Fixed regex bug in Safari (elastic#89399) [Lens] Fix indexpattern checks for missing references (elastic#88840) [Lens] Clean up usage collector (elastic#89109) update apm index pattern (elastic#89395) [APM] Upgrade ES client (elastic#86594) Enable v2 so migrations, disable in FTR tests (elastic#89297) [Search Sessions] Make search session indicator UI opt-in, refactor per-app capabilities (elastic#88699) Cleanup OSS code from visualizations wizard (elastic#89092) [APM] Optimize API test order (elastic#88654) Rename conversion function, extract to module scope and add tests. (elastic#89018) [core.logging] Add ops logs to the KP logging system (elastic#88070) chore(NA): improve ts build refs performance on kbn bootstrap (elastic#89333) skip flaky suite (elastic#89379) ... # Conflicts: # x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/timeline/timeline.tsx # x-pack/test/accessibility/config.ts
gmmorris
added a commit
to gmmorris/kibana
that referenced
this pull request
Jan 27, 2021
…ana into task-manager/shift-on-trend * 'task-manager/shift-on-trend' of github.com:gmmorris/kibana: (74 commits) [Metrics UI] Fix Host Overview boxes in Host Detail page (elastic#89299) [Telemetry] Settings Collector: redact sensitive reported values (elastic#88675) [CI] Combines Jest test jobs (elastic#85850) [Upgrade Assistant] Migrate server to new es-js client (elastic#89207) Migrate maps_legacy, maps_oss, region_map, and tile_map plugions to TS projects (elastic#89351) [Vega Docs] Add experimental flag on the vega maps title (elastic#89402) Increase the time needed to locate the save viz toast (elastic#89301) [Enterprise Search] Add links to doc links service (elastic#89260) Fixed regex bug in Safari (elastic#89399) [Lens] Fix indexpattern checks for missing references (elastic#88840) [Lens] Clean up usage collector (elastic#89109) update apm index pattern (elastic#89395) [APM] Upgrade ES client (elastic#86594) Enable v2 so migrations, disable in FTR tests (elastic#89297) [Search Sessions] Make search session indicator UI opt-in, refactor per-app capabilities (elastic#88699) Cleanup OSS code from visualizations wizard (elastic#89092) [APM] Optimize API test order (elastic#88654) Rename conversion function, extract to module scope and add tests. (elastic#89018) [core.logging] Add ops logs to the KP logging system (elastic#88070) chore(NA): improve ts build refs performance on kbn bootstrap (elastic#89333) ...
dgieselaar
added a commit
that referenced
this pull request
Jan 28, 2021
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 #83913.
Update: I'm going to remove the auto-instrumentation of ES calls and handle instrumentation separately.
Update #2: I've also added some information about the underlying ES error if there is one:I'm still displaying it as a 500 because that is what it is to the user. There is more information, but I want to be cautious about displaying too much information here.Removed the Elasticsearch error message, as we are hiding the error from the logger/APM agent and core had some security concerns.