add guards for execution_hint

Signed-off-by: Shenoy Pratik <[email protected]>
ps48 · Sep 20, 2024 · 0ba456b · 0ba456b
1 parent 15d3840
commit 0ba456b
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 12 deletions.
diff --git a/public/components/trace_analytics/components/traces/traces_content.tsx b/public/components/trace_analytics/components/traces/traces_content.tsx
@@ -4,6 +4,7 @@
  */
 /* eslint-disable react-hooks/exhaustive-deps */
 
+import datemath from '@elastic/datemath';
 import {
  EuiAccordion,
  EuiFlexGroup,
@@ -154,6 +155,7 @@ export function TracesContent(props: TracesProps) {
  processTimeStamp(endTime, mode),
  page
  );
+ const isUnderOneHour = datemath.parse(endTime)?.diff(datemath.parse(startTime), 'hours')! < 1;
 
  if (mode === 'custom_data_prepper') {
  // service map should not be filtered by service name
@@ -172,7 +174,8 @@ export function TracesContent(props: TracesProps) {
  mode,
  props.dataSourceMDSId[0].id,
  sort,
- tracesTableMode
+ tracesTableMode,
+ isUnderOneHour
  );
  else {
  await handleTracesRequest(
@@ -183,7 +186,8 @@ export function TracesContent(props: TracesProps) {
  setTableItems,
  mode,
  props.dataSourceMDSId[0].id,
- sort
+ sort,
+ isUnderOneHour
  );
  }
  await handleServiceMapRequest(
@@ -204,7 +208,8 @@ export function TracesContent(props: TracesProps) {
  setTableItems,
  mode,
  props.dataSourceMDSId[0].id,
- sort
+ sort,
+ isUnderOneHour
  );
  }
 

diff --git a/public/components/trace_analytics/requests/queries/traces_queries.ts b/public/components/trace_analytics/requests/queries/traces_queries.ts
@@ -50,7 +50,8 @@ export const getTraceGroupPercentilesQuery = () => {
 export const getTracesQuery = (
  mode: TraceAnalyticsMode,
  traceId: string = '',
- sort?: PropertySort
+ sort?: PropertySort,
+ isUnderOneHour?: boolean
 ) => {
  const field = sort?.field || '_key';
  const direction = sort?.direction || 'asc';
@@ -72,7 +73,7 @@ export const getTracesQuery = (
  order: {
  [field]: direction,
  },
- execution_hint: 'map',
+ ...(isUnderOneHour && { execution_hint: 'map' }),
  },
  aggs: {
  latency: {
@@ -139,7 +140,7 @@ export const getTracesQuery = (
  order: {
  [field]: direction,
  },
- execution_hint: 'map',
+ ...(isUnderOneHour && { execution_hint: 'map' }),
  },
  aggs: {
  latency: {
@@ -472,7 +473,8 @@ export const getCustomIndicesTracesQuery = (
  mode: TraceAnalyticsMode,
  traceId: string = '',
  sort?: PropertySort,
- queryMode?: TraceQueryMode
+ queryMode?: TraceQueryMode,
+ isUnderOneHour?: boolean
 ) => {
  const jaegerQuery: any = {
  size: 0,
@@ -492,7 +494,7 @@ export const getCustomIndicesTracesQuery = (
  order: {
  [sort?.field || '_key']: sort?.direction || 'asc',
  },
- execution_hint: 'map',
+ ...(isUnderOneHour && { execution_hint: 'map' }),
  },
  aggs: {
  latency: {

diff --git a/public/components/trace_analytics/requests/traces_request_handler.ts b/public/components/trace_analytics/requests/traces_request_handler.ts
@@ -37,12 +37,13 @@ export const handleCustomIndicesTracesRequest = async (
  mode: TraceAnalyticsMode,
  dataSourceMDSId?: string,
  sort?: PropertySort,
- queryMode?: TraceQueryMode
+ queryMode?: TraceQueryMode,
+ isUnderOneHour?: boolean
 ) => {
  const responsePromise = handleDslRequest(
  http,
  DSL,
- getCustomIndicesTracesQuery(mode, undefined, sort, queryMode),
+ getCustomIndicesTracesQuery(mode, undefined, sort, queryMode, isUnderOneHour),
  mode,
  dataSourceMDSId
  );
@@ -90,7 +91,8 @@ export const handleTracesRequest = async (
  setItems: (items: any) => void,
  mode: TraceAnalyticsMode,
  dataSourceMDSId?: string,
- sort?: PropertySort
+ sort?: PropertySort,
+ isUnderOneHour?: boolean
 ) => {
  const binarySearch = (arr: number[], target: number) => {
  if (!arr) return Number.NaN;
@@ -108,7 +110,7 @@ export const handleTracesRequest = async (
  const responsePromise = handleDslRequest(
  http,
  DSL,
- getTracesQuery(mode, undefined, sort),
+ getTracesQuery(mode, undefined, sort, isUnderOneHour),
  mode,
  dataSourceMDSId
  );