@oneuptime/common 10.0.53 → 10.0.55

package/Server/Services/OnCallDutyPolicyScheduleService.ts

@@ -27,7 +27,7 @@ import UserNotificationSettingService from "./UserNotificationSettingService";
 import NotificationSettingEventType from "../../Types/NotificationSetting/NotificationSettingEventType";
 import BadDataException from "../../Types/Exception/BadDataException";
 import Timezone from "../../Types/Timezone";
-import logger from "../Utils/Logger";
+import logger, { LogAttributes } from "../Utils/Logger";
 import OnCallDutyPolicyFeedService from "./OnCallDutyPolicyFeedService";
 import { OnCallDutyPolicyFeedEventType } from "../../Models/DatabaseModels/OnCallDutyPolicyFeed";
 import { Green500 } from "../../Types/BrandColors";
@@ -68,7 +68,9 @@ export class Service extends DatabaseService<OnCallDutyPolicySchedule> {
         onCallDutyPolicyScheduleId: schedule.id!,
         endsAt: OneUptimeDate.getCurrentDate(),
       }).catch((err: Error) => {
-        logger.error(err);
+        logger.error(err, {
+          projectId: schedule.projectId?.toString(),
+        } as LogAttributes);
       });
     }
 
@@ -310,8 +312,15 @@ export class Service extends DatabaseService<OnCallDutyPolicySchedule> {
                 sendEmailToUserId.toString() +
                 " for schedule: " +
                 data.scheduleId.toString(),
+              {
+                projectId: projectId?.toString(),
+                userId: sendEmailToUserId?.toString(),
+              } as LogAttributes,
             );
-            logger.error(err);
+            logger.error(err, {
+              projectId: projectId?.toString(),
+              userId: sendEmailToUserId?.toString(),
+            } as LogAttributes);
           });
 
           const onCallDutyPolicyId: ObjectID =
@@ -443,8 +452,15 @@ export class Service extends DatabaseService<OnCallDutyPolicySchedule> {
                 sendEmailToUserId.toString() +
                 " for schedule: " +
                 data.scheduleId.toString(),
+              {
+                projectId: projectId?.toString(),
+                userId: sendEmailToUserId?.toString(),
+              } as LogAttributes,
             );
-            logger.error(err);
+            logger.error(err, {
+              projectId: projectId?.toString(),
+              userId: sendEmailToUserId?.toString(),
+            } as LogAttributes);
           });
 
           const onCallDutyPolicyId: ObjectID =
