@oneuptime/common 10.0.52 → 10.0.54

package/Server/Services/TeamMemberService.ts

@@ -8,7 +8,7 @@ import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 import Select from "../Types/Database/Select";
 import UpdateBy from "../Types/Database/UpdateBy";
 import Errors from "../Utils/Errors";
-import logger from "../Utils/Logger";
+import logger, { LogAttributes } from "../Utils/Logger";
 import AccessTokenService from "./AccessTokenService";
 import BillingService from "./BillingService";
 import DatabaseService from "./DatabaseService";
@@ -180,7 +180,10 @@ export class TeamMemberService extends DatabaseService<TeamMember> {
             userId: user.id!,
           },
         ).catch((err: Error) => {
-          logger.error(err);
+          logger.error(err, {
+            projectId: createBy.data.projectId?.toString(),
+            userId: user?.id?.toString(),
+          } as LogAttributes);
         });
       }
     }
@@ -326,7 +329,10 @@ export class TeamMemberService extends DatabaseService<TeamMember> {
         userId: member.userId!,
         endsAt: OneUptimeDate.getCurrentDate(),
       }).catch((err: Error) => {
-        logger.error(err);
+        logger.error(err, {
+          projectId: member.projectId?.toString(),
+          userId: member.userId?.toString(),
+        } as LogAttributes);
       });
 
       if (member.team?.shouldHaveAtLeastOneMember) {

package/Server/Services/TelemetryAttributeService.ts

@@ -71,6 +71,7 @@ export class TelemetryAttributeService {
   public async fetchAttributes(data: {
     projectId: ObjectID;
     telemetryType: TelemetryType;
+    metricName?: string | undefined;
   }): Promise<string[]> {
     const source: TelemetrySource | null = this.getTelemetrySource(
       data.telemetryType,
@@ -83,6 +84,7 @@ export class TelemetryAttributeService {
     const cacheKey: string = TelemetryAttributeService.getCacheKey(
       data.projectId,
       data.telemetryType,
+      data.metricName,
     );
 
     const cachedEntry: TelemetryAttributesCacheEntry | null =
@@ -98,6 +100,7 @@ export class TelemetryAttributeService {
       attributes = await TelemetryAttributeService.fetchAttributesFromDatabase({
         projectId: data.projectId,
         source,
+        metricName: data.metricName,
       });
     } catch (error) {
       if (cachedEntry) {
@@ -122,8 +125,13 @@ export class TelemetryAttributeService {
   private static getCacheKey(
     projectId: ObjectID,
     telemetryType: TelemetryType,
+    metricName?: string | undefined,
   ): string {
-    return `${projectId.toString()}:${telemetryType}`;
+    const base: string = `${projectId.toString()}:${telemetryType}`;
+    if (metricName) {
+      return `${base}:${metricName}`;
+    }
+    return base;
   }
 
   private static getLookbackStartDate(): Date {
@@ -219,6 +227,7 @@ export class TelemetryAttributeService {
     attributesColumn: string;
     attributeKeysColumn: string;
     timeColumn: string;
+    metricName?: string | undefined;
   }): Statement {
     const lookbackStartDate: Date =
       TelemetryAttributeService.getLookbackStartDate();
@@ -244,7 +253,20 @@ export class TelemetryAttributeService {
           AND ${data.timeColumn} >= ${{
             type: TableColumnType.Date,
             value: lookbackStartDate,
-          }}
+          }}`;
+
+    if (data.metricName) {
+      statement.append(
+        SQL`
+          AND name = ${{
+            type: TableColumnType.Text,
+            value: data.metricName,
+          }}`,
+      );
+    }
+
+    statement.append(
+      SQL`
         ORDER BY ${data.timeColumn} DESC
         LIMIT ${{
           type: TableColumnType.Number,
@@ -258,8 +280,8 @@ export class TelemetryAttributeService {
       LIMIT ${{
         type: TableColumnType.Number,
         value: TelemetryAttributeService.ATTRIBUTES_LIMIT,
-      }}
-    `;
+      }}`,
+    );
 
     return statement;
   }
@@ -267,6 +289,7 @@ export class TelemetryAttributeService {
   private static async fetchAttributesFromDatabase(data: {
     projectId: ObjectID;
     source: TelemetrySource;
+    metricName?: string | undefined;
   }): Promise<Array<string>> {
     const statement: Statement =
       TelemetryAttributeService.buildAttributesStatement({
@@ -275,6 +298,7 @@ export class TelemetryAttributeService {
         attributesColumn: data.source.attributesColumn,
         attributeKeysColumn: data.source.attributeKeysColumn,
         timeColumn: data.source.timeColumn,
+        metricName: data.metricName,
       });
 
     const dbResult: Results = await data.source.service.executeQuery(statement);
@@ -295,6 +319,95 @@ export class TelemetryAttributeService {
 
     return Array.from(new Set(attributeKeys));
   }
+
+  private static readonly ATTRIBUTE_VALUES_LIMIT: number = 100;
+
+  @CaptureSpan()
+  public async fetchAttributeValues(data: {
+    projectId: ObjectID;
+    telemetryType: TelemetryType;
+    metricName?: string | undefined;
+    attributeKey: string;
+  }): Promise<string[]> {
+    const source: TelemetrySource | null = this.getTelemetrySource(
+      data.telemetryType,
+    );
+
+    if (!source) {
+      return [];
+    }
+
+    return TelemetryAttributeService.fetchAttributeValuesFromDatabase({
+      projectId: data.projectId,
+      source,
+      metricName: data.metricName,
+      attributeKey: data.attributeKey,
+    });
+  }
+
+  private static async fetchAttributeValuesFromDatabase(data: {
+    projectId: ObjectID;
+    source: TelemetrySource;
+    metricName?: string | undefined;
+    attributeKey: string;
+  }): Promise<Array<string>> {
+    const lookbackStartDate: Date =
+      TelemetryAttributeService.getLookbackStartDate();
+
+    const statement: Statement = SQL`
+      SELECT DISTINCT ${data.source.attributesColumn}[${{
+        type: TableColumnType.Text,
+        value: data.attributeKey,
+      }}] AS attributeValue
+      FROM ${data.source.tableName}
+      WHERE projectId = ${{
+        type: TableColumnType.ObjectID,
+        value: data.projectId,
+      }}
+        AND ${data.source.timeColumn} >= ${{
+          type: TableColumnType.Date,
+          value: lookbackStartDate,
+        }}
+        AND mapContains(${data.source.attributesColumn}, ${{
+          type: TableColumnType.Text,
+          value: data.attributeKey,
+        }})`;
+
+    if (data.metricName) {
+      statement.append(
+        SQL`
+        AND name = ${{
+          type: TableColumnType.Text,
+          value: data.metricName,
+        }}`,
+      );
+    }
+
+    statement.append(
+      SQL`
+      ORDER BY attributeValue ASC
+      LIMIT ${{
+        type: TableColumnType.Number,
+        value: TelemetryAttributeService.ATTRIBUTE_VALUES_LIMIT,
+      }}`,
+    );
+
+    const dbResult: Results = await data.source.service.executeQuery(statement);
+    const response: DbJSONResponse = await dbResult.json<{
+      data?: Array<JSONObject>;
+    }>();
+
+    const rows: Array<JSONObject> = response.data || [];
+
+    return rows
+      .map((row: JSONObject) => {
+        const val: unknown = row["attributeValue"];
+        return typeof val === "string" ? val.trim() : null;
+      })
+      .filter((val: string | null): val is string => {
+        return Boolean(val);
+      });
+  }
 }
 
 export default new TelemetryAttributeService();

package/Server/Services/UserNotificationRuleService.ts

@@ -66,7 +66,7 @@ import NotificationRuleEventType from "../../Types/Workspace/NotificationRules/E
 import NotificationRuleWorkspaceChannel from "../../Types/Workspace/NotificationRules/NotificationRuleWorkspaceChannel";
 import PushNotificationUtil from "../Utils/PushNotificationUtil";
 import PushNotificationMessage from "../../Types/PushNotification/PushNotificationMessage";
-import logger from "../Utils/Logger";
+import logger, { LogAttributes } from "../Utils/Logger";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 
 export interface NotificationMethodDescriptor {
@@ -2207,7 +2207,10 @@ export class Service extends DatabaseService<Model> {
       incidentId: options.triggeredByIncidentId,
       userId: userId,
     }).catch((error: Error) => {
-      logger.error(error);
+      logger.error(error, {
+        projectId: options.projectId?.toString(),
+        userId: userId?.toString(),
+      } as LogAttributes);
     });
   }
 
@@ -2266,7 +2269,10 @@ export class Service extends DatabaseService<Model> {
         userIds: [data.userId],
       },
     ).catch((error: Error) => {
-      logger.error(error);
+      logger.error(error, {
+        projectId: data.projectId?.toString(),
+        userId: data.userId?.toString(),
+      } as LogAttributes);
     });
   }
 

package/Server/Services/UserService.ts

@@ -6,7 +6,7 @@ import {
 import { OnCreate, OnDelete, OnUpdate } from "../Types/Database/Hooks";
 import UpdateBy from "../Types/Database/UpdateBy";
 import DeleteBy from "../Types/Database/DeleteBy";
-import logger from "../Utils/Logger";
+import logger, { LogAttributes } from "../Utils/Logger";
 import DatabaseService from "./DatabaseService";
 import EmailVerificationTokenService from "./EmailVerificationTokenService";
 import MailService from "./MailService";
@@ -97,7 +97,9 @@ export class Service extends DatabaseService<Model> {
   *Company:* ${createdItem.companyName?.toString() || "N/A"}`,
       }).catch((err: Error) => {
         // log this error but do not throw it. Not important enough to stop the process.
-        logger.error(err);
+        logger.error(err, {
+          userId: createdItem.id?.toString(),
+        } as LogAttributes);
       });
     }
 
@@ -267,7 +269,7 @@ export class Service extends DatabaseService<Model> {
             homeURL: new URL(httpProtocol, host).toString(),
           },
         }).catch((err: Error) => {
-          logger.error(err);
+          logger.error(err, { userId: user.id?.toString() } as LogAttributes);
         });
       }
     }
@@ -378,7 +380,7 @@ export class Service extends DatabaseService<Model> {
               homeUrl: new URL(httpProtocol, host).toString(),
             },
           }).catch((err: Error) => {
-            logger.error(err);
+            logger.error(err, { userId: user.id?.toString() } as LogAttributes);
           });
 
           await this.updateOneBy({

package/Server/Services/UserWhatsAppService.ts

@@ -2,7 +2,7 @@ import { IsBillingEnabled } from "../EnvironmentConfig";
 import CreateBy from "../Types/Database/CreateBy";
 import DeleteBy from "../Types/Database/DeleteBy";
 import { OnCreate, OnDelete } from "../Types/Database/Hooks";
-import logger from "../Utils/Logger";
+import logger, { LogAttributes } from "../Utils/Logger";
 import DatabaseService from "./DatabaseService";
 import ProjectService from "./ProjectService";
 import UserNotificationRuleService from "./UserNotificationRuleService";
@@ -117,7 +117,10 @@ export class Service extends DatabaseService<Model> {
   ): Promise<Model> {
     if (!createdItem.isVerified) {
       this.sendVerificationCode(createdItem).catch((error: Error) => {
-        logger.error(error);
+        logger.error(error, {
+          projectId: createdItem.projectId?.toString(),
+          userId: createdItem.userId?.toString(),
+        } as LogAttributes);
       });
     }
 
@@ -167,7 +170,10 @@ export class Service extends DatabaseService<Model> {
 
   public async sendVerificationCode(item: Model): Promise<void> {
     if (!item.projectId || !item.userId || !item.phone) {
-      logger.warn("Cannot send WhatsApp verification code. Missing data.");
+      logger.warn("Cannot send WhatsApp verification code. Missing data.", {
+        projectId: item.projectId?.toString(),
+        userId: item.userId?.toString(),
+      } as LogAttributes);
       throw new BadDataException(
         "Unable to send WhatsApp verification code. Please remove this number and add it again.",
       );

package/Server/Services/WorkflowService.ts

@@ -16,7 +16,7 @@ import {
 } from "../../Types/Workflow/Component";
 import API from "../../Utils/API";
 import Model from "../../Models/DatabaseModels/Workflow";
-import logger from "../Utils/Logger";
+import logger, { LogAttributes } from "../Utils/Logger";
 import UUID from "../../Utils/UUID";
 
 export class Service extends DatabaseService<Model> {
@@ -93,7 +93,9 @@ export class Service extends DatabaseService<Model> {
       });
     }
 
-    logger.debug("Updating workflow on the workflow service");
+    logger.debug("Updating workflow on the workflow service", {
+      workflowId: onUpdate.updateBy.query._id?.toString(),
+    } as LogAttributes);
 
     await API.post<EmptyResponseData>({
       url: new URL(
@@ -107,7 +109,9 @@ export class Service extends DatabaseService<Model> {
       },
     });
 
-    logger.debug("Updated workflow on the workflow service");
+    logger.debug("Updated workflow on the workflow service", {
+      workflowId: onUpdate.updateBy.query._id?.toString(),
+    } as LogAttributes);
 
     return onUpdate;
   }