@oneuptime/common 10.0.53 → 10.0.54

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

@@ -10,7 +10,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 import BadRequestException from "../../Types/Exception/BadRequestException";
 import LocalCache from "../Infrastructure/LocalCache";
 import Express from "../Utils/Express";
-import logger from "../Utils/Logger";
+import logger, { getLogAttributesFromRequest } from "../Utils/Logger";
 import Response from "../Utils/Response";
 import Telemetry from "../Utils/Telemetry";
 import Exception from "../../Types/Exception/Exception";
@@ -49,7 +49,7 @@ export default class StatusAPI {
         // General status
         router.get("/status", (req, res) => {
             statusCheckSuccessCounter.add(1);
-            logger.info("Status check: ok");
+            logger.info("Status check: ok", getLogAttributesFromRequest(req));
             Response.sendJsonObjectResponse(req, res, {
                 status: "ok",
             });
@@ -78,48 +78,48 @@ export default class StatusAPI {
     }
     static async handleReadyCheck(options, stausReadySuccess, stausReadyFailed, req, res) {
         try {
-            logger.info("Ready check: Init");
+            logger.info("Ready check: Init", getLogAttributesFromRequest(req));
             await options.readyCheck();
-            logger.info("Ready check: ok");
+            logger.info("Ready check: ok", getLogAttributesFromRequest(req));
             stausReadySuccess.add(1);
             Response.sendJsonObjectResponse(req, res, {
                 status: "ok",
             });
         }
         catch (e) {
-            logger.error("Ready check: failed");
-            logger.error(e);
+            logger.error("Ready check: failed", getLogAttributesFromRequest(req));
+            logger.error(e, getLogAttributesFromRequest(req));
             stausReadyFailed.add(1);
             Response.sendErrorResponse(req, res, e instanceof Exception ? e : new ServerException("Server is not ready"));
         }
     }
     static async handleLiveCheck(options, stausLiveSuccess, stausLiveFailed, req, res) {
         try {
-            logger.info("Live check: Init");
+            logger.info("Live check: Init", getLogAttributesFromRequest(req));
             await options.liveCheck();
-            logger.info("Live check: ok");
+            logger.info("Live check: ok", getLogAttributesFromRequest(req));
             stausLiveSuccess.add(1);
             Response.sendJsonObjectResponse(req, res, {
                 status: "ok",
             });
         }
         catch (e) {
-            logger.error("Live check: failed");
-            logger.error(e);
+            logger.error("Live check: failed", getLogAttributesFromRequest(req));
+            logger.error(e, getLogAttributesFromRequest(req));
             stausLiveFailed.add(1);
             Response.sendErrorResponse(req, res, e instanceof Exception ? e : new ServerException("Server is not ready"));
         }
     }
     static async handleGlobalCacheCheck(options, req, res) {
         try {
-            logger.debug("Global cache check");
+            logger.debug("Global cache check", getLogAttributesFromRequest(req));
             if (options.globalCacheCheck) {
                 await options.globalCacheCheck();
             }
             else {
                 throw new BadRequestException("Global cache check not implemented");
             }
-            logger.info("Global cache check: ok");
+            logger.info("Global cache check: ok", getLogAttributesFromRequest(req));
             Response.sendJsonObjectResponse(req, res, {
                 status: "ok",
             });
@@ -132,14 +132,14 @@ export default class StatusAPI {
     }
     static async handleAnalyticsDatabaseCheck(options, req, res) {
         try {
-            logger.debug("Analytics database check");
+            logger.debug("Analytics database check", getLogAttributesFromRequest(req));
             if (options.analyticsDatabaseCheck) {
                 await options.analyticsDatabaseCheck();
             }
             else {
                 throw new BadRequestException("Analytics database check not implemented");
             }
-            logger.info("Analytics database check: ok");
+            logger.info("Analytics database check: ok", getLogAttributesFromRequest(req));
             Response.sendJsonObjectResponse(req, res, {
                 status: "ok",
             });
@@ -152,14 +152,14 @@ export default class StatusAPI {
     }
     static async handleDatabaseCheck(options, req, res) {
         try {
-            logger.debug("Database check");
+            logger.debug("Database check", getLogAttributesFromRequest(req));
             if (options.databaseCheck) {
                 await options.databaseCheck();
             }
             else {
                 throw new BadRequestException("Database check not implemented");
             }
-            logger.info("Database check: ok");
+            logger.info("Database check: ok", getLogAttributesFromRequest(req));
             Response.sendJsonObjectResponse(req, res, {
                 status: "ok",
             });

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

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

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

@@ -35,7 +35,7 @@ import StatusPageService, { Service as StatusPageServiceType, } from "../Service
 import StatusPageSsoService from "../Services/StatusPageSsoService";
 import StatusPageSubscriberService from "../Services/StatusPageSubscriberService";
 import QueryHelper from "../Types/Database/QueryHelper";
-import logger from "../Utils/Logger";
+import logger, { getLogAttributesFromRequest } from "../Utils/Logger";
 import Response from "../Utils/Response";
 import BaseAPI from "./BaseAPI";
 import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel";
@@ -161,8 +161,8 @@ export default class StatusPageAPI extends BaseAPI {
                     statusPageId = new ObjectID(statusPageIdOrDomain);
                 }
                 catch (err) {
-                    logger.error(`Error converting statusPageIdOrDomain to ObjectID: ${statusPageIdOrDomain}`);
-                    logger.error(err);
+                    logger.error(`Error converting statusPageIdOrDomain to ObjectID: ${statusPageIdOrDomain}`, getLogAttributesFromRequest(req));
+                    logger.error(err, getLogAttributesFromRequest(req));
                     return Response.sendErrorResponse(req, res, new NotFoundException("Status Page not found"));
                 }
             }
@@ -209,17 +209,17 @@ export default class StatusPageAPI extends BaseAPI {
                     },
                 });
                 if (!statusPage || !statusPage.faviconFile) {
-                    logger.debug("Favicon file not found. Returning default favicon.");
+                    logger.debug("Favicon file not found. Returning default favicon.", getLogAttributesFromRequest(req));
                     return Response.sendFileByPath(req, res, `/usr/src/Common/UI/Images/favicon/status-green.png`);
                 }
-                logger.debug(`Favicon file found. Sending file: ${statusPage.faviconFile.name}`);
+                logger.debug(`Favicon file found. Sending file: ${statusPage.faviconFile.name}`, getLogAttributesFromRequest(req));
                 return Response.sendFileResponse(req, res, statusPage.faviconFile);
             }
             catch (error) {
                 if (error instanceof NotFoundException) {
                     return Response.sendErrorResponse(req, res, error);
                 }
-                logger.error(error);
+                logger.error(error, getLogAttributesFromRequest(req));
                 return Response.sendErrorResponse(req, res, new NotFoundException("Status Page not found"));
             }
         });
@@ -251,7 +251,7 @@ export default class StatusPageAPI extends BaseAPI {
                 if (error instanceof NotFoundException) {
                     return Response.sendErrorResponse(req, res, error);
                 }
-                logger.error(error);
+                logger.error(error, getLogAttributesFromRequest(req));
                 return Response.sendErrorResponse(req, res, new NotFoundException("Status Page logo not found"));
             }
         });
@@ -283,7 +283,7 @@ export default class StatusPageAPI extends BaseAPI {
                 if (error instanceof NotFoundException) {
                     return Response.sendErrorResponse(req, res, error);
                 }
-                logger.error(error);
+                logger.error(error, getLogAttributesFromRequest(req));
                 return Response.sendErrorResponse(req, res, new NotFoundException("Status Page cover image not found"));
             }
         });
