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.

Sign up for GitHub

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

[APM] Service Map: Not Defined option doesn't work properly #77757

Merged
merged 17 commits into from
Sep 30, 2020
Merged

[APM] Service Map: Not Defined option doesn't work properly #77757

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
6b50584
Service Map: option doesn't work properly
cauemarcondes Sep 17, 2020
b71b2d6
addressing PR comment
cauemarcondes Sep 17, 2020
12dc643
addressing PR comment
cauemarcondes Sep 18, 2020
00ef666
Merge branch 'master' into apm-servicemaps-env-not-defined
elasticmachine Sep 21, 2020
26ae62b
adding unit tests
cauemarcondes Sep 21, 2020
a5d026e
addressing PR comment
cauemarcondes Sep 22, 2020
d025d3f
Merge branch 'master' into apm-servicemaps-env-not-defined
elasticmachine Sep 23, 2020
cf0e543
fixing tests
cauemarcondes Sep 23, 2020
5898f94
Merge branch 'master' into apm-servicemaps-env-not-defined
elasticmachine Sep 28, 2020
46be5c4
addressing PR comment
cauemarcondes Sep 28, 2020
dc2e588
addressing PR comment
cauemarcondes Sep 28, 2020
3c93f7f
addressing PR comment
cauemarcondes Sep 28, 2020
e7d9da2
addressing PR comment
cauemarcondes Sep 29, 2020
76e0c76
addressing PR comment
cauemarcondes Sep 29, 2020
db3ab30
add filter by environment
cauemarcondes Sep 29, 2020
54bb62a
addressing PR comment
cauemarcondes Sep 29, 2020
c261094
fixing API tests
cauemarcondes Sep 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
222 changes: 0 additions & 222 deletions ...gins/apm/server/lib/service_map/__snapshots__/get_service_map_from_trace_ids.test.ts.snap
View file
Open in desktop

This file was deleted.

23 changes: 15 additions & 8 deletions x-pack/plugins/apm/server/lib/service_map/get_service_map.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { getServicesProjection } from '../../projections/services';
import { mergeProjection } from '../../projections/util/merge_projection';
import { PromiseReturnType } from '../../../typings/common';
import { Setup, SetupTimeRange } from '../helpers/setup_request';
import { getEnvironmentUiFilterES } from '../helpers/convert_ui_filters/get_environment_ui_filter_es';
import { transformServiceMapResponses } from './transform_service_map_responses';
import { getServiceMapFromTraceIds } from './get_service_map_from_trace_ids';
import { getTraceSampleIds } from './get_trace_sample_ids';
Expand Down Expand Up @@ -85,21 +86,27 @@ async function getServicesData(options: IEnvOptions) {
searchAggregatedTransactions,
});

const { filter } = projection.body.query.bool;
let { filter } = projection.body.query.bool;

if (options.serviceName) {
filter = filter.concat({
term: {
[SERVICE_NAME]: options.serviceName,
},
});
}

if (options.environment) {
filter = filter.concat(getEnvironmentUiFilterES(options.environment));
}
Comment on lines +89 to +101
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@elastic/apm-ui this fixes the issue described here


const params = mergeProjection(projection, {
body: {
size: 0,
query: {
bool: {
...projection.body.query.bool,
filter: options.serviceName
? filter.concat({
term: {
[SERVICE_NAME]: options.serviceName,
},
})
: filter,
filter,
},
},
aggs: {
Expand Down
Loading