@oneuptime/common 10.0.53 → 10.0.54

package/Server/Utils/Workspace/Workspace.ts

@@ -7,7 +7,7 @@ import ObjectID from "../../../Types/ObjectID";
 import WorkspaceMessagePayload, {
   WorkspacePayloadMarkdown,
 } from "../../../Types/Workspace/WorkspaceMessagePayload";
-import logger from "../Logger";
+import logger, { LogAttributes } from "../Logger";
 import WorkspaceProjectAuthTokenService from "../../Services/WorkspaceProjectAuthTokenService";
 import WorkspaceProjectAuthToken, {
   SlackMiscData,
@@ -157,8 +157,15 @@ export default class WorkspaceUtil {
     projectId: ObjectID;
     messagePayloadsByWorkspace: Array<WorkspaceMessagePayload>;
   }): Promise<Array<WorkspaceSendMessageResponse>> {
-    logger.debug("postToWorkspaceChannels called with data:");
-    logger.debug(JSON.stringify(data, null, 2));
+    const workspaceLogAttributes: LogAttributes = {
+      projectId: data.projectId?.toString(),
+    };
+
+    logger.debug(
+      "postToWorkspaceChannels called with data:",
+      workspaceLogAttributes,
+    );
+    logger.debug(JSON.stringify(data, null, 2), workspaceLogAttributes);
 
     const responses: Array<WorkspaceSendMessageResponse> = [];
 
@@ -214,9 +221,12 @@ export default class WorkspaceUtil {
       responses.push(result);
     }
 
-    logger.debug("Message posted to workspace channels successfully");
-    logger.debug("Returning thread IDs");
-    logger.debug(JSON.stringify(responses, null, 2));
+    logger.debug(
+      "Message posted to workspace channels successfully",
+      workspaceLogAttributes,
+    );
+    logger.debug("Returning thread IDs", workspaceLogAttributes);
+    logger.debug(JSON.stringify(responses, null, 2), workspaceLogAttributes);
 
     return responses;
   }
@@ -229,8 +239,15 @@ export default class WorkspaceUtil {
     workspaceMessagePayload: WorkspaceMessagePayload;
     projectId: ObjectID;
   }): Promise<WorkspaceSendMessageResponse> {
-    logger.debug("postToWorkspaceChannels called with data:");
-    logger.debug(data);
+    const postLogAttributes: LogAttributes = {
+      projectId: data.projectId?.toString(),
+    };
+
+    logger.debug(
+      "postToWorkspaceChannels called with data:",
+      postLogAttributes,
+    );
+    logger.debug(data, postLogAttributes);
 
     const result: WorkspaceSendMessageResponse =
       await WorkspaceUtil.getWorkspaceTypeUtil(data.workspaceType).sendMessage({
@@ -240,9 +257,12 @@ export default class WorkspaceUtil {
         projectId: data.projectId,
       });
 
-    logger.debug("Message posted to workspace channels successfully");
-    logger.debug("Returning thread IDs");
-    logger.debug(result);
+    logger.debug(
+      "Message posted to workspace channels successfully",
+      postLogAttributes,
+    );
+    logger.debug("Returning thread IDs", postLogAttributes);
+    logger.debug(result, postLogAttributes);
 
     return result;
   }
@@ -283,6 +303,7 @@ export default class WorkspaceUtil {
         if (!params.teamId) {
           logger.error(
             "Team ID is required for Microsoft Teams channel messages",
+            { projectId: params.projectId?.toString() },
           );
           return [];
         }
@@ -312,6 +333,7 @@ export default class WorkspaceUtil {
       default:
         logger.debug(
           `Unsupported workspace type for channel messages: ${params.workspaceType}`,
+          { projectId: params.projectId?.toString() },
         );
         return [];
     }

package/Server/Utils/Workspace/WorkspaceBase.ts

@@ -343,7 +343,9 @@ export default class WorkspaceBase {
           );
           break;
         default:
-          logger.error("Unknown block type: " + block._type);
+          logger.error("Unknown block type: " + block._type, {
+            blockType: block._type,
+          });
           break;
       }
     }

package/Server/Utils/Workspace/WorkspaceMessages/Alert.ts