@@ -631,12 +647,14 @@ export class Service extends DatabaseService<OnCallDutyPolicySchedule> {
     logger.debug(
       "refreshCurrentUserIdAndHandoffTimeInSchedule called with scheduleId: " +
         scheduleId.toString(),
+      { onCallDutyPolicyScheduleId: scheduleId.toString() } as LogAttributes,
     );
 
     // get previoius result.
     logger.debug(
       "Fetching previous schedule information for scheduleId: " +
         scheduleId.toString(),
+      { onCallDutyPolicyScheduleId: scheduleId.toString() } as LogAttributes,
     );
     const onCallSchedule: OnCallDutyPolicySchedule | null =
       await this.findOneById({
@@ -657,6 +675,7 @@ export class Service extends DatabaseService<OnCallDutyPolicySchedule> {
     if (!onCallSchedule) {
       logger.debug(
         "Schedule not found for scheduleId: " + scheduleId.toString(),
+        { onCallDutyPolicyScheduleId: scheduleId.toString() } as LogAttributes,
       );
       throw new BadDataException("Schedule not found");
     }
@@ -664,6 +683,7 @@ export class Service extends DatabaseService<OnCallDutyPolicySchedule> {
     logger.debug(
       "Previous schedule information fetched for scheduleId: " +
         scheduleId.toString(),
+      { onCallDutyPolicyScheduleId: scheduleId.toString() } as LogAttributes,
     );
 
     const previousInformation: {
@@ -682,11 +702,14 @@ export class Service extends DatabaseService<OnCallDutyPolicySchedule> {
       nextRosterStartAt: onCallSchedule.rosterNextStartAt || null,
     };
 
-    logger.debug(previousInformation);
+    logger.debug(previousInformation, {
+      onCallDutyPolicyScheduleId: scheduleId.toString(),
+    } as LogAttributes);
 
     logger.debug(
       "Fetching new schedule information for scheduleId: " +
         scheduleId.toString(),
+      { onCallDutyPolicyScheduleId: scheduleId.toString() } as LogAttributes,
     );
 
     const newInformation: {
@@ -698,11 +721,14 @@ export class Service extends DatabaseService<OnCallDutyPolicySchedule> {
       nextRosterStartAt: Date | null;
     } = await this.getCurrrentUserIdAndHandoffTimeInSchedule(scheduleId);
 
-    logger.debug(newInformation);
+    logger.debug(newInformation, {
+      onCallDutyPolicyScheduleId: scheduleId.toString(),
+    } as LogAttributes);
 
     logger.debug(
       "Updating schedule with new information for scheduleId: " +
         scheduleId.toString(),
+      { onCallDutyPolicyScheduleId: scheduleId.toString() } as LogAttributes,
     );
 
     await this.updateOneById({
@@ -724,6 +750,7 @@ export class Service extends DatabaseService<OnCallDutyPolicySchedule> {
     logger.debug(
       "Sending notifications for schedule handoff for scheduleId: " +
         scheduleId.toString(),
+      { onCallDutyPolicyScheduleId: scheduleId.toString() } as LogAttributes,
     );
 
     // send notification to the users.
@@ -743,6 +770,7 @@ export class Service extends DatabaseService<OnCallDutyPolicySchedule> {
     logger.debug(
       "Returning new schedule information for scheduleId: " +
         scheduleId.toString(),
+      { onCallDutyPolicyScheduleId: scheduleId.toString() } as LogAttributes,
     );
 
     return newInformation;
@@ -761,6 +789,7 @@ export class Service extends DatabaseService<OnCallDutyPolicySchedule> {
     logger.debug(
       "getCurrrentUserIdAndHandoffTimeInSchedule called with scheduleId: " +
         scheduleId.toString(),
+      { onCallDutyPolicyScheduleId: scheduleId.toString() } as LogAttributes,
     );
 
     const resultReturn: {
@@ -779,50 +808,68 @@ export class Service extends DatabaseService<OnCallDutyPolicySchedule> {
       nextRosterStartAt: null,
     };
 
-    logger.debug("Fetching events for scheduleId: " + scheduleId.toString());
+    logger.debug("Fetching events for scheduleId: " + scheduleId.toString(), {
+      onCallDutyPolicyScheduleId: scheduleId.toString(),
+    } as LogAttributes);
     const events: Array<CalendarEvent> | null =
       await this.getEventByIndexInSchedule({
         scheduleId: scheduleId,
         getNumberOfEvents: 2,
       });
 
-    logger.debug("Events fetched: " + JSON.stringify(events));
+    logger.debug("Events fetched: " + JSON.stringify(events), {
+      onCallDutyPolicyScheduleId: scheduleId.toString(),
+    } as LogAttributes);
 
     let currentEvent: CalendarEvent | null = events[0] || null;
     let nextEvent: CalendarEvent | null = events[1] || null;
 
-    logger.debug("Current event: " + JSON.stringify(currentEvent));
-    logger.debug("Next event: " + JSON.stringify(nextEvent));
+    logger.debug("Current event: " + JSON.stringify(currentEvent), {
+      onCallDutyPolicyScheduleId: scheduleId.toString(),
+    } as LogAttributes);
+    logger.debug("Next event: " + JSON.stringify(nextEvent), {
+      onCallDutyPolicyScheduleId: scheduleId.toString(),
+    } as LogAttributes);
 
     // if the current event start time in the future then the current event is the next event.
     if (currentEvent && OneUptimeDate.isInTheFuture(currentEvent.start)) {
       logger.debug(
         "Current event is in the future, treating it as next event.",
+        { onCallDutyPolicyScheduleId: scheduleId.toString() } as LogAttributes,
       );
       nextEvent = currentEvent;
       currentEvent = null;
     }
 
     if (currentEvent) {
-      logger.debug("Processing current event: " + JSON.stringify(currentEvent));
+      logger.debug(
+        "Processing current event: " + JSON.stringify(currentEvent),
+        { onCallDutyPolicyScheduleId: scheduleId.toString() } as LogAttributes,
+      );
       const userId: string | undefined = currentEvent?.title; // this is user id in string.
 
       if (userId) {
-        logger.debug("Current userId: " + userId);
+        logger.debug("Current userId: " + userId, {
+          onCallDutyPolicyScheduleId: scheduleId.toString(),
+        } as LogAttributes);
         resultReturn.currentUserId = new ObjectID(userId);
       }
 
       // get handOffTime
       const handOffTime: Date | undefined = currentEvent?.end; // this is user id in string.
       if (handOffTime) {
-        logger.debug("Current handOffTime: " + handOffTime.toISOString());
+        logger.debug("Current handOffTime: " + handOffTime.toISOString(), {
+          onCallDutyPolicyScheduleId: scheduleId.toString(),
+        } as LogAttributes);
         resultReturn.handOffTimeAt = handOffTime;
       }
 
       // get start time
       const startTime: Date | undefined = currentEvent?.start; // this is user id in string.
       if (startTime) {
-        logger.debug("Current rosterStartAt: " + startTime.toISOString());
+        logger.debug("Current rosterStartAt: " + startTime.toISOString(), {
+          onCallDutyPolicyScheduleId: scheduleId.toString(),
+        } as LogAttributes);
         resultReturn.rosterStartAt = startTime;
       }
     }
@@ -830,30 +877,40 @@ export class Service extends DatabaseService<OnCallDutyPolicySchedule> {
     // do the same for next event.
 
     if (nextEvent) {
-      logger.debug("Processing next event: " + JSON.stringify(nextEvent));
+      logger.debug("Processing next event: " + JSON.stringify(nextEvent), {
+        onCallDutyPolicyScheduleId: scheduleId.toString(),
+      } as LogAttributes);
       const userId: string | undefined = nextEvent?.title; // this is user id in string.
 
       if (userId) {
-        logger.debug("Next userId: " + userId);
+        logger.debug("Next userId: " + userId, {
+          onCallDutyPolicyScheduleId: scheduleId.toString(),
+        } as LogAttributes);
         resultReturn.nextUserId = new ObjectID(userId);
       }
 
       // get handOffTime
       const handOffTime: Date | undefined = nextEvent?.end; // this is user id in string.
       if (handOffTime) {
-        logger.debug("Next handOffTime: " + handOffTime.toISOString());
+        logger.debug("Next handOffTime: " + handOffTime.toISOString(), {
+          onCallDutyPolicyScheduleId: scheduleId.toString(),
+        } as LogAttributes);
         resultReturn.nextHandOffTimeAt = handOffTime;
       }
 
       // get start time
       const startTime: Date | undefined = nextEvent?.start; // this is user id in string.
       if (startTime) {
-        logger.debug("Next rosterStartAt: " + startTime.toISOString());
+        logger.debug("Next rosterStartAt: " + startTime.toISOString(), {
+          onCallDutyPolicyScheduleId: scheduleId.toString(),
+        } as LogAttributes);
         resultReturn.nextRosterStartAt = startTime;
       }
     }
 
-    logger.debug("Returning result: " + JSON.stringify(resultReturn));
+    logger.debug("Returning result: " + JSON.stringify(resultReturn), {
+      onCallDutyPolicyScheduleId: scheduleId.toString(),
+    } as LogAttributes);
     return resultReturn;
   }
 
@@ -944,32 +1001,46 @@ export class Service extends DatabaseService<OnCallDutyPolicySchedule> {
   }): Promise<Array<CalendarEvent>> {
     logger.debug(
       "getEventByIndexInSchedule called with data: " + JSON.stringify(data),
+      {
+        onCallDutyPolicyScheduleId: data.scheduleId.toString(),
+      } as LogAttributes,
     );
 
     const layerProps: Array<LayerProps> = await this.getScheduleLayerProps({
       scheduleId: data.scheduleId,
     });
 
-    logger.debug("Layer properties fetched: " + JSON.stringify(layerProps));
+    logger.debug("Layer properties fetched: " + JSON.stringify(layerProps), {
+      onCallDutyPolicyScheduleId: data.scheduleId.toString(),
+    } as LogAttributes);
 
     if (layerProps.length === 0) {
       logger.debug(
         "No layers found for scheduleId: " + data.scheduleId.toString(),
+        {
+          onCallDutyPolicyScheduleId: data.scheduleId.toString(),
+        } as LogAttributes,
       );
       return [];
     }
 
     const currentStartTime: Date = OneUptimeDate.getCurrentDate();
-    logger.debug("Current start time: " + currentStartTime.toISOString());
+    logger.debug("Current start time: " + currentStartTime.toISOString(), {
+      onCallDutyPolicyScheduleId: data.scheduleId.toString(),
+    } as LogAttributes);
 
     const currentEndTime: Date = OneUptimeDate.addRemoveYears(
       currentStartTime,
       1,
     );
-    logger.debug("Current end time: " + currentEndTime.toISOString());
+    logger.debug("Current end time: " + currentEndTime.toISOString(), {
+      onCallDutyPolicyScheduleId: data.scheduleId.toString(),
+    } as LogAttributes);
 
     const numberOfEventsToGet: number = data.getNumberOfEvents;
-    logger.debug("Number of events to get: " + numberOfEventsToGet);
+    logger.debug("Number of events to get: " + numberOfEventsToGet, {
+      onCallDutyPolicyScheduleId: data.scheduleId.toString(),
+    } as LogAttributes);
 
     const events: Array<CalendarEvent> = this.layerUtil.getMultiLayerEvents(
       {
@@ -982,7 +1053,9 @@ export class Service extends DatabaseService<OnCallDutyPolicySchedule> {
       },
     );
 
-    logger.debug("Events fetched: " + JSON.stringify(events));
+    logger.debug("Events fetched: " + JSON.stringify(events), {
+      onCallDutyPolicyScheduleId: data.scheduleId.toString(),
+    } as LogAttributes);
 
     return events;
   }

package/Server/Services/OnCallDutyPolicyService.ts

@@ -30,7 +30,7 @@ import QueryOperator from "../../Types/BaseDatabase/QueryOperator";
 import WorkspaceNotificationRuleService, {
   MessageBlocksByWorkspaceType,
 } from "./WorkspaceNotificationRuleService";
-import logger from "../Utils/Logger";
+import logger, { LogAttributes } from "../Utils/Logger";
 import OnCallDutyPolicyWorkspaceMessages from "../Utils/Workspace/WorkspaceMessages/OnCallDutyPolicy";
 import OnCallDutyPolicyFeedService from "./OnCallDutyPolicyFeedService";
 import { OnCallDutyPolicyFeedEventType } from "../../Models/DatabaseModels/OnCallDutyPolicyFeed";
@@ -187,6 +187,7 @@ ${onCallPolicy.description || "No description provided."}
       } catch (error) {
         logger.error(
           `Error while archiving workspace channels for onCallDutyPolicy ${deleteBy.query._id}: ${error}`,
+          { projectId: (projectId as ObjectID)?.toString() } as LogAttributes,
         );
       }
     }

package/Server/Services/OpenTelemetryIngestService.ts

@@ -45,25 +45,56 @@ export default class OTelIngestService {
     });
 
     if (!service) {
-      // create service
-
-      const newService: Service = new Service();
-      newService.projectId = data.projectId;
-      newService.name = data.serviceName;
-      newService.description = data.serviceName;
-      newService.retainTelemetryDataForDays = DEFAULT_RETENTION_IN_DAYS;
-
-      const createdService: Service = await ServiceService.create({
-        data: newService,
-        props: {
-          isRoot: true,
-        },
-      });
-
-      return {
-        serviceId: createdService.id!,
-        dataRententionInDays: DEFAULT_RETENTION_IN_DAYS,
-      };
+      try {
+        const newService: Service = new Service();
+        newService.projectId = data.projectId;
+        newService.name = data.serviceName;
+        newService.description = data.serviceName;
+        newService.retainTelemetryDataForDays = DEFAULT_RETENTION_IN_DAYS;
+
+        const createdService: Service = await ServiceService.create({
+          data: newService,
+          props: {
+            isRoot: true,
+          },
+        });
+
+        return {
+          serviceId: createdService.id!,
+          dataRententionInDays: DEFAULT_RETENTION_IN_DAYS,
+        };
+      } catch {
+        /*
+         * Race condition: another request created the service concurrently.
+         * Re-fetch the existing service.
+         */
+        const existingService: Service | null = await ServiceService.findOneBy({
+          query: {
+            projectId: data.projectId,
+            name: data.serviceName,
+          },
+          select: {
+            _id: true,
+            retainTelemetryDataForDays: true,
+          },
+          props: {
+            isRoot: true,
+          },
+        });
+
+        if (existingService) {
+          return {
+            serviceId: existingService.id!,
+            dataRententionInDays:
+              existingService.retainTelemetryDataForDays ||
+              DEFAULT_RETENTION_IN_DAYS,
+          };
+        }
+
+        throw new Error(
+          "Failed to create or find service: " + data.serviceName,
+        );
+      }
     }
 
     return {
@@ -167,7 +198,7 @@ export default class OTelIngestService {
         }),
         ...TelemetryUtil.getAttributes({
           items: (datapoint["attributes"] as JSONArray) || [],
-          prefixKeysWithString: "metricAttributes",
+          prefixKeysWithString: "",
         }),
       };
     }

package/Server/Services/ProbeService.ts

@@ -19,7 +19,7 @@ import Dictionary from "../../Types/Dictionary";
 import OneUptimeDate from "../../Types/Date";
 import UserNotificationSettingService from "./UserNotificationSettingService";
 import NotificationSettingEventType from "../../Types/NotificationSetting/NotificationSettingEventType";
-import logger from "../Utils/Logger";
+import logger, { LogAttributes } from "../Utils/Logger";
 import { CallRequestMessage } from "../../Types/Call/CallRequest";
 import { SMSMessage } from "../../Types/SMS/SMS";
 import { EmailEnvelope } from "../../Types/Email/EmailMessage";
@@ -56,8 +56,10 @@ export class Service extends DatabaseService<Model> {
         OneUptimeDate.toString(lastAlive),
       );
     } catch (err) {
-      logger.error("Error in saving last alive in cache");
-      logger.error(err);
+      logger.error("Error in saving last alive in cache", {
+        projectId: probeId?.toString(),
+      } as LogAttributes);
+      logger.error(err, { projectId: probeId?.toString() } as LogAttributes);
     }
   }
 
@@ -95,8 +97,10 @@ export class Service extends DatabaseService<Model> {
       await this.saveLastAliveInCache(probeId, now);
     } catch (err) {
       // failed to hit the cache, so we will hit the database
-      logger.error("Error in getting last alive from cache");
-      logger.error(err);
+      logger.error("Error in getting last alive from cache", {
+        probeId: probeId?.toString(),
+      } as LogAttributes);
+      logger.error(err, { probeId: probeId?.toString() } as LogAttributes);
     }
 
     return true;
@@ -413,8 +417,13 @@ export class Service extends DatabaseService<Model> {
           eventType,
         });
       } catch (e) {
-        logger.error("Error in sending incident created resource notification");
-        logger.error(e);
+        logger.error(
+          "Error in sending incident created resource notification",
+          { projectId: probe.projectId?.toString() } as LogAttributes,
+        );
+        logger.error(e, {
+          projectId: probe.projectId?.toString(),
+        } as LogAttributes);
       }
     }
   }

package/Server/Services/ProjectService.ts

@@ -13,7 +13,7 @@ import FindBy from "../Types/Database/FindBy";
 import { OnCreate, OnDelete, OnFind, OnUpdate } from "../Types/Database/Hooks";
 import QueryHelper from "../Types/Database/QueryHelper";
 import UpdateBy from "../Types/Database/UpdateBy";
-import logger from "../Utils/Logger";
+import logger, { LogAttributes } from "../Utils/Logger";
 import Errors from "../Utils/Errors";
 import AccessTokenService from "./AccessTokenService";
 import BillingService from "./BillingService";
@@ -117,7 +117,9 @@ export class ProjectService extends DatabaseService<Model> {
       );
     }
 
-    logger.debug("Creating project for user " + data.props.userId);
+    logger.debug("Creating project for user " + data.props.userId, {
+      userId: data.props.userId?.toString(),
+    } as LogAttributes);
 
     const user: User | null = await UserService.findOneById({
       id: data.props.userId,
@@ -372,6 +374,7 @@ export class ProjectService extends DatabaseService<Model> {
           } catch (err) {
             logger.error(
               `[Invoice Email] Failed to update Stripe customer business details: ${err}`,
+              { projectId: updateBy.query._id?.toString() } as LogAttributes,
             );
           }
         } else {
@@ -481,6 +484,7 @@ export class ProjectService extends DatabaseService<Model> {
 
     logger.debug(
       `Changing plan for project ${project.id?.toString()} to ${plan.getName()} with seats ${seats}`,
+      { projectId: project.id?.toString() } as LogAttributes,
     );
 
     const endTrialAt: Date | undefined =
@@ -582,7 +586,9 @@ export class ProjectService extends DatabaseService<Model> {
         url: URL.fromString(NotificationSlackWebhookOnSubscriptionUpdate),
         text: slackMessage,
       }).catch((error: Exception) => {
-        logger.error("Error sending slack message: " + error);
+        logger.error("Error sending slack message: " + error, {
+          projectId: project?.id?.toString(),
+        } as LogAttributes);
       });
     }
   }
@@ -787,7 +793,9 @@ export class ProjectService extends DatabaseService<Model> {
           url: URL.fromString(NotificationSlackWebhookOnCreateProject),
           text: slackMessage,
         }).catch((error: Exception) => {
-          logger.error("Error sending slack message: " + error);
+          logger.error("Error sending slack message: " + error, {
+            projectId: createdItem.id?.toString(),
+          } as LogAttributes);
         });
       }
     }
