Skip to content

[Metrics UI] Fix asynchronicity and error handling in Snapshot API #70503

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

Merged
Zacqary merged 2 commits into from
Jul 1, 2020
Merged

[Metrics UI] Fix asynchronicity and error handling in Snapshot API #70503

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6419d95
[Metrics UI] Fix asynchronicity and error handling in Snapshot API
Zacqary Jul 1, 2020
09b6866
Merge branch 'master' into 69323-snapshot-crashfix
elasticmachine Jul 1, 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
30 changes: 17 additions & 13 deletions x-pack/plugins/infra/server/lib/snapshot/snapshot.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,13 @@ export class InfraSnapshot {
// when they have both been completed.
const timeRangeWithIntervalApplied = await createTimeRangeWithInterval(client, options);
const optionsWithTimerange = { ...options, timerange: timeRangeWithIntervalApplied };

const groupedNodesPromise = requestGroupedNodes(client, optionsWithTimerange);
const nodeMetricsPromise = requestNodeMetrics(client, optionsWithTimerange);

const groupedNodeBuckets = await groupedNodesPromise;
const nodeMetricBuckets = await nodeMetricsPromise;

const [groupedNodeBuckets, nodeMetricBuckets] = await Promise.all([
groupedNodesPromise,
nodeMetricsPromise,
]);
return {
nodes: mergeNodeBuckets(groupedNodeBuckets, nodeMetricBuckets, options),
interval: timeRangeWithIntervalApplied.interval,
Expand Down Expand Up @@ -103,11 +104,12 @@ const requestGroupedNodes = async (
},
},
};

return await getAllCompositeData<
InfraSnapshotAggregationResponse,
InfraSnapshotNodeGroupByBucket
>(callClusterFactory(client), query, bucketSelector, handleAfterKey);
return getAllCompositeData<InfraSnapshotAggregationResponse, InfraSnapshotNodeGroupByBucket>(
callClusterFactory(client),
query,
bucketSelector,
handleAfterKey
);
};

const calculateIndexPatterBasedOnMetrics = (options: InfraSnapshotRequestOptions) => {
Expand Down Expand Up @@ -161,10 +163,12 @@ const requestNodeMetrics = async (
},
},
};
return await getAllCompositeData<
InfraSnapshotAggregationResponse,
InfraSnapshotNodeMetricsBucket
>(callClusterFactory(client), query, bucketSelector, handleAfterKey);
return getAllCompositeData<InfraSnapshotAggregationResponse, InfraSnapshotNodeMetricsBucket>(
callClusterFactory(client),
query,
bucketSelector,
handleAfterKey
);
};

// buckets can be InfraSnapshotNodeGroupByBucket[] or InfraSnapshotNodeMetricsBucket[]
Expand Down