Merge pull request #30 from digma-ai/fix/span-environment

Add environment to the span payload

Author: kshmidt-digma

packages/jaeger-ui/src/utils/getSpanDataForDigma.ts

@@ -9,24 +9,35 @@ interface IDigmaSpanData {
   namespace?: string;
   spanCodeObjectId?: string;
   methodCodeObjectId?: string;
+  environment?: string;
 }
 
 const getSpanDataForDigma = (span: Span): IDigmaSpanData => {
-  const tagsToGet: Omit<IDigmaSpanData, 'id' | 'name' | 'serviceName'> = {
+  const tagsToGet = {
     instrumentationLibrary: 'otel.library.name',
     function: 'code.function',
     namespace: 'code.namespace',
     spanCodeObjectId: 'digma.span.code.object.id',
     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,

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;