@@ -35,8 +35,14 @@ export default class AlertWorkspaceMessages {
       );
     } catch (err) {
       // log the error and continue.
-      logger.error("Error in createChannelsAndInviteUsersToChannels");
-      logger.error(err);
+      logger.error("Error in createChannelsAndInviteUsersToChannels", {
+        projectId: data.projectId?.toString(),
+        alertId: data.alertId?.toString(),
+      });
+      logger.error(err, {
+        projectId: data.projectId?.toString(),
+        alertId: data.alertId?.toString(),
+      });
       return null;
     }
   }

package/Tests/Server/Middleware/UserAuthorization.test.ts

@@ -123,7 +123,7 @@ describe("UserMiddleware", () => {
 
       expect(result).toEqual({});
       expect(spyDecode).toHaveBeenCalledWith(mockedAccessToken);
-      expect(spyErrorLogger).toHaveBeenCalledWith(error);
+      expect(spyErrorLogger).toHaveBeenCalledWith(error, undefined);
     });
 
     test("should return an empty object when the decoded sso-token object doesn't have projectId property", () => {

package/Tests/Server/Services/AnalyticsDatabaseService.test.ts

@@ -96,8 +96,11 @@ describe("AnalyticsDatabaseService", () => {
       expect(logger.debug).toHaveBeenNthCalledWith(
         1,
         "<table-name> Count Statement",
+        { tableName: "<table-name>" },
       );
-      expect(logger.debug).toHaveBeenNthCalledWith(2, statement);
+      expect(logger.debug).toHaveBeenNthCalledWith(2, statement, {
+        tableName: "<table-name>",
+      });
 
       expect(statement.query).toBe(
         "SELECT\n" +
@@ -201,8 +204,11 @@ describe("AnalyticsDatabaseService", () => {
       expect(jest.mocked(logger.debug)).toHaveBeenNthCalledWith(
         1,
         "<table-name> Find Statement",
+        { tableName: "<table-name>" },
       );
-      expect(jest.mocked(logger.debug)).toHaveBeenNthCalledWith(2, statement);
+      expect(jest.mocked(logger.debug)).toHaveBeenNthCalledWith(2, statement, {
+        tableName: "<table-name>",
+      });
 
       expect(statement.query).toBe(
         "SELECT <select-statement> FROM {p0:Identifier}.{p1:Identifier} WHERE TRUE <where-statement> ORDER BY <sort-statement> LIMIT {p2:Int32} OFFSET {p3:Int32}",
@@ -340,8 +346,11 @@ describe("AnalyticsDatabaseService", () => {
       expect(logger.debug).toHaveBeenNthCalledWith(
         1,
         "<table-name> Delete Statement",
+        { tableName: "<table-name>" },
       );
-      expect(logger.debug).toHaveBeenNthCalledWith(2, statement);
+      expect(logger.debug).toHaveBeenNthCalledWith(2, statement, {
+        tableName: "<table-name>",
+      });
 
       expect(statement.query).toBe(
         "ALTER TABLE {p0:Identifier}.{p1:Identifier}\n" +

package/UI/Components/Charts/Area/AreaChart.tsx

@@ -1,12 +1,20 @@
 import { AreaChart } from "../ChartLibrary/AreaChart/AreaChart";
-import React, { FunctionComponent, ReactElement, useEffect } from "react";
+import React, {
+  FunctionComponent,
+  ReactElement,
+  useEffect,
+  useMemo,
+} from "react";
 import SeriesPoint from "../Types/SeriesPoints";
 import { XAxis } from "../Types/XAxis/XAxis";
 import YAxis from "../Types/YAxis/YAxis";
 import ChartCurve from "../Types/ChartCurve";
 import ChartDataPoint from "../ChartLibrary/Types/ChartDataPoint";
+import FormattedExemplarPoint from "../ChartLibrary/Types/FormattedExemplarPoint";
 import DataPointUtil from "../Utils/DataPoint";
 import ChartReferenceLineProps from "../Types/ReferenceLineProps";
+import ExemplarPoint from "../Types/ExemplarPoint";
+import XAxisUtil from "../Utils/XAxis";
 import NoDataMessage from "../ChartGroup/NoDataMessage";
 
 export interface ComponentProps {
@@ -17,6 +25,8 @@ export interface ComponentProps {
   sync: boolean;
   heightInPx?: number | undefined;
   referenceLines?: Array<ChartReferenceLineProps> | undefined;
+  exemplarPoints?: Array<ExemplarPoint> | undefined;
+  onExemplarClick?: ((exemplar: ExemplarPoint) => void) | undefined;
 }
 
 export interface AreaInternalProps extends ComponentProps {
@@ -42,6 +52,26 @@ const AreaChartElement: FunctionComponent<AreaInternalProps> = (
     setRecords(records);
   }, [props.data]);
 
+  // Format exemplar x values to match the chart's x-axis labels
+  const formattedExemplars: Array<FormattedExemplarPoint> = useMemo(() => {
+    if (!props.exemplarPoints || props.exemplarPoints.length === 0) {
+      return [];
+    }
+
+    const formatter: (value: Date) => string = XAxisUtil.getFormatter({
+      xAxisMax: props.xAxis.options.max,
+      xAxisMin: props.xAxis.options.min,
+    });
+
+    return props.exemplarPoints.map((exemplar: ExemplarPoint) => {
+      return {
+        formattedX: formatter(exemplar.x),
+        y: exemplar.y,
+        original: exemplar,
+      };
+    });
+  }, [props.exemplarPoints, props.xAxis]);
+
   const className: string = props.heightInPx ? `` : "h-80";
   const style: React.CSSProperties = props.heightInPx
     ? { height: `${props.heightInPx}px` }
@@ -83,6 +113,10 @@ const AreaChartElement: FunctionComponent<AreaInternalProps> = (
         yAxisWidth={60}
         onValueChange={() => {}}
         referenceLines={props.referenceLines}
+        formattedExemplarPoints={
+          formattedExemplars.length > 0 ? formattedExemplars : undefined
+        }
+        onExemplarClick={props.onExemplarClick}
       />
       {hasNoData && <NoDataMessage />}
     </div>

package/UI/Components/Charts/ChartGroup/ChartGroup.tsx

@@ -7,6 +7,7 @@ import BarChartElement, {
 import AreaChartElement, {
   ComponentProps as AreaChartProps,
 } from "../Area/AreaChart";
+import ExemplarPoint from "../Types/ExemplarPoint";
 import Icon, { SizeProp } from "../../Icon/Icon";
 import IconProp from "../../../../Types/Icon/IconProp";
 import Modal, { ModalWidth } from "../../Modal/Modal";
@@ -33,6 +34,8 @@ export interface Chart {
   type: ChartType;
   props: LineChartProps | BarChartProps | AreaChartProps;
   metricInfo?: ChartMetricInfo | undefined;
+  exemplarPoints?: Array<ExemplarPoint> | undefined;
+  onExemplarClick?: ((exemplar: ExemplarPoint) => void) | undefined;
 }
 
 export interface ComponentProps {
@@ -67,6 +70,8 @@ const ChartGroup: FunctionComponent<ComponentProps> = (
             {...(chart.props as LineChartProps)}
             syncid={syncId}
             heightInPx={props.heightInPx}
+            exemplarPoints={chart.exemplarPoints}
+            onExemplarClick={chart.onExemplarClick}
           />
         );
       case ChartType.BAR:
@@ -85,6 +90,8 @@ const ChartGroup: FunctionComponent<ComponentProps> = (
             {...(chart.props as AreaChartProps)}
             syncid={syncId}
             heightInPx={props.heightInPx}
+            exemplarPoints={chart.exemplarPoints}
+            onExemplarClick={chart.onExemplarClick}
           />
         );
       default:

package/UI/Components/Charts/ChartLibrary/AreaChart/AreaChart.tsx

@@ -11,6 +11,7 @@ import {
   Dot,
   Label,
   Legend as RechartsLegend,
+  ReferenceDot,
   ReferenceLine,
   ResponsiveContainer,
   Tooltip,
@@ -18,6 +19,8 @@ import {
   YAxis,
 } from "recharts";
 import ChartReferenceLineProps from "../../Types/ReferenceLineProps";
+import ExemplarPoint from "../../Types/ExemplarPoint";
+import FormattedExemplarPoint from "../Types/FormattedExemplarPoint";
 import { AxisDomain } from "recharts/types/util/types";
 
 import { useOnWindowResize } from "../Utils/UseWindowOnResize";
@@ -557,6 +560,8 @@ interface AreaChartProps extends React.HTMLAttributes<HTMLDivElement> {
   customTooltip?: React.ComponentType<TooltipProps>;
   syncid?: string | undefined;
   referenceLines?: Array<ChartReferenceLineProps> | undefined;
+  formattedExemplarPoints?: Array<FormattedExemplarPoint> | undefined;
+  onExemplarClick?: ((exemplar: ExemplarPoint) => void) | undefined;
 }
 
 const AreaChart: React.ForwardRefExoticComponent<
@@ -1000,6 +1005,34 @@ const AreaChart: React.ForwardRefExoticComponent<
                 );
               },
             )}
+            {/* Exemplar dots - clickable markers linking to traces */}
+            {props.formattedExemplarPoints?.map(
+              (exemplar: FormattedExemplarPoint, exemplarIndex: number) => {
+                return (
+                  <ReferenceDot
+                    key={`exemplar-${exemplarIndex}`}
+                    x={exemplar.formattedX}
+                    y={exemplar.y}
+                    r={5}
+                    fill="#7c3aed"
+                    stroke="#ffffff"
+                    strokeWidth={2}
+                    style={{ cursor: "pointer" }}
+                    onClick={() => {
+                      props.onExemplarClick?.(exemplar.original);
+                    }}
+                  >
+                    <Label
+                      value="E"
+                      position="center"
+                      fill="#ffffff"
+                      fontSize={8}
+                      fontWeight={700}
+                    />
+                  </ReferenceDot>
+                );
+              },
+            )}
           </RechartsAreaChart>
         </ResponsiveContainer>
       </div>

package/UI/Components/Charts/ChartLibrary/LineChart/LineChart.tsx

@@ -12,6 +12,7 @@ import {
   Line,
   Legend as RechartsLegend,
   LineChart as RechartsLineChart,
+  ReferenceDot,
   ReferenceLine,
   ResponsiveContainer,
   Tooltip,
@@ -19,6 +20,8 @@ import {
   YAxis,
 } from "recharts";
 import ChartReferenceLineProps from "../../Types/ReferenceLineProps";
+import ExemplarPoint from "../../Types/ExemplarPoint";
+import FormattedExemplarPoint from "../Types/FormattedExemplarPoint";
 import { AxisDomain } from "recharts/types/util/types";
 
 import { useOnWindowResize } from "../Utils/UseWindowOnResize";
@@ -574,6 +577,8 @@ interface LineChartProps extends React.HTMLAttributes<HTMLDivElement> {
   customTooltip?: React.ComponentType<TooltipProps>;
   syncid?: string | undefined;
   referenceLines?: Array<ChartReferenceLineProps> | undefined;
+  formattedExemplarPoints?: Array<FormattedExemplarPoint> | undefined;
+  onExemplarClick?: ((exemplar: ExemplarPoint) => void) | undefined;
 }
 
 const LineChart: React.ForwardRefExoticComponent<
@@ -1018,6 +1023,34 @@ const LineChart: React.ForwardRefExoticComponent<
                 );
               },
             )}
+            {/* Exemplar dots - clickable markers linking to traces */}
+            {props.formattedExemplarPoints?.map(
+              (exemplar: FormattedExemplarPoint, exemplarIndex: number) => {
+                return (
+                  <ReferenceDot
+                    key={`exemplar-${exemplarIndex}`}
+                    x={exemplar.formattedX}
+                    y={exemplar.y}
+                    r={5}
+                    fill="#7c3aed"
+                    stroke="#ffffff"
+                    strokeWidth={2}
+                    style={{ cursor: "pointer" }}
+                    onClick={() => {
+                      props.onExemplarClick?.(exemplar.original);
+                    }}
+                  >
+                    <Label
+                      value="E"
+                      position="center"
+                      fill="#ffffff"
+                      fontSize={8}
+                      fontWeight={700}
+                    />
+                  </ReferenceDot>
+                );
+              },
+            )}
           </RechartsLineChart>
         </ResponsiveContainer>
       </div>

package/UI/Components/Charts/ChartLibrary/Types/FormattedExemplarPoint.ts

@@ -0,0 +1,14 @@
+import ExemplarPoint from "../../Types/ExemplarPoint";
+
+/**
+ * An exemplar point with a formatted x-axis label that matches the chart's
+ * x-axis formatting. Used internally by chart library components.
+ */
+export default interface FormattedExemplarPoint {
+  /** The formatted x-axis label (e.g. "12:30", "Feb 22") */
+  formattedX: string;
+  /** The y value */
+  y: number;
+  /** The original exemplar data for click handling */
+  original: ExemplarPoint;
+}

package/UI/Components/Charts/Line/LineChart.tsx

@@ -1,12 +1,20 @@
 import { LineChart } from "../ChartLibrary/LineChart/LineChart";
-import React, { FunctionComponent, ReactElement, useEffect } from "react";
+import React, {
+  FunctionComponent,
+  ReactElement,
+  useEffect,
+  useMemo,
+} from "react";
 import SeriesPoint from "../Types/SeriesPoints";
 import { XAxis } from "../Types/XAxis/XAxis";
 import YAxis from "../Types/YAxis/YAxis";
 import ChartCurve from "../Types/ChartCurve";
 import ChartDataPoint from "../ChartLibrary/Types/ChartDataPoint";
+import FormattedExemplarPoint from "../ChartLibrary/Types/FormattedExemplarPoint";
 import DataPointUtil from "../Utils/DataPoint";
 import ChartReferenceLineProps from "../Types/ReferenceLineProps";
+import ExemplarPoint from "../Types/ExemplarPoint";
+import XAxisUtil from "../Utils/XAxis";
 import NoDataMessage from "../ChartGroup/NoDataMessage";
 
 export interface ComponentProps {
@@ -17,6 +25,8 @@ export interface ComponentProps {
   sync: boolean;
   heightInPx?: number | undefined;
   referenceLines?: Array<ChartReferenceLineProps> | undefined;
+  exemplarPoints?: Array<ExemplarPoint> | undefined;
+  onExemplarClick?: ((exemplar: ExemplarPoint) => void) | undefined;
 }
 
 export interface LineInternalProps extends ComponentProps {
@@ -42,6 +52,26 @@ const LineChartElement: FunctionComponent<LineInternalProps> = (
     setRecords(records);
   }, [props.data]);
 
+  // Format exemplar x values to match the chart's x-axis labels
+  const formattedExemplars: Array<FormattedExemplarPoint> = useMemo(() => {
+    if (!props.exemplarPoints || props.exemplarPoints.length === 0) {
+      return [];
+    }
+
+    const formatter: (value: Date) => string = XAxisUtil.getFormatter({
+      xAxisMax: props.xAxis.options.max,
+      xAxisMin: props.xAxis.options.min,
+    });
+
+    return props.exemplarPoints.map((exemplar: ExemplarPoint) => {
+      return {
+        formattedX: formatter(exemplar.x),
+        y: exemplar.y,
+        original: exemplar,
+      };
+    });
+  }, [props.exemplarPoints, props.xAxis]);
+
   const className: string = props.heightInPx ? `` : "h-80";
   const style: React.CSSProperties = props.heightInPx
     ? { height: `${props.heightInPx}px` }
@@ -82,6 +112,10 @@ const LineChartElement: FunctionComponent<LineInternalProps> = (
         yAxisWidth={60}
         onValueChange={() => {}}
         referenceLines={props.referenceLines}
+        formattedExemplarPoints={
+          formattedExemplars.length > 0 ? formattedExemplars : undefined
+        }
+        onExemplarClick={props.onExemplarClick}
       />
       {hasNoData && <NoDataMessage />}
     </div>

package/UI/Components/Charts/Types/ExemplarPoint.ts

@@ -0,0 +1,6 @@
+export default interface ExemplarPoint {
+  x: Date;
+  y: number;
+  traceId: string;
+  spanId?: string | undefined;
+}

package/UI/Components/Markdown.tsx/MarkdownViewer.tsx

@@ -327,7 +327,7 @@ const MarkdownViewer: FunctionComponent<ComponentProps> = (
           p: ({ ...props }: any) => {
             return (
               <p
-                className="text-sm mt-2 mb-3 text-gray-700 leading-relaxed"
+                className="text-sm mt-2 mb-1 text-gray-700 leading-relaxed"
                 {...props}
               />
             );
@@ -391,10 +391,10 @@ const MarkdownViewer: FunctionComponent<ComponentProps> = (
             );
           },
           ul: ({ ...props }: any) => {
-            return <ul className="list-disc pl-6 mt-1 mb-3" {...props} />;
+            return <ul className="list-disc pl-6 mt-0 mb-1" {...props} />;
           },
           ol: ({ ...props }: any) => {
-            return <ol className="list-decimal pl-6 mt-1 mb-3" {...props} />;
+            return <ol className="list-decimal pl-6 mt-0 mb-1" {...props} />;
           },
           blockquote: ({ children, ...props }: any) => {
             return (

package/UI/Components/Navbar/NavBar.tsx

@@ -3,6 +3,7 @@ import React, {
   ReactElement,
   useState,
   useEffect,
+  useRef,
 } from "react";
 import Route from "../../../Types/API/Route";
 import URL from "../../../Types/API/URL";
@@ -60,6 +61,8 @@ const Navbar: FunctionComponent<ComponentProps> = (
   const [moreMenuTimeout, setMoreMenuTimeout] = useState<ReturnType<
     typeof setTimeout
   > | null>(null);
+  const suppressShowRef: React.MutableRefObject<boolean> =
+    useRef<boolean>(false);
 
   // Use the existing outside click hook for mobile menu
   const {
@@ -108,9 +111,16 @@ const Navbar: FunctionComponent<ComponentProps> = (
     }
 
     setIsMoreMenuVisible(false);
+    suppressShowRef.current = true;
+    setTimeout(() => {
+      suppressShowRef.current = false;
+    }, 300);
   };
 
   const showMoreMenu: () => void = (): void => {
+    if (suppressShowRef.current) {
+      return;
+    }
     if (moreMenuTimeout) {
       clearTimeout(moreMenuTimeout);
     }

package/build/dist/Models/AnalyticsModels/Metric.js

@@ -494,6 +494,62 @@ export default class Metric extends AnalyticsBaseModel {
                 update: [],
             },
         });
+        const traceIdColumn = new AnalyticsTableColumn({
+            key: "traceId",
+            title: "Trace ID",
+            description: "Trace ID from an exemplar associated with this metric data point",
+            required: false,
+            type: TableColumnType.Text,
+            skipIndex: {
+                name: "idx_trace_id",
+                type: SkipIndexType.BloomFilter,
+                params: [0.01],
+                granularity: 1,
+            },
+            accessControl: {
+                read: [
+                    Permission.ProjectOwner,
+                    Permission.ProjectAdmin,
+                    Permission.ProjectMember,
+                    Permission.ReadTelemetryServiceLog,
+                ],
+                create: [
+                    Permission.ProjectOwner,
+                    Permission.ProjectAdmin,
+                    Permission.ProjectMember,
+                    Permission.CreateTelemetryServiceLog,
+                ],
+                update: [],
+            },
+        });
+        const spanIdColumn = new AnalyticsTableColumn({
+            key: "spanId",
+            title: "Span ID",
+            description: "Span ID from an exemplar associated with this metric data point",
+            required: false,
+            type: TableColumnType.Text,
+            skipIndex: {
+                name: "idx_span_id",
+                type: SkipIndexType.BloomFilter,
+                params: [0.01],
+                granularity: 1,
+            },
+            accessControl: {
+                read: [
+                    Permission.ProjectOwner,
+                    Permission.ProjectAdmin,
+                    Permission.ProjectMember,
+                    Permission.ReadTelemetryServiceLog,
+                ],
+                create: [
+                    Permission.ProjectOwner,
+                    Permission.ProjectAdmin,
+                    Permission.ProjectMember,
+                    Permission.CreateTelemetryServiceLog,
+                ],
+                update: [],
+            },
+        });
         const retentionDateColumn = new AnalyticsTableColumn({
             key: "retentionDate",
             title: "Retention Date",
@@ -555,6 +611,8 @@ export default class Metric extends AnalyticsBaseModel {
                 maxColumn,
                 bucketCountsColumn,
                 explicitBoundsColumn,
+                traceIdColumn,
+                spanIdColumn,
                 retentionDateColumn,
             ],
             projections: [],
@@ -684,6 +742,18 @@ export default class Metric extends AnalyticsBaseModel {
     set explicitBounds(v) {
         this.setColumnValue("explicitBounds", v);
     }
+    get traceId() {
+        return this.getColumnValue("traceId");
+    }
+    set traceId(v) {
+        this.setColumnValue("traceId", v);
+    }
+    get spanId() {
+        return this.getColumnValue("spanId");
+    }
+    set spanId(v) {
+        this.setColumnValue("spanId", v);
+    }
     get retentionDate() {
         return this.getColumnValue("retentionDate");
     }