@oneuptime/common 7.0.3876 → 7.0.3887

package/Models/AnalyticsModels/TelemetryAttribute.ts

@@ -106,11 +106,11 @@ export default class TelemetryAttribute extends AnalyticsBaseModel {
         }),
 
         new AnalyticsTableColumn({
-          key: "attribute",
-          title: "Attribute",
-          description: "Attribute",
+          key: "attributes",
+          title: "Attributes",
+          description: "Attributes",
           required: true,
-          type: TableColumnType.Text,
+          type: TableColumnType.JSONArray,
           accessControl: {
             read: [
               Permission.ProjectOwner,
@@ -153,11 +153,11 @@ export default class TelemetryAttribute extends AnalyticsBaseModel {
     this.setColumnValue("telemetryType", v);
   }
 
-  public get attribute(): string | undefined {
-    return this.getColumnValue("attribute") as string | undefined;
+  public get attributes(): Array<string> | undefined {
+    return this.getColumnValue("attributes") as Array<string> | undefined;
   }
 
-  public set attribute(v: string | undefined) {
-    this.setColumnValue("attribute", v);
+  public set attributes(v: Array<string> | undefined) {
+    this.setColumnValue("attributes", v);
   }
 }

package/Server/API/TelemetryAPI.ts

@@ -11,7 +11,6 @@ import CommonAPI from "./CommonAPI";
 import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps";
 import TelemetryType from "Common/Types/Telemetry/TelemetryType";
 import TelemetryAttributeService from "../Services/TelemetryAttributeService";
-import ArrayUtil from "Common/Utils/Array";
 
 const router: ExpressRouter = Express.getRouter();
 
@@ -72,12 +71,11 @@ const getAttributes: GetAttributesFunction = async (
       );
     }
 
-    const attributes: string[] = ArrayUtil.removeDuplicates(
+    const attributes: string[] =
       await TelemetryAttributeService.fetchAttributes({
         projectId: databaseProps.tenantId,
         telemetryType,
-      }),
-    );
+      });
 
     return Response.sendJsonObjectResponse(req, res, {
       attributes: attributes,

package/Server/Services/OpenTelemetryIngestService.ts

@@ -1,6 +1,5 @@
 import OneUptimeDate from "Common/Types/Date";
 import { JSONArray, JSONObject } from "Common/Types/JSON";
-import JSONFunctions from "Common/Types/JSONFunctions";
 import ObjectID from "Common/Types/ObjectID";
 import Metric, {
   AggregationTemporality,
@@ -166,21 +165,17 @@ export default class OTelIngestService {
       }
 
       newDbMetric.attributes = {
-        ...(newDbMetric.attributes || {}),
+        ...TelemetryUtil.getAttributesForServiceIdAndServiceName({
+          serviceId: data.telemetryServiceId,
+          serviceName: data.telemetryServiceName,
+        }),
         ...TelemetryUtil.getAttributes({
           items: datapoint["attributes"] as JSONArray,
-          telemetryServiceId: data.telemetryServiceId,
-          telemetryServiceName: data.telemetryServiceName,
+          prefixKeysWithString: "metricAttributes",
         }),
       };
     }
 
-    if (newDbMetric.attributes) {
-      newDbMetric.attributes = JSONFunctions.flattenObject(
-        newDbMetric.attributes,
-      );
-    }
-
     // aggregationTemporality
 
     if (aggregationTemporality) {

package/Server/Services/TelemetryAttributeService.ts

@@ -2,7 +2,6 @@ import TelemetryType from "../../Types/Telemetry/TelemetryType";
 import ClickhouseDatabase from "../Infrastructure/ClickhouseDatabase";
 import AnalyticsDatabaseService from "./AnalyticsDatabaseService";
 import TelemetryAttribute from "Common/Models/AnalyticsModels/TelemetryAttribute";
-import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax";
 import ObjectID from "../../Types/ObjectID";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 
@@ -16,30 +15,24 @@ export class TelemetryAttributeService extends AnalyticsDatabaseService<Telemetr
     projectId: ObjectID;
     telemetryType: TelemetryType;
   }): Promise<string[]> {
-    const attributes: TelemetryAttribute[] = await this.findBy({
+    const telemetryAttribute: TelemetryAttribute | null = await this.findOneBy({
       query: {
         projectId: data.projectId,
         telemetryType: data.telemetryType,
       },
       select: {
-        attribute: true,
+        attributes: true,
       },
-      limit: LIMIT_PER_PROJECT,
-      skip: 0,
       props: {
         isRoot: true,
       },
     });
 
-    const dbAttributes: string[] = attributes
-      .map((attribute: TelemetryAttribute) => {
-        return attribute.attribute;
-      })
-      .filter((attribute: string | undefined) => {
-        return Boolean(attribute);
-      }) as string[];
-
-    return dbAttributes.sort();
+    return telemetryAttribute &&
+      telemetryAttribute.attributes &&
+      telemetryAttribute
+      ? telemetryAttribute.attributes
+      : [];
   }
 
   @CaptureSpan()
@@ -61,21 +54,14 @@ export class TelemetryAttributeService extends AnalyticsDatabaseService<Telemetr
       },
     });
 
-    const telemetryAttributes: TelemetryAttribute[] = [];
-
-    // insert new attributes
-    for (const attribute of attributes) {
-      const telemetryAttribute: TelemetryAttribute = new TelemetryAttribute();
-
-      telemetryAttribute.projectId = projectId;
-      telemetryAttribute.telemetryType = telemetryType;
-      telemetryAttribute.attribute = attribute;
+    const telemetryAttribute: TelemetryAttribute = new TelemetryAttribute();
 
-      telemetryAttributes.push(telemetryAttribute);
-    }
+    telemetryAttribute.projectId = projectId;
+    telemetryAttribute.telemetryType = telemetryType;
+    telemetryAttribute.attributes = attributes;
 
-    await this.createMany({
-      items: telemetryAttributes,
+    await this.create({
+      data: telemetryAttribute,
       props: {
         isRoot: true,
       },

package/Server/Utils/Telemetry/CaptureSpan.ts

@@ -63,7 +63,13 @@ function CaptureSpan(data?: {
       return Telemetry.startActiveSpan({
         name: name,
         options: {
-          attributes: spanAttributes,
+          attributes: {
+            ...spanAttributes,
+            hey: "there",
+            thisIsNumber: 123,
+            thisIsBoolean: true,
+            thisIsArray: [1, 2, 3],
+          },
         },
         fn: (span: Span) => {
           let result: any = null;

package/Server/Utils/Telemetry/Telemetry.ts

@@ -1,21 +1,26 @@
+import { Dictionary } from "lodash";
 import { JSONArray, JSONObject, JSONValue } from "../../../Types/JSON";
-import JSONFunctions from "../../../Types/JSONFunctions";
 import ObjectID from "../../../Types/ObjectID";
 import TelemetryType from "../../../Types/Telemetry/TelemetryType";
-import ArrayUtil from "../../../Utils/Array";
 import GlobalCache from "../../Infrastructure/GlobalCache";
 import TelemetryAttributeService from "../../Services/TelemetryAttributeService";
 import CaptureSpan from "./CaptureSpan";
+import logger from "../Logger";
+
+export type AttributeType = string | number | boolean | null;
 
 export default class TelemetryUtil {
   @CaptureSpan()
   public static async indexAttributes(data: {
-    attributes: string[];
+    attributes: Array<string>;
     projectId: ObjectID;
     telemetryType: TelemetryType;
   }): Promise<void> {
     // index attributes
 
+    logger.debug("Indexing attributes");
+    logger.debug("data: " + JSON.stringify(data, null, 2));
+
     const cacheKey: string =
       data.projectId.toString() + "_" + data.telemetryType;
 
@@ -28,7 +33,9 @@ export default class TelemetryUtil {
 
     // check if keys are missing in cache
 
-    for (const key of data.attributes) {
+    const attributeKeys: string[] = data.attributes;
+
+    for (const key of attributeKeys) {
       if (!cacheKeys.includes(key)) {
         isKeysMissingInCache = true;
         break;
@@ -42,11 +49,9 @@ export default class TelemetryUtil {
         telemetryType: data.telemetryType,
       });
 
-      const mergedKeys: Array<string> = ArrayUtil.removeDuplicates([
-        ...dbKeys,
-        ...data.attributes,
-        ...cacheKeys,
-      ]);
+      const mergedKeys: Array<string> = Array.from(
+        new Set([...dbKeys, ...attributeKeys, ...cacheKeys]),
+      );
 
       await GlobalCache.setStringArray(
         "telemetryAttributesKeys",
@@ -62,96 +67,133 @@ export default class TelemetryUtil {
     }
   }
 
+  public static getAttributesForServiceIdAndServiceName(data: {
+    serviceId: ObjectID;
+    serviceName: string;
+  }): Dictionary<AttributeType> {
+    // get attributes for service id and service name
+    return {
+      "oneuptime.service.id": data.serviceId.toString(),
+      "oneuptime.service.name": data.serviceName,
+    };
+  }
+
   @CaptureSpan()
   public static getAttributes(data: {
+    prefixKeysWithString: string;
     items: JSONArray;
-    telemetryServiceId?: ObjectID;
-    telemetryServiceName?: string;
-  }): JSONObject {
+  }): Dictionary<AttributeType | Array<AttributeType>> {
     const { items } = data;
+    let { prefixKeysWithString } = data;
 
-    const finalObj: JSONObject = {};
-    // We need to convert this to date.
-    const attributes: JSONArray = items;
+    if (prefixKeysWithString) {
+      prefixKeysWithString = prefixKeysWithString + ".";
+    }
 
-    type GetValueFunction = (value: JSONValue) => JSONValue;
-
-    const getValue: GetValueFunction = (value: JSONValue): JSONValue => {
-      value = value as JSONObject;
-
-      if (value["stringValue"]) {
-        value = value["stringValue"] as string;
-      } else if (value["intValue"]) {
-        value = value["intValue"] as number;
-      } else if (value["doubleValue"]) {
-        value = value["doubleValue"] as number;
-      } else if (value["boolValue"]) {
-        value = value["boolValue"] as boolean;
-      } else if (
-        value["arrayValue"] &&
-        (value["arrayValue"] as JSONObject)["values"]
-      ) {
-        value = (
-          (value["arrayValue"] as JSONObject)["values"] as JSONArray
-        ).map((v: JSONObject) => {
-          return getValue(v);
-        });
-      } else if (
-        value["mapValue"] &&
-        (value["mapValue"] as JSONObject)["fields"]
-      ) {
-        value = getValue((value["mapValue"] as JSONObject)["fields"]);
-      } else if (value["nullValue"]) {
-        value = null;
-      }
+    let finalObj: Dictionary<AttributeType | Array<AttributeType>> = {};
+    const attributes: JSONArray = items;
 
-      return value;
-    };
+    if (!attributes) {
+      return finalObj;
+    }
 
-    if (attributes) {
-      for (const attribute of attributes) {
-        if (attribute["key"] && typeof attribute["key"] === "string") {
-          const value: JSONValue = getValue(attribute["value"]);
-          finalObj[attribute["key"]] = value;
+    for (const attribute of attributes) {
+      if (attribute["key"] && typeof attribute["key"] === "string") {
+        const keyWithPrefix: string = `${prefixKeysWithString}${attribute["key"]}`;
+
+        const value:
+          | AttributeType
+          | Dictionary<AttributeType>
+          | Array<AttributeType> = this.getAttributeValues(
+          keyWithPrefix,
+          attribute["value"],
+        );
+
+        if (Array.isArray(value)) {
+          finalObj = { ...finalObj, [keyWithPrefix]: value };
+        } else if (typeof value === "object" && value !== null) {
+          finalObj = { ...finalObj, ...(value as Dictionary<AttributeType>) };
+        } else {
+          finalObj[keyWithPrefix] = value;
         }
       }
     }
 
-    // add oneuptime specific attributes
-    if (!finalObj["oneuptime"]) {
-      finalObj["oneuptime"] = {};
-    }
-
-    if (!(finalObj["oneuptime"] as JSONObject)["telemetry"]) {
-      (finalObj["oneuptime"] as JSONObject)["telemetry"] = {};
-    }
+    return finalObj;
+  }
 
-    if (
-      !((finalObj["oneuptime"] as JSONObject)["telemetry"] as JSONObject)[
-        "service"
-      ]
+  public static getAttributeValues(
+    prefixKeysWithString: string,
+    value: JSONValue,
+  ): AttributeType | Dictionary<AttributeType> | Array<AttributeType> {
+    let finalObj:
+      | Dictionary<AttributeType>
+      | AttributeType
+      | Array<AttributeType> = null;
+    value = value as JSONObject;
+
+    if (value["stringValue"]) {
+      finalObj = value["stringValue"] as string;
+    } else if (value["intValue"]) {
+      finalObj = value["intValue"] as number;
+    } else if (value["doubleValue"]) {
+      finalObj = value["doubleValue"] as number;
+    } else if (value["boolValue"]) {
+      finalObj = value["boolValue"] as boolean;
+    } else if (
+      value["arrayValue"] &&
+      (value["arrayValue"] as JSONObject)["values"]
     ) {
-      ((finalObj["oneuptime"] as JSONObject)["telemetry"] as JSONObject)[
-        "service"
-      ] = {};
-    }
-
-    if (data.telemetryServiceId) {
-      (
-        ((finalObj["oneuptime"] as JSONObject)["telemetry"] as JSONObject)[
-          "service"
-        ] as JSONObject
-      )["id"] = data.telemetryServiceId.toString();
+      const values: JSONArray = (value["arrayValue"] as JSONObject)[
+        "values"
+      ] as JSONArray;
+      finalObj = values.map((v: JSONObject) => {
+        return this.getAttributeValues(
+          prefixKeysWithString,
+          v,
+        ) as AttributeType;
+      }) as Array<AttributeType>;
+    } else if (
+      value["mapValue"] &&
+      (value["mapValue"] as JSONObject)["fields"]
+    ) {
+      const fields: JSONObject = (value["mapValue"] as JSONObject)?.[
+        "fields"
+      ] as JSONObject;
+
+      const flattenedFields: Dictionary<AttributeType> = {};
+      for (const key in fields) {
+        const prefixKey: string = `${prefixKeysWithString}.${key}`;
+        const nestedValue: AttributeType | Dictionary<AttributeType> =
+          this.getAttributeValues(prefixKey, fields[key]) as AttributeType;
+        if (typeof nestedValue === "object" && nestedValue !== null) {
+          for (const nestedKey in nestedValue as Dictionary<AttributeType>) {
+            flattenedFields[`${prefixKey}.${nestedKey}`] = (
+              nestedValue as Dictionary<AttributeType>
+            )[nestedKey] as AttributeType;
+          }
+        } else {
+          flattenedFields[prefixKey] = nestedValue;
+        }
+      }
+      finalObj = flattenedFields;
     }
-
-    if (data.telemetryServiceName) {
-      (
-        ((finalObj["oneuptime"] as JSONObject)["telemetry"] as JSONObject)[
-          "service"
-        ] as JSONObject
-      )["name"] = data.telemetryServiceName;
+    // kvlistValue
+    else if (
+      value["kvlistValue"] &&
+      (value["kvlistValue"] as JSONObject)["values"]
+    ) {
+      const values: JSONArray = (value["kvlistValue"] as JSONObject)[
+        "values"
+      ] as JSONArray;
+      finalObj = this.getAttributes({
+        prefixKeysWithString,
+        items: values,
+      }) as Dictionary<AttributeType>;
+    } else if (value["nullValue"]) {
+      finalObj = null;
     }
 
-    return JSONFunctions.flattenObject(finalObj);
+    return finalObj;
   }
 }

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

@@ -101,11 +101,11 @@ export default class TelemetryAttribute extends AnalyticsBaseModel {
                     },
                 }),
                 new AnalyticsTableColumn({
-                    key: "attribute",
-                    title: "Attribute",
-                    description: "Attribute",
+                    key: "attributes",
+                    title: "Attributes",
+                    description: "Attributes",
                     required: true,
-                    type: TableColumnType.Text,
+                    type: TableColumnType.JSONArray,
                     accessControl: {
                         read: [
                             Permission.ProjectOwner,
@@ -143,11 +143,11 @@ export default class TelemetryAttribute extends AnalyticsBaseModel {
     set telemetryType(v) {
         this.setColumnValue("telemetryType", v);
     }
-    get attribute() {
-        return this.getColumnValue("attribute");
+    get attributes() {
+        return this.getColumnValue("attributes");
     }
-    set attribute(v) {
-        this.setColumnValue("attribute", v);
+    set attributes(v) {
+        this.setColumnValue("attributes", v);
     }
 }
 //# sourceMappingURL=TelemetryAttribute.js.map

package/build/dist/Models/AnalyticsModels/TelemetryAttribute.js.map

@@ -1 +1 @@
-{"version":3,"file":"TelemetryAttribute.js","sourceRoot":"","sources":["../../../../Models/AnalyticsModels/TelemetryAttribute.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"TelemetryAttribute.js","sourceRoot":"","sources":["../../../../Models/AnalyticsModels/TelemetryAttribute.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,MAAM,yCAAyC,CAAC;AACzE,OAAO,KAAK,MAAM,uBAAuB,CAAC;AAC1C,OAAO,oBAAoB,MAAM,oDAAoD,CAAC;AACtF,OAAO,oBAAoB,MAAM,2CAA2C,CAAC;AAC7E,OAAO,eAAe,MAAM,+CAA+C,CAAC;AAG5E,OAAO,UAAU,MAAM,wBAAwB,CAAC;AAEhD,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,kBAAkB;IAChE;QACE,KAAK,CAAC;YACJ,SAAS,EAAE,oBAAoB;YAC/B,WAAW,EAAE,oBAAoB,CAAC,SAAS;YAC3C,YAAY,EAAE,qBAAqB;YACnC,UAAU,EAAE,sBAAsB;YAClC,WAAW,EAAE,IAAI,KAAK,CAAC,uBAAuB,CAAC;YAC/C,aAAa,EAAE;gBACb,IAAI,EAAE;oBACJ,UAAU,CAAC,YAAY;oBACvB,UAAU,CAAC,YAAY;oBACvB,UAAU,CAAC,aAAa;oBACxB,UAAU,CAAC,0BAA0B;oBACrC,UAAU,CAAC,uBAAuB;oBAClC,UAAU,CAAC,2BAA2B;iBACvC;gBACD,MAAM,EAAE;oBACN,UAAU,CAAC,YAAY;oBACvB,UAAU,CAAC,YAAY;oBACvB,UAAU,CAAC,aAAa;oBACxB,UAAU,CAAC,4BAA4B;oBACvC,UAAU,CAAC,yBAAyB;oBACpC,UAAU,CAAC,6BAA6B;iBACzC;gBACD,MAAM,EAAE;oBACN,UAAU,CAAC,YAAY;oBACvB,UAAU,CAAC,YAAY;oBACvB,UAAU,CAAC,aAAa;oBACxB,UAAU,CAAC,0BAA0B;oBACrC,UAAU,CAAC,uBAAuB;oBAClC,UAAU,CAAC,2BAA2B;iBACvC;gBACD,MAAM,EAAE;oBACN,UAAU,CAAC,YAAY;oBACvB,UAAU,CAAC,YAAY;oBACvB,UAAU,CAAC,aAAa;oBACxB,UAAU,CAAC,4BAA4B;oBACvC,UAAU,CAAC,yBAAyB;oBACpC,UAAU,CAAC,6BAA6B;iBACzC;aACF;YACD,YAAY,EAAE;gBACZ,IAAI,oBAAoB,CAAC;oBACvB,GAAG,EAAE,WAAW;oBAChB,KAAK,EAAE,YAAY;oBACnB,WAAW,EAAE,eAAe;oBAC5B,QAAQ,EAAE,IAAI;oBACd,IAAI,EAAE,eAAe,CAAC,QAAQ;oBAC9B,UAAU,EAAE,IAAI;oBAChB,aAAa,EAAE;wBACb,IAAI,EAAE;4BACJ,UAAU,CAAC,YAAY;4BACvB,UAAU,CAAC,YAAY;4BACvB,UAAU,CAAC,aAAa;4BACxB,UAAU,CAAC,0BAA0B;4BACrC,UAAU,CAAC,uBAAuB;4BAClC,UAAU,CAAC,2BAA2B;yBACvC;wBACD,MAAM,EAAE;4BACN,UAAU,CAAC,YAAY;4BACvB,UAAU,CAAC,YAAY;4BACvB,UAAU,CAAC,aAAa;4BACxB,UAAU,CAAC,0BAA0B;4BACrC,UAAU,CAAC,uBAAuB;4BAClC,UAAU,CAAC,2BAA2B;yBACvC;wBACD,MAAM,EAAE,EAAE;qBACX;iBACF,CAAC;gBAEF,IAAI,oBAAoB,CAAC;oBACvB,GAAG,EAAE,eAAe;oBACpB,KAAK,EAAE,gBAAgB;oBACvB,WAAW,EAAE,mBAAmB;oBAChC,QAAQ,EAAE,IAAI;oBACd,IAAI,EAAE,eAAe,CAAC,IAAI;oBAC1B,aAAa,EAAE;wBACb,IAAI,EAAE;4BACJ,UAAU,CAAC,YAAY;4BACvB,UAAU,CAAC,YAAY;4BACvB,UAAU,CAAC,aAAa;4BACxB,UAAU,CAAC,0BAA0B;4BACrC,UAAU,CAAC,uBAAuB;4BAClC,UAAU,CAAC,2BAA2B;yBACvC;wBACD,MAAM,EAAE;4BACN,UAAU,CAAC,YAAY;4BACvB,UAAU,CAAC,YAAY;4BACvB,UAAU,CAAC,aAAa;4BACxB,UAAU,CAAC,0BAA0B;4BACrC,UAAU,CAAC,uBAAuB;4BAClC,UAAU,CAAC,2BAA2B;yBACvC;wBACD,MAAM,EAAE,EAAE;qBACX;iBACF,CAAC;gBAEF,IAAI,oBAAoB,CAAC;oBACvB,GAAG,EAAE,YAAY;oBACjB,KAAK,EAAE,YAAY;oBACnB,WAAW,EAAE,YAAY;oBACzB,QAAQ,EAAE,IAAI;oBACd,IAAI,EAAE,eAAe,CAAC,SAAS;oBAC/B,aAAa,EAAE;wBACb,IAAI,EAAE;4BACJ,UAAU,CAAC,YAAY;4BACvB,UAAU,CAAC,YAAY;4BACvB,UAAU,CAAC,aAAa;4BACxB,UAAU,CAAC,0BAA0B;4BACrC,UAAU,CAAC,uBAAuB;4BAClC,UAAU,CAAC,2BAA2B;yBACvC;wBACD,MAAM,EAAE;4BACN,UAAU,CAAC,YAAY;4BACvB,UAAU,CAAC,YAAY;4BACvB,UAAU,CAAC,aAAa;4BACxB,UAAU,CAAC,0BAA0B;4BACrC,UAAU,CAAC,uBAAuB;4BAClC,UAAU,CAAC,2BAA2B;yBACvC;wBACD,MAAM,EAAE,EAAE;qBACX;iBACF,CAAC;aACH;YACD,QAAQ,EAAE,CAAC,WAAW,EAAE,eAAe,CAAC;YACxC,WAAW,EAAE,CAAC,WAAW,EAAE,eAAe,CAAC;SAC5C,CAAC,CAAC;IACL,CAAC;IAED,IAAW,SAAS;QAClB,OAAO,IAAI,CAAC,cAAc,CAAC,WAAW,CAAyB,CAAC;IAClE,CAAC;IAED,IAAW,SAAS,CAAC,CAAuB;QAC1C,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;IACtC,CAAC;IAED,IAAW,aAAa;QACtB,OAAO,IAAI,CAAC,cAAc,CAAC,eAAe,CAA8B,CAAC;IAC3E,CAAC;IAED,IAAW,aAAa,CAAC,CAA4B;QACnD,IAAI,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;IAC1C,CAAC;IAED,IAAW,UAAU;QACnB,OAAO,IAAI,CAAC,cAAc,CAAC,YAAY,CAA8B,CAAC;IACxE,CAAC;IAED,IAAW,UAAU,CAAC,CAA4B;QAChD,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;IACvC,CAAC;CACF"}

package/build/dist/Server/API/TelemetryAPI.js

@@ -5,7 +5,6 @@ import BadDataException from "Common/Types/Exception/BadDataException";
 import CommonAPI from "./CommonAPI";
 import TelemetryType from "Common/Types/Telemetry/TelemetryType";
 import TelemetryAttributeService from "../Services/TelemetryAttributeService";
-import ArrayUtil from "Common/Utils/Array";
 const router = Express.getRouter();
 router.post("/telemetry/metrics/get-attributes", UserMiddleware.getUserMiddleware, async (req, res, next) => {
     return getAttributes(req, res, next, TelemetryType.Metric);
@@ -25,10 +24,10 @@ const getAttributes = async (req, res, next, telemetryType) => {
         if (!databaseProps.tenantId) {
             return Response.sendErrorResponse(req, res, new BadDataException("Invalid Project ID"));
         }
-        const attributes = ArrayUtil.removeDuplicates(await TelemetryAttributeService.fetchAttributes({
+        const attributes = await TelemetryAttributeService.fetchAttributes({
             projectId: databaseProps.tenantId,
             telemetryType,
-        }));
+        });
         return Response.sendJsonObjectResponse(req, res, {
             attributes: attributes,
         });

package/build/dist/Server/API/TelemetryAPI.js.map

@@ -1 +1 @@
-{"version":3,"file":"TelemetryAPI.js","sourceRoot":"","sources":["../../../../Server/API/TelemetryAPI.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,iCAAiC,CAAC;AAC7D,OAAO,OAKN,MAAM,kBAAkB,CAAC;AAC1B,OAAO,QAAQ,MAAM,mBAAmB,CAAC;AACzC,OAAO,gBAAgB,MAAM,yCAAyC,CAAC;AACvE,OAAO,SAAS,MAAM,aAAa,CAAC;AAEpC,OAAO,aAAa,MAAM,sCAAsC,CAAC;AACjE,OAAO,yBAAyB,MAAM,uCAAuC,CAAC;AAC9E,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAE3C,MAAM,MAAM,GAAkB,OAAO,CAAC,SAAS,EAAE,CAAC;AAElD,MAAM,CAAC,IAAI,CACT,mCAAmC,EACnC,cAAc,CAAC,iBAAiB,EAChC,KAAK,EAAE,GAAmB,EAAE,GAAoB,EAAE,IAAkB,EAAE,EAAE;IACtE,OAAO,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;AAC7D,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,IAAI,CACT,gCAAgC,EAChC,cAAc,CAAC,iBAAiB,EAChC,KAAK,EAAE,GAAmB,EAAE,GAAoB,EAAE,IAAkB,EAAE,EAAE;IACtE,OAAO,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;AAC1D,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,IAAI,CACT,kCAAkC,EAClC,cAAc,CAAC,iBAAiB,EAChC,KAAK,EAAE,GAAmB,EAAE,GAAoB,EAAE,IAAkB,EAAE,EAAE;IACtE,OAAO,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC;AAC5D,CAAC,CACF,CAAC;AASF,MAAM,aAAa,GAA0B,KAAK,EAChD,GAAmB,EACnB,GAAoB,EACpB,IAAkB,EAClB,aAA4B,EAC5B,EAAE;IACF,IAAI,CAAC;QACH,MAAM,aAAa,GACjB,MAAM,SAAS,CAAC,iCAAiC,CAAC,GAAG,CAAC,CAAC;QAEzD,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,OAAO,QAAQ,CAAC,iBAAiB,CAC/B,GAAG,EACH,GAAG,EACH,IAAI,gBAAgB,CAAC,uBAAuB,CAAC,CAC9C,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC;YAC5B,OAAO,QAAQ,CAAC,iBAAiB,CAC/B,GAAG,EACH,GAAG,EACH,IAAI,gBAAgB,CAAC,oBAAoB,CAAC,CAC3C,CAAC;QACJ,CAAC;QAED,MAAM,UAAU,GAAa,SAAS,CAAC,gBAAgB,CACrD,MAAM,yBAAyB,CAAC,eAAe,CAAC;YAC9C,SAAS,EAAE,aAAa,CAAC,QAAQ;YACjC,aAAa;SACd,CAAC,CACH,CAAC;QAEF,OAAO,QAAQ,CAAC,sBAAsB,CAAC,GAAG,EAAE,GAAG,EAAE;YAC/C,UAAU,EAAE,UAAU;SACvB,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAClB,IAAI,CAAC,GAAG,CAAC,CAAC;IACZ,CAAC;AACH,CAAC,CAAC;AAEF,eAAe,MAAM,CAAC"}
+{"version":3,"file":"TelemetryAPI.js","sourceRoot":"","sources":["../../../../Server/API/TelemetryAPI.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,iCAAiC,CAAC;AAC7D,OAAO,OAKN,MAAM,kBAAkB,CAAC;AAC1B,OAAO,QAAQ,MAAM,mBAAmB,CAAC;AACzC,OAAO,gBAAgB,MAAM,yCAAyC,CAAC;AACvE,OAAO,SAAS,MAAM,aAAa,CAAC;AAEpC,OAAO,aAAa,MAAM,sCAAsC,CAAC;AACjE,OAAO,yBAAyB,MAAM,uCAAuC,CAAC;AAE9E,MAAM,MAAM,GAAkB,OAAO,CAAC,SAAS,EAAE,CAAC;AAElD,MAAM,CAAC,IAAI,CACT,mCAAmC,EACnC,cAAc,CAAC,iBAAiB,EAChC,KAAK,EAAE,GAAmB,EAAE,GAAoB,EAAE,IAAkB,EAAE,EAAE;IACtE,OAAO,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;AAC7D,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,IAAI,CACT,gCAAgC,EAChC,cAAc,CAAC,iBAAiB,EAChC,KAAK,EAAE,GAAmB,EAAE,GAAoB,EAAE,IAAkB,EAAE,EAAE;IACtE,OAAO,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC;AAC1D,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,IAAI,CACT,kCAAkC,EAClC,cAAc,CAAC,iBAAiB,EAChC,KAAK,EAAE,GAAmB,EAAE,GAAoB,EAAE,IAAkB,EAAE,EAAE;IACtE,OAAO,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC;AAC5D,CAAC,CACF,CAAC;AASF,MAAM,aAAa,GAA0B,KAAK,EAChD,GAAmB,EACnB,GAAoB,EACpB,IAAkB,EAClB,aAA4B,EAC5B,EAAE;IACF,IAAI,CAAC;QACH,MAAM,aAAa,GACjB,MAAM,SAAS,CAAC,iCAAiC,CAAC,GAAG,CAAC,CAAC;QAEzD,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,OAAO,QAAQ,CAAC,iBAAiB,CAC/B,GAAG,EACH,GAAG,EACH,IAAI,gBAAgB,CAAC,uBAAuB,CAAC,CAC9C,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC;YAC5B,OAAO,QAAQ,CAAC,iBAAiB,CAC/B,GAAG,EACH,GAAG,EACH,IAAI,gBAAgB,CAAC,oBAAoB,CAAC,CAC3C,CAAC;QACJ,CAAC;QAED,MAAM,UAAU,GACd,MAAM,yBAAyB,CAAC,eAAe,CAAC;YAC9C,SAAS,EAAE,aAAa,CAAC,QAAQ;YACjC,aAAa;SACd,CAAC,CAAC;QAEL,OAAO,QAAQ,CAAC,sBAAsB,CAAC,GAAG,EAAE,GAAG,EAAE;YAC/C,UAAU,EAAE,UAAU;SACvB,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAClB,IAAI,CAAC,GAAG,CAAC,CAAC;IACZ,CAAC;AACH,CAAC,CAAC;AAEF,eAAe,MAAM,CAAC"}

package/build/dist/Server/Services/OpenTelemetryIngestService.js

@@ -8,7 +8,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 import OneUptimeDate from "Common/Types/Date";
-import JSONFunctions from "Common/Types/JSONFunctions";
 import Metric, { AggregationTemporality, } from "Common/Models/AnalyticsModels/Metric";
 import { IsBillingEnabled } from "Common/Server/EnvironmentConfig";
 import TelemetryUsageBillingService from "Common/Server/Services/TelemetryUsageBillingService";
@@ -109,15 +108,14 @@ export default class OTelIngestService {
             if (!newDbMetric.attributes) {
                 newDbMetric.attributes = {};
             }
-            newDbMetric.attributes = Object.assign(Object.assign({}, (newDbMetric.attributes || {})), TelemetryUtil.getAttributes({
+            newDbMetric.attributes = Object.assign(Object.assign({}, TelemetryUtil.getAttributesForServiceIdAndServiceName({
+                serviceId: data.telemetryServiceId,
+                serviceName: data.telemetryServiceName,
+            })), TelemetryUtil.getAttributes({
                 items: datapoint["attributes"],
-                telemetryServiceId: data.telemetryServiceId,
-                telemetryServiceName: data.telemetryServiceName,
+                prefixKeysWithString: "metricAttributes",
             }));
         }
-        if (newDbMetric.attributes) {
-            newDbMetric.attributes = JSONFunctions.flattenObject(newDbMetric.attributes);
-        }
         // aggregationTemporality
         if (aggregationTemporality) {
             if (aggregationTemporality === OtelAggregationTemporality.Cumulative) {

package/build/dist/Server/Services/OpenTelemetryIngestService.js.map

@@ -1 +1 @@
-{"version":3,"file":"OpenTelemetryIngestService.js","sourceRoot":"","sources":["../../../../Server/Services/OpenTelemetryIngestService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"OpenTelemetryIngestService.js","sourceRoot":"","sources":["../../../../Server/Services/OpenTelemetryIngestService.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Services/TelemetryAttributeService.js

@@ -9,35 +9,29 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 import AnalyticsDatabaseService from "./AnalyticsDatabaseService";
 import TelemetryAttribute from "Common/Models/AnalyticsModels/TelemetryAttribute";
-import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 export class TelemetryAttributeService extends AnalyticsDatabaseService {
     constructor(clickhouseDatabase) {
         super({ modelType: TelemetryAttribute, database: clickhouseDatabase });
     }
     async fetchAttributes(data) {
-        const attributes = await this.findBy({
+        const telemetryAttribute = await this.findOneBy({
             query: {
                 projectId: data.projectId,
                 telemetryType: data.telemetryType,
             },
             select: {
-                attribute: true,
+                attributes: true,
             },
-            limit: LIMIT_PER_PROJECT,
-            skip: 0,
             props: {
                 isRoot: true,
             },
         });
-        const dbAttributes = attributes
-            .map((attribute) => {
-            return attribute.attribute;
-        })
-            .filter((attribute) => {
-            return Boolean(attribute);
-        });
-        return dbAttributes.sort();
+        return telemetryAttribute &&
+            telemetryAttribute.attributes &&
+            telemetryAttribute
+            ? telemetryAttribute.attributes
+            : [];
     }
     async refreshAttributes(data) {
         const { projectId, telemetryType, attributes } = data;
@@ -51,17 +45,12 @@ export class TelemetryAttributeService extends AnalyticsDatabaseService {
                 isRoot: true,
             },
         });
-        const telemetryAttributes = [];
-        // insert new attributes
-        for (const attribute of attributes) {
-            const telemetryAttribute = new TelemetryAttribute();
-            telemetryAttribute.projectId = projectId;
-            telemetryAttribute.telemetryType = telemetryType;
-            telemetryAttribute.attribute = attribute;
-            telemetryAttributes.push(telemetryAttribute);
-        }
-        await this.createMany({
-            items: telemetryAttributes,
+        const telemetryAttribute = new TelemetryAttribute();
+        telemetryAttribute.projectId = projectId;
+        telemetryAttribute.telemetryType = telemetryType;
+        telemetryAttribute.attributes = attributes;
+        await this.create({
+            data: telemetryAttribute,
             props: {
                 isRoot: true,
             },

package/build/dist/Server/Services/TelemetryAttributeService.js.map

@@ -1 +1 @@
-{"version":3,"file":"TelemetryAttributeService.js","sourceRoot":"","sources":["../../../../Server/Services/TelemetryAttributeService.ts"],"names":[],"mappings":";;;;;;;;;AAEA,OAAO,wBAAwB,MAAM,4BAA4B,CAAC;AAClE,OAAO,kBAAkB,MAAM,kDAAkD,CAAC;AAClF,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAElE,OAAO,WAAW,MAAM,gCAAgC,CAAC;AAEzD,MAAM,OAAO,yBAA0B,SAAQ,wBAA4C;IACzF,YAAmB,kBAAmD;QACpE,KAAK,CAAC,EAAE,SAAS,EAAE,kBAAkB,EAAE,QAAQ,EAAE,kBAAkB,EAAE,CAAC,CAAC;IACzE,CAAC;IAGY,AAAN,KAAK,CAAC,eAAe,CAAC,IAG5B;QACC,MAAM,UAAU,GAAyB,MAAM,IAAI,CAAC,MAAM,CAAC;YACzD,KAAK,EAAE;gBACL,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,aAAa,EAAE,IAAI,CAAC,aAAa;aAClC;YACD,MAAM,EAAE;gBACN,SAAS,EAAE,IAAI;aAChB;YACD,KAAK,EAAE,iBAAiB;YACxB,IAAI,EAAE,CAAC;YACP,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI;aACb;SACF,CAAC,CAAC;QAEH,MAAM,YAAY,GAAa,UAAU;aACtC,GAAG,CAAC,CAAC,SAA6B,EAAE,EAAE;YACrC,OAAO,SAAS,CAAC,SAAS,CAAC;QAC7B,CAAC,CAAC;aACD,MAAM,CAAC,CAAC,SAA6B,EAAE,EAAE;YACxC,OAAO,OAAO,CAAC,SAAS,CAAC,CAAC;QAC5B,CAAC,CAAa,CAAC;QAEjB,OAAO,YAAY,CAAC,IAAI,EAAE,CAAC;IAC7B,CAAC;IAGY,AAAN,KAAK,CAAC,iBAAiB,CAAC,IAI9B;QACC,MAAM,EAAE,SAAS,EAAE,aAAa,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;QAEtD,6BAA6B;QAC7B,MAAM,IAAI,CAAC,QAAQ,CAAC;YAClB,KAAK,EAAE;gBACL,SAAS;gBACT,aAAa;aACd;YACD,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI;aACb;SACF,CAAC,CAAC;QAEH,MAAM,mBAAmB,GAAyB,EAAE,CAAC;QAErD,wBAAwB;QACxB,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACnC,MAAM,kBAAkB,GAAuB,IAAI,kBAAkB,EAAE,CAAC;YAExE,kBAAkB,CAAC,SAAS,GAAG,SAAS,CAAC;YACzC,kBAAkB,CAAC,aAAa,GAAG,aAAa,CAAC;YACjD,kBAAkB,CAAC,SAAS,GAAG,SAAS,CAAC;YAEzC,mBAAmB,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAC/C,CAAC;QAED,MAAM,IAAI,CAAC,UAAU,CAAC;YACpB,KAAK,EAAE,mBAAmB;YAC1B,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI;aACb;SACF,CAAC,CAAC;IACL,CAAC;CACF;AArEc;IADZ,WAAW,EAAE;;;;gEA6Bb;AAGY;IADZ,WAAW,EAAE;;;;kEAsCb;AAGH,eAAe,IAAI,yBAAyB,EAAE,CAAC"}
+{"version":3,"file":"TelemetryAttributeService.js","sourceRoot":"","sources":["../../../../Server/Services/TelemetryAttributeService.ts"],"names":[],"mappings":";;;;;;;;;AAEA,OAAO,wBAAwB,MAAM,4BAA4B,CAAC;AAClE,OAAO,kBAAkB,MAAM,kDAAkD,CAAC;AAElF,OAAO,WAAW,MAAM,gCAAgC,CAAC;AAEzD,MAAM,OAAO,yBAA0B,SAAQ,wBAA4C;IACzF,YAAmB,kBAAmD;QACpE,KAAK,CAAC,EAAE,SAAS,EAAE,kBAAkB,EAAE,QAAQ,EAAE,kBAAkB,EAAE,CAAC,CAAC;IACzE,CAAC;IAGY,AAAN,KAAK,CAAC,eAAe,CAAC,IAG5B;QACC,MAAM,kBAAkB,GAA8B,MAAM,IAAI,CAAC,SAAS,CAAC;YACzE,KAAK,EAAE;gBACL,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,aAAa,EAAE,IAAI,CAAC,aAAa;aAClC;YACD,MAAM,EAAE;gBACN,UAAU,EAAE,IAAI;aACjB;YACD,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI;aACb;SACF,CAAC,CAAC;QAEH,OAAO,kBAAkB;YACvB,kBAAkB,CAAC,UAAU;YAC7B,kBAAkB;YAClB,CAAC,CAAC,kBAAkB,CAAC,UAAU;YAC/B,CAAC,CAAC,EAAE,CAAC;IACT,CAAC;IAGY,AAAN,KAAK,CAAC,iBAAiB,CAAC,IAI9B;QACC,MAAM,EAAE,SAAS,EAAE,aAAa,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;QAEtD,6BAA6B;QAC7B,MAAM,IAAI,CAAC,QAAQ,CAAC;YAClB,KAAK,EAAE;gBACL,SAAS;gBACT,aAAa;aACd;YACD,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI;aACb;SACF,CAAC,CAAC;QAEH,MAAM,kBAAkB,GAAuB,IAAI,kBAAkB,EAAE,CAAC;QAExE,kBAAkB,CAAC,SAAS,GAAG,SAAS,CAAC;QACzC,kBAAkB,CAAC,aAAa,GAAG,aAAa,CAAC;QACjD,kBAAkB,CAAC,UAAU,GAAG,UAAU,CAAC;QAE3C,MAAM,IAAI,CAAC,MAAM,CAAC;YAChB,IAAI,EAAE,kBAAkB;YACxB,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI;aACb;SACF,CAAC,CAAC;IACL,CAAC;CACF;AAxDc;IADZ,WAAW,EAAE;;;;gEAuBb;AAGY;IADZ,WAAW,EAAE;;;;kEA+Bb;AAGH,eAAe,IAAI,yBAAyB,EAAE,CAAC"}

package/build/dist/Server/Utils/Telemetry/CaptureSpan.js

@@ -32,7 +32,7 @@ function CaptureSpan(data) {
             return Telemetry.startActiveSpan({
                 name: name,
                 options: {
-                    attributes: spanAttributes,
+                    attributes: Object.assign(Object.assign({}, spanAttributes), { hey: "there", thisIsNumber: 123, thisIsBoolean: true, thisIsArray: [1, 2, 3] }),
                 },
                 fn: (span) => {
                     let result = null;

package/build/dist/Server/Utils/Telemetry/CaptureSpan.js.map

@@ -1 +1 @@
-{"version":3,"file":"CaptureSpan.js","sourceRoot":"","sources":["../../../../../Server/Utils/Telemetry/CaptureSpan.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CaptureSpan.js","sourceRoot":"","sources":["../../../../../Server/Utils/Telemetry/CaptureSpan.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Utils/Telemetry/Telemetry.js

@@ -7,21 +7,23 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import JSONFunctions from "../../../Types/JSONFunctions";
-import ArrayUtil from "../../../Utils/Array";
 import GlobalCache from "../../Infrastructure/GlobalCache";
 import TelemetryAttributeService from "../../Services/TelemetryAttributeService";
 import CaptureSpan from "./CaptureSpan";
+import logger from "../Logger";
 export default class TelemetryUtil {
     static async indexAttributes(data) {
         // index attributes
+        logger.debug("Indexing attributes");
+        logger.debug("data: " + JSON.stringify(data, null, 2));
         const cacheKey = data.projectId.toString() + "_" + data.telemetryType;
         // get keys from cache
         const cacheKeys = (await GlobalCache.getStringArray("telemetryAttributesKeys", cacheKey)) ||
             [];
         let isKeysMissingInCache = false;
         // check if keys are missing in cache
-        for (const key of data.attributes) {
+        const attributeKeys = data.attributes;
+        for (const key of attributeKeys) {
             if (!cacheKeys.includes(key)) {
                 isKeysMissingInCache = true;
                 break;
@@ -33,11 +35,7 @@ export default class TelemetryUtil {
                 projectId: data.projectId,
                 telemetryType: data.telemetryType,
             });
-            const mergedKeys = ArrayUtil.removeDuplicates([
-                ...dbKeys,
-                ...data.attributes,
-                ...cacheKeys,
-            ]);
+            const mergedKeys = Array.from(new Set([...dbKeys, ...attributeKeys, ...cacheKeys]));
             await GlobalCache.setStringArray("telemetryAttributesKeys", cacheKey, mergedKeys);
             await TelemetryAttributeService.refreshAttributes({
                 projectId: data.projectId,
@@ -46,65 +44,95 @@ export default class TelemetryUtil {
             });
         }
     }
+    static getAttributesForServiceIdAndServiceName(data) {
+        // get attributes for service id and service name
+        return {
+            "oneuptime.service.id": data.serviceId.toString(),
+            "oneuptime.service.name": data.serviceName,
+        };
+    }
     static getAttributes(data) {
         const { items } = data;
-        const finalObj = {};
-        // We need to convert this to date.
+        let { prefixKeysWithString } = data;
+        if (prefixKeysWithString) {
+            prefixKeysWithString = prefixKeysWithString + ".";
+        }
+        let finalObj = {};
         const attributes = items;
-        const getValue = (value) => {
-            value = value;
-            if (value["stringValue"]) {
-                value = value["stringValue"];
-            }
-            else if (value["intValue"]) {
-                value = value["intValue"];
-            }
-            else if (value["doubleValue"]) {
-                value = value["doubleValue"];
-            }
-            else if (value["boolValue"]) {
-                value = value["boolValue"];
-            }
-            else if (value["arrayValue"] &&
-                value["arrayValue"]["values"]) {
-                value = value["arrayValue"]["values"].map((v) => {
-                    return getValue(v);
-                });
-            }
-            else if (value["mapValue"] &&
-                value["mapValue"]["fields"]) {
-                value = getValue(value["mapValue"]["fields"]);
-            }
-            else if (value["nullValue"]) {
-                value = null;
-            }
-            return value;
-        };
-        if (attributes) {
-            for (const attribute of attributes) {
-                if (attribute["key"] && typeof attribute["key"] === "string") {
-                    const value = getValue(attribute["value"]);
-                    finalObj[attribute["key"]] = value;
+        if (!attributes) {
+            return finalObj;
+        }
+        for (const attribute of attributes) {
+            if (attribute["key"] && typeof attribute["key"] === "string") {
+                const keyWithPrefix = `${prefixKeysWithString}${attribute["key"]}`;
+                const value = this.getAttributeValues(keyWithPrefix, attribute["value"]);
+                if (Array.isArray(value)) {
+                    finalObj = Object.assign(Object.assign({}, finalObj), { [keyWithPrefix]: value });
+                }
+                else if (typeof value === "object" && value !== null) {
+                    finalObj = Object.assign(Object.assign({}, finalObj), value);
+                }
+                else {
+                    finalObj[keyWithPrefix] = value;
                 }
             }
         }
-        // add oneuptime specific attributes
-        if (!finalObj["oneuptime"]) {
-            finalObj["oneuptime"] = {};
+        return finalObj;
+    }
+    static getAttributeValues(prefixKeysWithString, value) {
+        var _a;
+        let finalObj = null;
+        value = value;
+        if (value["stringValue"]) {
+            finalObj = value["stringValue"];
+        }
+        else if (value["intValue"]) {
+            finalObj = value["intValue"];
+        }
+        else if (value["doubleValue"]) {
+            finalObj = value["doubleValue"];
         }
-        if (!finalObj["oneuptime"]["telemetry"]) {
-            finalObj["oneuptime"]["telemetry"] = {};
+        else if (value["boolValue"]) {
+            finalObj = value["boolValue"];
         }
-        if (!finalObj["oneuptime"]["telemetry"]["service"]) {
-            finalObj["oneuptime"]["telemetry"]["service"] = {};
+        else if (value["arrayValue"] &&
+            value["arrayValue"]["values"]) {
+            const values = value["arrayValue"]["values"];
+            finalObj = values.map((v) => {
+                return this.getAttributeValues(prefixKeysWithString, v);
+            });
         }
-        if (data.telemetryServiceId) {
-            finalObj["oneuptime"]["telemetry"]["service"]["id"] = data.telemetryServiceId.toString();
+        else if (value["mapValue"] &&
+            value["mapValue"]["fields"]) {
+            const fields = (_a = value["mapValue"]) === null || _a === void 0 ? void 0 : _a["fields"];
+            const flattenedFields = {};
+            for (const key in fields) {
+                const prefixKey = `${prefixKeysWithString}.${key}`;
+                const nestedValue = this.getAttributeValues(prefixKey, fields[key]);
+                if (typeof nestedValue === "object" && nestedValue !== null) {
+                    for (const nestedKey in nestedValue) {
+                        flattenedFields[`${prefixKey}.${nestedKey}`] = nestedValue[nestedKey];
+                    }
+                }
+                else {
+                    flattenedFields[prefixKey] = nestedValue;
+                }
+            }
+            finalObj = flattenedFields;
+        }
+        // kvlistValue
+        else if (value["kvlistValue"] &&
+            value["kvlistValue"]["values"]) {
+            const values = value["kvlistValue"]["values"];
+            finalObj = this.getAttributes({
+                prefixKeysWithString,
+                items: values,
+            });
         }
-        if (data.telemetryServiceName) {
-            finalObj["oneuptime"]["telemetry"]["service"]["name"] = data.telemetryServiceName;
+        else if (value["nullValue"]) {
+            finalObj = null;
         }
-        return JSONFunctions.flattenObject(finalObj);
+        return finalObj;
     }
 }
 __decorate([

package/build/dist/Server/Utils/Telemetry/Telemetry.js.map

@@ -1 +1 @@
-{"version":3,"file":"Telemetry.js","sourceRoot":"","sources":["../../../../../Server/Utils/Telemetry/Telemetry.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Telemetry.js","sourceRoot":"","sources":["../../../../../Server/Utils/Telemetry/Telemetry.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@oneuptime/common",
-    "version": "7.0.3876",
+    "version": "7.0.3887",
     "description": "",
     "main": "index.js",
     "scripts": {
@@ -77,7 +77,7 @@
         "airtable": "^0.12.2",
         "axios": "^1.7.2",
         "bullmq": "^5.3.3",
-        "Common": "npm:@oneuptime/common@7.0.3876",
+        "Common": "npm:@oneuptime/common@7.0.3887",
         "cookie-parser": "^1.4.7",
         "cors": "^2.8.5",
         "cron-parser": "^4.8.1",