@@ -442,7 +442,7 @@ export default class StatusPageAPI extends BaseAPI {
                 return res.send(svg);
             }
             catch (err) {
-                logger.error(err);
+                logger.error(err, getLogAttributesFromRequest(req));
                 return res.status(500).send("Internal Server Error");
             }
         });
@@ -492,7 +492,7 @@ export default class StatusPageAPI extends BaseAPI {
                 throw new BadDataException("Host not found");
             }
             const token = req.params["token"];
-            logger.debug(`CNAME Verification: Host:${host}  - Token:${token}`);
+            logger.debug(`CNAME Verification: Host:${host}  - Token:${token}`, getLogAttributesFromRequest(req));
             const domain = await StatusPageDomainService.findOneBy({
                 query: {
                     cnameVerificationToken: token,
@@ -513,7 +513,7 @@ export default class StatusPageAPI extends BaseAPI {
         // ACME Challenge Validation.
         this.router.get(`${(_o = new this.entityType()
             .getCrudApiPath()) === null || _o === void 0 ? void 0 : _o.toString()}/.well-known/acme-challenge/:token`, async (req, res) => {
-            logger.debug(`ACME challenge validation request received for token: ${req.params["token"]} from host: ${req.headers["host"]}`);
+            logger.debug(`ACME challenge validation request received for token: ${req.params["token"]} from host: ${req.headers["host"]}`, getLogAttributesFromRequest(req));
             const challenge = await AcmeChallengeService.findOneBy({
                 query: {
                     token: req.params["token"],
@@ -526,7 +526,7 @@ export default class StatusPageAPI extends BaseAPI {
                 },
             });
             if (!challenge) {
-                logger.error(`ACME challenge not found for token: ${req.params["token"]} from host: ${req.headers["host"]}`);
+                logger.error(`ACME challenge not found for token: ${req.params["token"]} from host: ${req.headers["host"]}`, getLogAttributesFromRequest(req));
                 return Response.sendErrorResponse(req, res, new NotFoundException("Challenge not found"));
             }
             return Response.sendTextResponse(req, res, challenge.challenge);
@@ -2189,7 +2189,7 @@ export default class StatusPageAPI extends BaseAPI {
     async manageExistingSubscription(req) {
         var _a, _b;
         const statusPageId = new ObjectID(req.params["statusPageId"]);
-        logger.debug(`Managing Existing Subscription for Status Page: ${statusPageId}`);
+        logger.debug(`Managing Existing Subscription for Status Page: ${statusPageId}`, getLogAttributesFromRequest(req));
         await this.checkHasReadAccess({
             statusPageId: statusPageId,
             req: req,
@@ -2214,33 +2214,33 @@ export default class StatusPageAPI extends BaseAPI {
             },
         });
         if (!statusPage) {
-            logger.debug(`Status page not found with ID: ${statusPageId}`);
+            logger.debug(`Status page not found with ID: ${statusPageId}`, getLogAttributesFromRequest(req));
             throw new BadDataException("Status Page not found");
         }
         if (!statusPage.showSubscriberPageOnStatusPage) {
-            logger.debug(`Subscriber page not enabled for status page with ID: ${statusPageId}`);
+            logger.debug(`Subscriber page not enabled for status page with ID: ${statusPageId}`, getLogAttributesFromRequest(req));
             throw new BadDataException("Subscribes not enabled for this status page.");
         }
-        logger.debug(`Status page found: ${JSON.stringify(statusPage)}`);
+        logger.debug(`Status page found: ${JSON.stringify(statusPage)}`, getLogAttributesFromRequest(req));
         if (req.body.data["subscriberEmail"] &&
             !statusPage.enableEmailSubscribers) {
-            logger.debug(`Email subscribers not enabled for status page with ID: ${statusPageId}`);
+            logger.debug(`Email subscribers not enabled for status page with ID: ${statusPageId}`, getLogAttributesFromRequest(req));
             throw new BadDataException("Email subscribers not enabled for this status page.");
         }
         if (req.body.data["slackIncomingWebhookUrl"] &&
             !statusPage.enableSlackSubscribers) {
-            logger.debug(`Slack subscribers not enabled for status page with ID: ${statusPageId}`);
+            logger.debug(`Slack subscribers not enabled for status page with ID: ${statusPageId}`, getLogAttributesFromRequest(req));
             throw new BadDataException("Slack subscribers not enabled for this status page.");
         }
         if (req.body.data["subscriberPhone"] && !statusPage.enableSmsSubscribers) {
-            logger.debug(`SMS subscribers not enabled for status page with ID: ${statusPageId}`);
+            logger.debug(`SMS subscribers not enabled for status page with ID: ${statusPageId}`, getLogAttributesFromRequest(req));
             throw new BadDataException("SMS subscribers not enabled for this status page.");
         }
         // if no email or phone, throw error.
         if (!req.body.data["subscriberEmail"] &&
             !req.body.data["subscriberPhone"] &&
             !req.body.data["slackWorkspaceName"]) {
-            logger.debug(`No email, slack workspace name or phone provided for subscription to status page with ID: ${statusPageId}`);
+            logger.debug(`No email, slack workspace name or phone provided for subscription to status page with ID: ${statusPageId}`, getLogAttributesFromRequest(req));
             throw new BadDataException("Email, phone or slack workspace name is required to subscribe to this status page.");
         }
         const email = req.body.data["subscriberEmail"]
@@ -2254,7 +2254,7 @@ export default class StatusPageAPI extends BaseAPI {
             : undefined;
         let statusPageSubscriber = null;
         if (email) {
-            logger.debug(`Setting subscriber email: ${email}`);
+            logger.debug(`Setting subscriber email: ${email}`, getLogAttributesFromRequest(req));
             statusPageSubscriber = await StatusPageSubscriberService.findOneBy({
                 query: {
                     subscriberEmail: email,
@@ -2270,7 +2270,7 @@ export default class StatusPageAPI extends BaseAPI {
             });
         }
         if (phone) {
-            logger.debug(`Setting subscriber phone: ${phone}`);
+            logger.debug(`Setting subscriber phone: ${phone}`, getLogAttributesFromRequest(req));
             statusPageSubscriber = await StatusPageSubscriberService.findOneBy({
                 query: {
                     subscriberPhone: phone,
@@ -2286,7 +2286,7 @@ export default class StatusPageAPI extends BaseAPI {
             });
         }
         if (slackWorkspaceName) {
-            logger.debug(`Setting subscriber slack workspace: ${slackWorkspaceName}`);
+            logger.debug(`Setting subscriber slack workspace: ${slackWorkspaceName}`, getLogAttributesFromRequest(req));
             statusPageSubscriber = await StatusPageSubscriberService.findOneBy({
                 query: {
                     slackWorkspaceName: slackWorkspaceName,
@@ -2304,7 +2304,7 @@ export default class StatusPageAPI extends BaseAPI {
         }
         if (!statusPageSubscriber) {
             // not found, return bad data
-            logger.debug(`Subscriber not found for email: ${email}, phone: ${phone}, or slack workspace: ${slackWorkspaceName}`);
+            logger.debug(`Subscriber not found for email: ${email}, phone: ${phone}, or slack workspace: ${slackWorkspaceName}`, getLogAttributesFromRequest(req));
             let identifierType = "email";
             if (phone) {
                 identifierType = "phone";
@@ -2362,7 +2362,7 @@ export default class StatusPageAPI extends BaseAPI {
                     customTwilioConfig: ProjectCallSMSConfigService.toTwilioConfig(statusPage.callSmsConfig),
                     statusPageId: statusPage.id,
                 }).catch((err) => {
-                    logger.error(err);
+                    logger.error(err, getLogAttributesFromRequest(req));
                 });
             }
             if (statusPageSubscriber.slackIncomingWebhookUrl) {
@@ -2371,15 +2371,15 @@ export default class StatusPageAPI extends BaseAPI {
                     url: statusPageSubscriber.slackIncomingWebhookUrl,
                     text: slackMessage,
                 }).catch((err) => {
-                    logger.error(err);
+                    logger.error(err, getLogAttributesFromRequest(req));
                 });
             }
-            logger.debug(`Subscription management link sent to subscriber with ID: ${statusPageSubscriber.id}`);
+            logger.debug(`Subscription management link sent to subscriber with ID: ${statusPageSubscriber.id}`, getLogAttributesFromRequest(req));
         }
     }
     async subscribeToStatusPage(req) {
         const objectId = new ObjectID(req.params["statusPageId"]);
-        logger.debug(`Subscribing to status page with ID: ${objectId}`);
+        logger.debug(`Subscribing to status page with ID: ${objectId}`, getLogAttributesFromRequest(req));
         await this.checkHasReadAccess({
             statusPageId: objectId,
             req: req,
@@ -2404,39 +2404,39 @@ export default class StatusPageAPI extends BaseAPI {
             },
         });
         if (!statusPage) {
-            logger.debug(`Status page not found with ID: ${objectId}`);
+            logger.debug(`Status page not found with ID: ${objectId}`, getLogAttributesFromRequest(req));
             throw new BadDataException("Status Page not found");
         }
         if (!statusPage.showSubscriberPageOnStatusPage) {
-            logger.debug(`Subscriber page not enabled for status page with ID: ${objectId}`);
+            logger.debug(`Subscriber page not enabled for status page with ID: ${objectId}`, getLogAttributesFromRequest(req));
             throw new BadDataException("Subscribes not enabled for this status page.");
         }
-        logger.debug(`Status page found: ${JSON.stringify(statusPage)}`);
+        logger.debug(`Status page found: ${JSON.stringify(statusPage)}`, getLogAttributesFromRequest(req));
         if (req.body.data["subscriberEmail"] &&
             !statusPage.enableEmailSubscribers) {
-            logger.debug(`Email subscribers not enabled for status page with ID: ${objectId}`);
+            logger.debug(`Email subscribers not enabled for status page with ID: ${objectId}`, getLogAttributesFromRequest(req));
             throw new BadDataException("Email subscribers not enabled for this status page.");
         }
         if (req.body.data["subscriberPhone"] && !statusPage.enableSmsSubscribers) {
-            logger.debug(`SMS subscribers not enabled for status page with ID: ${objectId}`);
+            logger.debug(`SMS subscribers not enabled for status page with ID: ${objectId}`, getLogAttributesFromRequest(req));
             throw new BadDataException("SMS subscribers not enabled for this status page.");
         }
         // if no email or phone, throw error.
         if (req.body.data["slackWorkspaceName"] &&
             !statusPage.enableSlackSubscribers) {
-            logger.debug(`Slack subscribers not enabled for status page with ID: ${objectId}`);
+            logger.debug(`Slack subscribers not enabled for status page with ID: ${objectId}`, getLogAttributesFromRequest(req));
             throw new BadDataException("Slack subscribers not enabled for this status page.");
         }
         if (req.body.data["microsoftTeamsWorkspaceName"] &&
             !statusPage.enableMicrosoftTeamsSubscribers) {
-            logger.debug(`Microsoft Teams subscribers not enabled for status page with ID: ${objectId}`);
+            logger.debug(`Microsoft Teams subscribers not enabled for status page with ID: ${objectId}`, getLogAttributesFromRequest(req));
             throw new BadDataException("Microsoft Teams subscribers not enabled for this status page.");
         }
         if (!req.body.data["subscriberEmail"] &&
             !req.body.data["subscriberPhone"] &&
             !req.body.data["slackWorkspaceName"] &&
             !req.body.data["microsoftTeamsWorkspaceName"]) {
-            logger.debug(`No email, phone, slack workspace name, or Microsoft Teams workspace name provided for subscription to status page with ID: ${objectId}`);
+            logger.debug(`No email, phone, slack workspace name, or Microsoft Teams workspace name provided for subscription to status page with ID: ${objectId}`, getLogAttributesFromRequest(req));
             throw new BadDataException("Email, phone, slack workspace name, or Microsoft Teams workspace name is required to subscribe to this status page.");
         }
         const email = req.body.data["subscriberEmail"]
@@ -2460,12 +2460,12 @@ export default class StatusPageAPI extends BaseAPI {
         let statusPageSubscriber = null;
         let isUpdate = false;
         if (!req.params["subscriberId"]) {
-            logger.debug(`Creating new subscriber for status page with ID: ${objectId}`);
+            logger.debug(`Creating new subscriber for status page with ID: ${objectId}`, getLogAttributesFromRequest(req));
             statusPageSubscriber = new StatusPageSubscriber();
         }
         else {
             const subscriberId = new ObjectID(req.params["subscriberId"]);
-            logger.debug(`Updating existing subscriber with ID: ${subscriberId} for status page with ID: ${objectId}`);
+            logger.debug(`Updating existing subscriber with ID: ${subscriberId} for status page with ID: ${objectId}`, getLogAttributesFromRequest(req));
             statusPageSubscriber = await StatusPageSubscriberService.findOneBy({
                 query: {
                     _id: subscriberId.toString(),
@@ -2475,44 +2475,44 @@ export default class StatusPageAPI extends BaseAPI {
                 },
             });
             if (!statusPageSubscriber) {
-                logger.debug(`Subscriber not found with ID: ${subscriberId}`);
+                logger.debug(`Subscriber not found with ID: ${subscriberId}`, getLogAttributesFromRequest(req));
                 throw new BadDataException("Subscriber not found");
             }
             isUpdate = true;
         }
         if (email) {
-            logger.debug(`Setting subscriber email: ${email}`);
+            logger.debug(`Setting subscriber email: ${email}`, getLogAttributesFromRequest(req));
             statusPageSubscriber.subscriberEmail = email;
         }
         if (phone) {
-            logger.debug(`Setting subscriber phone: ${phone}`);
+            logger.debug(`Setting subscriber phone: ${phone}`, getLogAttributesFromRequest(req));
             statusPageSubscriber.subscriberPhone = phone;
         }
         if (slackIncomingWebhookUrl) {
-            logger.debug(`Setting subscriber slack: ${slackIncomingWebhookUrl}`);
+            logger.debug(`Setting subscriber slack: ${slackIncomingWebhookUrl}`, getLogAttributesFromRequest(req));
             statusPageSubscriber.slackIncomingWebhookUrl = URL.fromString(slackIncomingWebhookUrl);
         }
         if (slackWorkspaceName) {
-            logger.debug(`Setting subscriber slack workspace name: ${slackWorkspaceName}`);
+            logger.debug(`Setting subscriber slack workspace name: ${slackWorkspaceName}`, getLogAttributesFromRequest(req));
             statusPageSubscriber.slackWorkspaceName = slackWorkspaceName;
         }
         if (microsoftTeamsIncomingWebhookUrl) {
-            logger.debug(`Setting subscriber Microsoft Teams webhook: ${microsoftTeamsIncomingWebhookUrl}`);
+            logger.debug(`Setting subscriber Microsoft Teams webhook: ${microsoftTeamsIncomingWebhookUrl}`, getLogAttributesFromRequest(req));
             statusPageSubscriber.microsoftTeamsIncomingWebhookUrl = URL.fromString(microsoftTeamsIncomingWebhookUrl);
         }
         if (microsoftTeamsWorkspaceName) {
-            logger.debug(`Setting subscriber Microsoft Teams workspace name: ${microsoftTeamsWorkspaceName}`);
+            logger.debug(`Setting subscriber Microsoft Teams workspace name: ${microsoftTeamsWorkspaceName}`, getLogAttributesFromRequest(req));
             statusPageSubscriber.microsoftTeamsWorkspaceName =
                 microsoftTeamsWorkspaceName;
         }
         if (req.body.data["statusPageResources"] &&
             !statusPage.allowSubscribersToChooseResources) {
-            logger.debug(`Subscribers not allowed to choose resources for status page with ID: ${objectId}`);
+            logger.debug(`Subscribers not allowed to choose resources for status page with ID: ${objectId}`, getLogAttributesFromRequest(req));
             throw new BadDataException("Subscribers are not allowed to choose resources for this status page.");
         }
         if (req.body.data["statusPageEventTypes"] &&
             !statusPage.allowSubscribersToChooseEventTypes) {
-            logger.debug(`Subscribers not allowed to choose event types for status page with ID: ${objectId}`);
+            logger.debug(`Subscribers not allowed to choose event types for status page with ID: ${objectId}`, getLogAttributesFromRequest(req));
             throw new BadDataException("Subscribers are not allowed to choose event types for this status page.");
         }
         statusPageSubscriber.statusPageId = objectId;
@@ -2522,17 +2522,17 @@ export default class StatusPageAPI extends BaseAPI {
         statusPageSubscriber.isSubscribedToAllEventTypes = Boolean(req.body.data["isSubscribedToAllEventTypes"]);
         if (req.body.data["statusPageResources"] &&
             req.body.data["statusPageResources"].length > 0) {
-            logger.debug(`Setting subscriber resources: ${JSON.stringify(req.body.data["statusPageResources"])}`);
+            logger.debug(`Setting subscriber resources: ${JSON.stringify(req.body.data["statusPageResources"])}`, getLogAttributesFromRequest(req));
             statusPageSubscriber.statusPageResources = req.body.data["statusPageResources"];
         }
         if (req.body.data["statusPageEventTypes"] &&
             req.body.data["statusPageEventTypes"].length > 0) {
-            logger.debug(`Setting subscriber event types: ${JSON.stringify(req.body.data["statusPageEventTypes"])}`);
+            logger.debug(`Setting subscriber event types: ${JSON.stringify(req.body.data["statusPageEventTypes"])}`, getLogAttributesFromRequest(req));
             statusPageSubscriber.statusPageEventTypes = req.body.data["statusPageEventTypes"];
         }
         if (isUpdate) {
             // check isUnsubscribed is set to false.
-            logger.debug(`Updating subscriber with ID: ${statusPageSubscriber.id}`);
+            logger.debug(`Updating subscriber with ID: ${statusPageSubscriber.id}`, getLogAttributesFromRequest(req));
             statusPageSubscriber.isUnsubscribed = Boolean(req.body.data["isUnsubscribed"]);
             await StatusPageSubscriberService.updateOneById({
                 id: statusPageSubscriber.id,
@@ -2547,7 +2547,7 @@ export default class StatusPageAPI extends BaseAPI {
             });
         }
         else {
-            logger.debug(`Creating new subscriber: ${JSON.stringify(statusPageSubscriber)}`);
+            logger.debug(`Creating new subscriber: ${JSON.stringify(statusPageSubscriber)}`, getLogAttributesFromRequest(req));
             await StatusPageSubscriberService.create({
                 data: statusPageSubscriber,
                 props: {
@@ -2555,7 +2555,7 @@ export default class StatusPageAPI extends BaseAPI {
                 },
             });
         }
-        logger.debug(`Subscription process completed for status page with ID: ${objectId}`);
+        logger.debug(`Subscription process completed for status page with ID: ${objectId}`, getLogAttributesFromRequest(req));
     }
     async getSubscriber(req) {
         const objectId = new ObjectID(req.params["statusPageId"]);