[APM] Immediately return terms for unbound queries

Closes #73787.
elastic · Aug 6, 2020 · fab5944 · fab5944
1 parent 13fd9e3
commit fab5944
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/x-pack/plugins/apm/server/lib/environments/get_all_environments.ts b/x-pack/plugins/apm/server/lib/environments/get_all_environments.ts
@@ -37,6 +37,7 @@ export async function getAllEnvironments({
  ],
  },
  body: {
+ ...(!serviceNameFilter.length ? { timeout: '1ms' } : {}),
  size: 0,
  query: {
  bool: {
@@ -48,6 +49,7 @@ export async function getAllEnvironments({
  terms: {
  field: SERVICE_ENVIRONMENT,
  size: 100,
+ ...(!serviceNameFilter.length ? { min_doc_count: 0 } : {}),
  missing: includeMissing ? ENVIRONMENT_NOT_DEFINED : undefined,
  },
  },
@@ -56,6 +58,7 @@ export async function getAllEnvironments({
  };
 
  const resp = await apmEventClient.search(params);
+
  const environments =
  resp.aggregations?.environments.buckets.map(
  (bucket) => bucket.key as string

diff --git a/x-pack/plugins/apm/server/lib/helpers/create_es_client/call_client_with_debug.ts b/x-pack/plugins/apm/server/lib/helpers/create_es_client/call_client_with_debug.ts
@@ -34,7 +34,7 @@ export async function callClientWithDebug({
  let res: any;
  let esError = null;
  try {
- res = apiCaller(operationName, params);
+ res = await apiCaller(operationName, params);
  } catch (e) {
  // catch error and throw after outputting debug info
  esError = e;

diff --git a/...ck/plugins/apm/server/lib/settings/agent_configuration/__snapshots__/queries.test.ts.snap b/...ck/plugins/apm/server/lib/settings/agent_configuration/__snapshots__/queries.test.ts.snap
diff --git a/x-pack/plugins/apm/server/lib/settings/agent_configuration/get_service_names.ts b/x-pack/plugins/apm/server/lib/settings/agent_configuration/get_service_names.ts
@@ -25,12 +25,14 @@ export async function getServiceNames({ setup }: { setup: Setup }) {
  ],
  },
  body: {
+ timeout: '1ms',
  size: 0,
  aggs: {
  services: {
  terms: {
  field: SERVICE_NAME,
  size: 50,
+ min_doc_count: 0,
  },
  },
  },