Traces jaeger

opensearch_dashboards.json

@@ -1,7 +1,7 @@
 {
   "id": "observabilityDashboards",
   "version": "2.5.0.0",
-  "opensearchDashboardsVersion": "2.5.0",
+  "opensearchDashboardsVersion": "2.4.2",
   "server": true,
   "ui": true,
   "requiredPlugins": [

public/components/trace_analytics/components/dashboard/dashboard.tsx

@@ -12,6 +12,12 @@ import { DataSourcePicker } from './mode_picker';
 export interface DashboardProps extends TraceAnalyticsComponentDeps {
   childBreadcrumbs: EuiBreadcrumb[];
   page: 'dashboard' | 'app';
+  setToast?: (
+    title: string,
+    color?: string,
+    text?: React.ReactChild | undefined,
+    side?: string | undefined
+  ) => void;
 }
 
 export function Dashboard(props: DashboardProps) {

public/components/trace_analytics/components/dashboard/dashboard_content.tsx

@@ -53,6 +53,7 @@ export function DashboardContent(props: DashboardProps) {
     mode,
     dataPrepperIndicesExist,
     jaegerIndicesExist,
+    setToast,
   } = props;
   const [tableItems, setTableItems] = useState([]);
   const [jaegerTableItems, setJaegerTableItems] = useState([]);
@@ -83,14 +84,21 @@ export function DashboardContent(props: DashboardProps) {
   useEffect(() => {
     let newFilteredService = '';
     for (const filter of filters) {
-      if (filter.field === 'serviceName') {
-        newFilteredService = filter.value;
-        break;
+      if (mode === 'data_prepper') { 
+        if (filter.field === 'serviceName') {
+          newFilteredService = filter.value;
+          break;
+        }
+      } else if (mode === 'jaeger') {
+        if (filter.field === 'process.serviceName') {
+          newFilteredService = filter.value;
+          break;
+        }
       }
     }
     setFilteredService(newFilteredService);
     if (!redirect && ((mode === 'data_prepper' && dataPrepperIndicesExist) || (mode === 'jaeger' && jaegerIndicesExist))) refresh(newFilteredService);
-  }, [filters, startTime, endTime, appConfigs]);
+  }, [filters, startTime, endTime, redirect, mode, dataPrepperIndicesExist, jaegerIndicesExist]);
 
   const refresh = async (currService?: string) => {
     setLoading(true);
@@ -135,8 +143,9 @@ export function DashboardContent(props: DashboardProps) {
         tableItems,
         setJaegerTableItems,
         mode,
+        setToast!,
         setPercentileMap
-      ).then(() => setLoading(false));
+      ).finally(() => setLoading(false))
       handleJaegerErrorDashboardRequest(
         http,
         DSL,
@@ -146,7 +155,7 @@ export function DashboardContent(props: DashboardProps) {
         setJaegerErrorTableItems,
         mode,
         setPercentileMap
-      ).then(() => setLoading(false));
+      ).finally(() => setLoading(false));
     } else if (mode === 'data_prepper') {
       handleDashboardRequest(
         http,

public/components/trace_analytics/home.tsx

@@ -3,7 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React, { useEffect, useState } from 'react';
+import { EuiGlobalToastList } from '@elastic/eui';
+import { Toast } from '@elastic/eui/src/components/toast/global_toast_list';
+import React, { ReactChild, useEffect, useState } from 'react';
 import { Route, RouteComponentProps } from 'react-router-dom';
 import {
   ChromeBreadcrumb,
@@ -71,12 +73,19 @@ export const Home = (props: HomeProps) => {
     setEndTime(newEndTime);
     sessionStorage.setItem('TraceAnalyticsEndTime', newEndTime);
   };
+  const [toasts, setToasts] = useState<Toast[]>([]);
+
+  const setToast = (title: string, color = 'success', text?: ReactChild, side?: string) => {
+    if (!text) text = '';
+    setToasts([...toasts, { id: new Date().toISOString(), title, text, color } as Toast]);
+  };
 
   useEffect(() => {
     handleDataPrepperIndicesExistRequest(props.http, setDataPrepperIndicesExist)
     handleJaegerIndicesExistRequest(props.http, setJaegerIndicesExist);
   }, []);
 
+
   const modes = [
     { id: 'jaeger', title: 'Jaeger' },
     { id: 'data_prepper', title: 'Data Prepper' },
@@ -153,12 +162,19 @@ export const Home = (props: HomeProps) => {
 
   return (
     <>
+      <EuiGlobalToastList
+          toasts={toasts}
+          dismissToast={(removedToast) => {
+            setToasts(toasts.filter((toast) => toast.id !== removedToast.id));
+          }}
+          toastLifeTimeMs={6000}
+      />
       <Route
         exact
         path={['/trace_analytics', '/trace_analytics/home']}
         render={(routerProps) => (
           <ObservabilitySideBar>
-            <Dashboard page="dashboard" childBreadcrumbs={dashboardBreadcrumbs} {...commonProps} />
+            <Dashboard page="dashboard" childBreadcrumbs={dashboardBreadcrumbs} {...commonProps} setToast={setToast} />
           </ObservabilitySideBar>
         )}
       />

public/components/trace_analytics/requests/dashboard_request_handler.ts

@@ -134,9 +134,10 @@ export const handleJaegerDashboardRequest = async (
   items,
   setItems,
   mode,
+  setToast,
   setPercentileMap?
 ) => {
-  const latencyTrends = await handleDslRequest(http, latencyTrendDSL, getJaegerLatencyTrendQuery(), mode)
+  const latencyTrends = await handleDslRequest(http, latencyTrendDSL, getJaegerLatencyTrendQuery(), mode, true)
     .then((response) => {
       const map: any = {};
       response.aggregations.trace_group_name.buckets.map((bucket) => {
@@ -189,7 +190,12 @@ export const handleJaegerDashboardRequest = async (
       });
       return map;
     })
-    .catch((error) => console.error(error));
+    .catch((error) => {
+      console.log("error here")
+      console.error(error)
+
+      setToast('hello')
+    });
 
   await handleDslRequest(http, DSL, getJaegerDashboardQuery(), mode)
     .then((response) => {

public/components/trace_analytics/requests/request_handler.ts

@@ -14,7 +14,7 @@ import {
 } from '../../../../common/constants/trace_analytics';
 import { TraceAnalyticsMode } from '../home';
 
-export function handleDslRequest(http: CoreStart['http'], DSL: any, bodyQuery: any, mode: TraceAnalyticsMode) {
+export function handleDslRequest(http: CoreStart['http'], DSL: any, bodyQuery: any, mode: TraceAnalyticsMode, timeout: boolean = false) {
   if (DSL?.query) {
     bodyQuery.query.bool.must.push(...DSL.query.bool.must);
     bodyQuery.query.bool.filter.push(...DSL.query.bool.filter);
@@ -27,6 +27,24 @@ export function handleDslRequest(http: CoreStart['http'], DSL: any, bodyQuery: a
   if (!bodyQuery.index) {
     body = {...bodyQuery, index: ((mode === 'jaeger' ? JAEGER_INDEX_NAME : DATA_PREPPER_INDEX_NAME)) }
   }
+  if (mode === 'jaeger' && timeout) {
+    const controller = new AbortController();
+    const id = setTimeout(() => controller.abort(), 20000);
+    return http
+      .post(TRACE_ANALYTICS_DSL_ROUTE, {
+        body: JSON.stringify(body),
+        signal: controller.signal
+      }).then((res) => {
+        clearTimeout(id);
+        return res;
+      })
+      .catch((error) => {
+        console.log(error)
+        clearTimeout(id)
+      })
+      .finally(() => clearTimeout(id));
+  }
+
   return http
     .post(TRACE_ANALYTICS_DSL_ROUTE, {
       body: JSON.stringify(body),