From 7ee607871d7e501637f3760fa41c802bffa5eb19 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 19 Feb 2024 23:51:04 +0000 Subject: [PATCH] Fix jaeger spans key names for filtering (#1428) Signed-off-by: Joshua Li (cherry picked from commit 2c1497b0560cfa149017447fe77b521ad68e9897) Signed-off-by: github-actions[bot] --- common/types/trace_analytics.ts | 14 ++++ .../components/traces/flyout_list_item.tsx | 9 ++- .../components/traces/span_detail_flyout.tsx | 72 ++++++++++++++----- .../requests/traces_request_handler.ts | 68 +++++++++++------- 4 files changed, 118 insertions(+), 45 deletions(-) create mode 100644 common/types/trace_analytics.ts diff --git a/common/types/trace_analytics.ts b/common/types/trace_analytics.ts new file mode 100644 index 000000000..65efdd614 --- /dev/null +++ b/common/types/trace_analytics.ts @@ -0,0 +1,14 @@ +/* + * Copyright OpenSearch Contributors + * SPDX-License-Identifier: Apache-2.0 + */ + +export type SpanField = + | 'SPAN_ID' + | 'PARENT_SPAN_ID' + | 'SERVICE' + | 'OPERATION' + | 'DURATION' + | 'START_TIME' + | 'END_TIME' + | 'ERRORS'; diff --git a/public/components/trace_analytics/components/traces/flyout_list_item.tsx b/public/components/trace_analytics/components/traces/flyout_list_item.tsx index 22111c8e5..d30d34315 100644 --- a/public/components/trace_analytics/components/traces/flyout_list_item.tsx +++ b/public/components/trace_analytics/components/traces/flyout_list_item.tsx @@ -17,7 +17,7 @@ import React, { useState } from 'react'; interface FlyoutListItemProps { title: React.ReactNode; description: React.ReactNode; - addSpanFilter: () => void; + addSpanFilter?: () => void; } export function FlyoutListItem(props: FlyoutListItemProps) { @@ -27,12 +27,15 @@ export function FlyoutListItem(props: FlyoutListItemProps) { props.description !== '-' ? ( - + {props.description} - {hover && ( + {hover && props.addSpanFilter && ( > = { + data_prepper: { + SPAN_ID: 'spanId', + PARENT_SPAN_ID: 'parentSpanId', + SERVICE: 'serviceName', + OPERATION: 'name', + DURATION: 'durationInNanos', + START_TIME: 'startTime', + END_TIME: 'endTime', + ERRORS: 'status.code', + }, + jaeger: { + SPAN_ID: 'spanID', + PARENT_SPAN_ID: undefined, + SERVICE: 'process.serviceName', + OPERATION: 'operationName', + DURATION: 'duration', + START_TIME: 'startTime', + END_TIME: undefined, + ERRORS: 'tag.error', + }, +}; + +const getSpanFieldKey = (mode: TraceAnalyticsMode, field: SpanField) => MODE_TO_FIELDS[mode][field]; + +const getSpanValue = (span: object, mode: TraceAnalyticsMode, field: SpanField) => { + const fieldKey = getSpanFieldKey(mode, field); + if (fieldKey === undefined) return undefined; + return _.get(span, fieldKey); +}; + export function SpanDetailFlyout(props: { http: HttpSetup; spanId: string; @@ -42,13 +74,19 @@ export function SpanDetailFlyout(props: { handleSpansFlyoutRequest(props.http, props.spanId, setSpan, mode); }, [props.spanId]); - const getListItem = (field: string, title: React.ReactNode, description: React.ReactNode) => { + const getListItem = ( + fieldKey: string | undefined, + title: React.ReactNode, + description: React.ReactNode + ) => { return ( props.addSpanFilter(field, span[field])} + addSpanFilter={ + fieldKey ? () => props.addSpanFilter(fieldKey, _.get(span, fieldKey)) : undefined + } /> ); }; @@ -65,27 +103,27 @@ export function SpanDetailFlyout(props: { if (!span || _.isEmpty(span)) return '-'; const overviewList = [ getListItem( - 'spanId', + getSpanFieldKey(mode, 'SPAN_ID'), 'Span ID', - (mode === 'data_prepper' ? span.spanId : span.spanID) ? ( + getSpanValue(span, mode, 'SPAN_ID') ? ( - + {(copy) => ( )} - {mode === 'data_prepper' ? span.spanId : span.spanID} + {getSpanValue(span, mode, 'SPAN_ID')} ) : ( '-' ) ), getListItem( - 'parentSpanId', + getSpanFieldKey(mode, 'PARENT_SPAN_ID'), 'Parent span ID', - (mode === 'data_prepper' ? span.parentSpanId : span.references.length) ? ( + getSpanValue(span, mode, 'PARENT_SPAN_ID') ? ( Yes diff --git a/public/components/trace_analytics/requests/traces_request_handler.ts b/public/components/trace_analytics/requests/traces_request_handler.ts index 0ed7a0205..80b42a764 100644 --- a/public/components/trace_analytics/requests/traces_request_handler.ts +++ b/public/components/trace_analytics/requests/traces_request_handler.ts @@ -2,12 +2,11 @@ * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 */ -/* eslint-disable no-console */ -import { BarOrientation } from '../../../../common/constants/shared'; import _ from 'lodash'; import moment from 'moment'; import { v1 as uuid } from 'uuid'; +import { BarOrientation } from '../../../../common/constants/shared'; import { HttpSetup } from '../../../../../../src/core/public'; import { TRACE_ANALYTICS_DATE_FORMAT } from '../../../../common/constants/trace_analytics'; import { microToMilliSec, nanoToMilliSec } from '../components/common/helper_functions'; @@ -38,7 +37,7 @@ export const handleTracesRequest = async ( items: any, setItems: (items: any) => void, mode: TraceAnalyticsMode, - sort?: any, + sort?: any ) => { const binarySearch = (arr: number[], target: number) => { if (!arr) return Number.NaN; @@ -73,7 +72,7 @@ export const handleTracesRequest = async ( .then((response) => { return Promise.all( response.aggregations.traces.buckets.map((bucket: any) => { - if (mode === 'data_prepper') { + if (mode === 'data_prepper') { return { trace_id: bucket.key, trace_group: bucket.trace_group.buckets[0]?.key, @@ -86,15 +85,14 @@ export const handleTracesRequest = async ( ), actions: '#', }; - } - return { - trace_id: bucket.key, - latency: bucket.latency.value, - last_updated: moment(bucket.last_updated.value).format(TRACE_ANALYTICS_DATE_FORMAT), - error_count: bucket.error_count.doc_count, - actions: '#', - }; - + } + return { + trace_id: bucket.key, + latency: bucket.latency.value, + last_updated: moment(bucket.last_updated.value).format(TRACE_ANALYTICS_DATE_FORMAT), + error_count: bucket.error_count.doc_count, + actions: '#', + }; }) ); }) @@ -109,7 +107,7 @@ export const handleTraceViewRequest = ( http: HttpSetup, fields: {}, setFields: (fields: any) => void, - mode: TraceAnalyticsMode, + mode: TraceAnalyticsMode ) => { handleDslRequest(http, null, getTracesQuery(mode, traceId), mode) .then(async (response) => { @@ -138,7 +136,7 @@ export const handleServicesPieChartRequest = async ( http: HttpSetup, setServiceBreakdownData: (serviceBreakdownData: any) => void, setColorMap: (colorMap: any) => void, - mode: TraceAnalyticsMode, + mode: TraceAnalyticsMode ) => { const colors = [ '#7492e7', @@ -201,7 +199,7 @@ export const handleSpansGanttRequest = ( setSpanDetailData: (spanDetailData: any) => void, colorMap: any, spanFiltersDSL: any, - mode: TraceAnalyticsMode, + mode: TraceAnalyticsMode ) => { handleDslRequest(http, spanFiltersDSL, getSpanDetailQuery(mode, traceId), mode) .then((response) => hitsToSpanDetailData(response.hits.hits, colorMap, mode)) @@ -213,7 +211,7 @@ export const handleSpansFlyoutRequest = ( http: HttpSetup, spanId: string, setItems: (items: any) => void, - mode: TraceAnalyticsMode, + mode: TraceAnalyticsMode ) => { handleDslRequest(http, null, getSpanFlyoutQuery(mode, spanId), mode) .then((response) => { @@ -230,15 +228,35 @@ const hitsToSpanDetailData = async (hits: any, colorMap: any, mode: TraceAnalyti }; if (hits.length === 0) return data; - const minStartTime = mode === 'jaeger' ? microToMilliSec(hits[hits.length - 1].sort[0]) : nanoToMilliSec(hits[hits.length - 1].sort[0]); + const minStartTime = + mode === 'jaeger' + ? microToMilliSec(hits[hits.length - 1].sort[0]) + : nanoToMilliSec(hits[hits.length - 1].sort[0]); let maxEndTime = 0; hits.forEach((hit: any) => { - const startTime = mode === 'jaeger' ? microToMilliSec(hit.sort[0]) - minStartTime : nanoToMilliSec(hit.sort[0]) - minStartTime; - const duration = mode === 'jaeger' ? _.round(microToMilliSec(hit._source.duration), 2) : _.round(nanoToMilliSec(hit._source.durationInNanos), 2);; - const serviceName = mode === 'jaeger'? _.get(hit, ['_source', 'process'])['serviceName'] : _.get(hit, ['_source', 'serviceName']); - const name = mode === 'jaeger' ? _.get(hit, '_source.operationName') : _.get(hit, '_source.name'); - const error = mode === 'jaeger' ? (hit._source['tag']['error'] === true ? ' \u26a0 Error' : '') : (hit._source['status.code'] === 2 ? ' \u26a0 Error' : ''); + const startTime = + mode === 'jaeger' + ? microToMilliSec(hit.sort[0]) - minStartTime + : nanoToMilliSec(hit.sort[0]) - minStartTime; + const duration = + mode === 'jaeger' + ? _.round(microToMilliSec(hit._source.duration), 2) + : _.round(nanoToMilliSec(hit._source.durationInNanos), 2); + const serviceName = + mode === 'jaeger' + ? _.get(hit, ['_source', 'process']).serviceName + : _.get(hit, ['_source', 'serviceName']); + const name = + mode === 'jaeger' ? _.get(hit, '_source.operationName') : _.get(hit, '_source.name'); + const error = + mode === 'jaeger' + ? hit._source.tag?.['error'] === true + ? ' \u26a0 Error' + : '' + : hit._source['status.code'] === 2 + ? ' \u26a0 Error' + : ''; const uniqueLabel = `${serviceName}
${name} ` + uuid(); maxEndTime = Math.max(maxEndTime, startTime + duration); @@ -292,7 +310,7 @@ export const handlePayloadRequest = ( http: HttpSetup, payloadData: any, setPayloadData: (payloadData: any) => void, - mode: TraceAnalyticsMode, + mode: TraceAnalyticsMode ) => { handleDslRequest(http, null, getPayloadQuery(mode, traceId), mode) .then((response) => setPayloadData(JSON.stringify(response.hits.hits, null, 2))) @@ -305,7 +323,7 @@ export const handleSpansRequest = ( setTotal: (total: number) => void, spanSearchParams: SpanSearchParams, DSL: any, - mode: TraceAnalyticsMode, + mode: TraceAnalyticsMode ) => { handleDslRequest(http, DSL, getSpansQuery(spanSearchParams), mode) .then((response) => {