diff --git a/packages/jaeger-ui/src/utils/getSpanDataForDigma.ts b/packages/jaeger-ui/src/utils/getSpanDataForDigma.ts index 2269e36614..475d84650a 100644 --- a/packages/jaeger-ui/src/utils/getSpanDataForDigma.ts +++ b/packages/jaeger-ui/src/utils/getSpanDataForDigma.ts @@ -9,10 +9,11 @@ interface IDigmaSpanData { namespace?: string; spanCodeObjectId?: string; methodCodeObjectId?: string; + environment?: string; } const getSpanDataForDigma = (span: Span): IDigmaSpanData => { - const tagsToGet: Omit = { + const tagsToGet = { instrumentationLibrary: 'otel.library.name', function: 'code.function', namespace: 'code.namespace', @@ -20,13 +21,23 @@ const getSpanDataForDigma = (span: Span): IDigmaSpanData => { methodCodeObjectId: 'digma.method.code.object.id', }; + const processTagsToGet = { + environment: 'digma.environment', + }; + const tagsValues = Object.entries(tagsToGet).reduce((acc, [key, value]) => { const tag = span.tags.find((x: any) => x.key === value); return tag ? { ...acc, [key]: tag.value } : acc; }, {}); + const processTagsValues = Object.entries(processTagsToGet).reduce((acc, [key, value]) => { + const tag = span.process.tags.find((x: any) => x.key === value); + return tag ? { ...acc, [key]: tag.value } : acc; + }, {}); + return { ...tagsValues, + ...processTagsValues, id: span.spanID, name: span.operationName, serviceName: span.process.serviceName, diff --git a/packages/jaeger-ui/typings/custom.d.ts b/packages/jaeger-ui/typings/custom.d.ts index b0d037afe8..ba948ed536 100644 --- a/packages/jaeger-ui/typings/custom.d.ts +++ b/packages/jaeger-ui/typings/custom.d.ts @@ -39,7 +39,7 @@ declare interface Window { embeddedMode?: unknown; isUserDefinedJaegerQueryURL?: unknown; staticPath?: unknown; - enableZoomControls?: unknown + enableZoomControls?: unknown; } declare const __REACT_APP_GA_DEBUG__: string | undefined;