@@ -1380,7 +1388,9 @@ export class ProjectService extends DatabaseService<Model> {
           text: slackMessage,
         }).catch((err: Error) => {
           // log this error but do not throw it. Not important enough to stop the process.
-          logger.error(err);
+          logger.error(err, {
+            projectId: project?.id?.toString(),
+          } as LogAttributes);
         });
       }
     }
@@ -1477,14 +1487,18 @@ export class ProjectService extends DatabaseService<Model> {
           userId: owner.id!,
         },
       ).catch((err: Error) => {
-        logger.error(err);
+        logger.error(err, {
+          projectId: projectId?.toString(),
+        } as LogAttributes);
       });
     }
   }
 
   @CaptureSpan()
   public async reactiveSubscription(projectId: ObjectID): Promise<void> {
-    logger.debug("Reactivating subscription for project " + projectId);
+    logger.debug("Reactivating subscription for project " + projectId, {
+      projectId: projectId?.toString(),
+    } as LogAttributes);
 
     const project: Model | null = await this.findOneById({
       id: projectId!,

package/Server/Services/ScheduledMaintenanceFeedService.ts

@@ -4,7 +4,7 @@ import OneUptimeDate from "../../Types/Date";
 import BadDataException from "../../Types/Exception/BadDataException";
 import ObjectID from "../../Types/ObjectID";
 import { IsBillingEnabled } from "../EnvironmentConfig";
-import logger from "../Utils/Logger";
+import logger, { LogAttributes } from "../Utils/Logger";
 import DatabaseService from "./DatabaseService";
 import Model, {
   ScheduledMaintenanceFeedEventType,
@@ -105,16 +105,29 @@ export class Service extends DatabaseService<Model> {
           });
         }
       } catch (e) {
-        logger.error("Error in sending notification to slack and teams");
-        logger.error(e);
+        logger.error("Error in sending notification to slack and teams", {
+          projectId: data.projectId?.toString(),
+          scheduledMaintenanceId: data.scheduledMaintenanceId?.toString(),
+        } as LogAttributes);
+        logger.error(e, {
+          projectId: data.projectId?.toString(),
+          scheduledMaintenanceId: data.scheduledMaintenanceId?.toString(),
+        } as LogAttributes);
 
         // we dont throw this error as it is not a critical error
       }
     } catch (error) {
       logger.error(
         "ScheduledMaintenanceFeedService.createScheduledMaintenanceFeedItem",
+        {
+          projectId: data.projectId?.toString(),
+          scheduledMaintenanceId: data.scheduledMaintenanceId?.toString(),
+        } as LogAttributes,
       );
-      logger.error(error);
+      logger.error(error, {
+        projectId: data.projectId?.toString(),
+        scheduledMaintenanceId: data.scheduledMaintenanceId?.toString(),
+      } as LogAttributes);
       // we dont want to throw the error here, as this is not critical but we still log it.
     }
   }