@oneuptime/common 10.0.52 → 10.0.54

package/Server/Services/AnalyticsDatabaseService.ts

@@ -26,7 +26,7 @@ import Select from "../Types/AnalyticsDatabase/Select";
 import UpdateBy from "../Types/AnalyticsDatabase/UpdateBy";
 import { SQL, Statement } from "../Utils/AnalyticsDatabase/Statement";
 import StatementGenerator from "../Utils/AnalyticsDatabase/StatementGenerator";
-import logger from "../Utils/Logger";
+import logger, { LogAttributes } from "../Utils/Logger";
 import Realtime from "../Utils/Realtime";
 import StreamUtil from "../Utils/Stream";
 import BaseService from "./BaseService";
@@ -122,12 +122,14 @@ export default class AnalyticsDatabaseService<
 
       logger.debug(
         `ClickHouse insert succeeded for table ${tableName} at ${OneUptimeDate.toString(OneUptimeDate.getCurrentDate())}`,
+        { tableName } as LogAttributes,
       );
     } catch (error) {
       logger.error(
         `ClickHouse insert failed for table ${tableName} at ${OneUptimeDate.toString(OneUptimeDate.getCurrentDate())}`,
+        { tableName } as LogAttributes,
       );
-      logger.error(error);
+      logger.error(error, { tableName } as LogAttributes);
       throw error;
     }
   }
@@ -202,8 +204,12 @@ export default class AnalyticsDatabaseService<
       const dbResult: ResultSet<"JSON"> =
         await this.executeQuery(countStatement);
 
-      logger.debug(`${this.model.tableName} Count Statement executed`);
-      logger.debug(countStatement);
+      logger.debug(`${this.model.tableName} Count Statement executed`, {
+        tableName: this.model.tableName,
+      } as LogAttributes);
+      logger.debug(countStatement, {
+        tableName: this.model.tableName,
+      } as LogAttributes);
 
       const resultInJSON: ResponseJSON<JSONObject> =
         await dbResult.json<JSONObject>();
@@ -220,8 +226,12 @@ export default class AnalyticsDatabaseService<
         );
       }
 
-      logger.debug(`Result: `);
-      logger.debug(countPositive.toNumber());
+      logger.debug(`Result: `, {
+        tableName: this.model.tableName,
+      } as LogAttributes);
+      logger.debug(countPositive.toNumber(), {
+        tableName: this.model.tableName,
+      } as LogAttributes);
 
       countPositive = await this.onCountSuccess(countPositive);
       return countPositive;
@@ -249,6 +259,21 @@ export default class AnalyticsDatabaseService<
 
   @CaptureSpan()
   public async dropColumnInDatabase(columnName: string): Promise<void> {
+    /*
+     * Drop any skip index associated with this column before dropping the column itself.
+     * ClickHouse will reject a column drop if a skip index depends on it.
+     */
+    const column: AnalyticsTableColumn | undefined =
+      this.model.tableColumns.find((col: AnalyticsTableColumn) => {
+        return col.key === columnName;
+      });
+
+    if (column?.skipIndex) {
+      await this.execute(
+        this.statementGenerator.toDropSkipIndexStatement(column.skipIndex.name),
+      );
+    }
+
     await this.execute(
       this.statementGenerator.toDropColumnStatement(columnName),
     );
@@ -296,6 +321,7 @@ export default class AnalyticsDatabaseService<
     if (currentCodec === data.expectedCodecValue) {
       logger.info(
         `${tableName}.${data.columnName} already has ${data.expectedCodecValue}, skipping`,
+        { tableName } as LogAttributes,
       );
       return;
     }
@@ -305,6 +331,7 @@ export default class AnalyticsDatabaseService<
     );
     logger.info(
       `Applied ${data.codec} codec to ${tableName}.${data.columnName} (async)`,
+      { tableName } as LogAttributes,
     );
   }
 
@@ -397,7 +424,9 @@ export default class AnalyticsDatabaseService<
         findStatement.statement,
       );
 
-      logger.debug(`${this.model.tableName} Aggregate Statement executed`);
+      logger.debug(`${this.model.tableName} Aggregate Statement executed`, {
+        tableName: this.model.tableName,
+      } as LogAttributes);
 
       const responseJSON: ResponseJSON<JSONObject> =
         await dbResult.json<JSONObject>();
@@ -524,8 +553,12 @@ export default class AnalyticsDatabaseService<
         findStatement.statement,
       );
 
-      logger.debug(`${this.model.tableName} Find Statement executed`);
-      logger.debug(findStatement.statement);
+      logger.debug(`${this.model.tableName} Find Statement executed`, {
+        tableName: this.model.tableName,
+      } as LogAttributes);
+      logger.debug(findStatement.statement, {
+        tableName: this.model.tableName,
+      } as LogAttributes);
 
       const responseJSON: ResponseJSON<JSONObject> =
         await dbResult.json<JSONObject>();
@@ -656,8 +689,8 @@ export default class AnalyticsDatabaseService<
             }}
             `);
     }
-    logger.debug(`${this.model.tableName} Count Statement`);
-    logger.debug(statement);
+    logger.debug(`${this.model.tableName} Count Statement`, { tableName: this.model.tableName } as LogAttributes);
+    logger.debug(statement, { tableName: this.model.tableName } as LogAttributes);
 
     return statement;
   }
@@ -716,8 +749,8 @@ export default class AnalyticsDatabaseService<
     }}
         `);
 
-    logger.debug(`${this.model.tableName} Aggregate Statement`);
-    logger.debug(statement);
+    logger.debug(`${this.model.tableName} Aggregate Statement`, { tableName: this.model.tableName } as LogAttributes);
+    logger.debug(statement, { tableName: this.model.tableName } as LogAttributes);
 
     return { statement, columns: select.columns };
   }
@@ -780,8 +813,8 @@ export default class AnalyticsDatabaseService<
     }}
         `);
 
-    logger.debug(`${this.model.tableName} Find Statement`);
-    logger.debug(statement);
+    logger.debug(`${this.model.tableName} Find Statement`, { tableName: this.model.tableName } as LogAttributes);
+    logger.debug(statement, { tableName: this.model.tableName } as LogAttributes);
 
     return { statement, columns: select.columns };
   }
@@ -801,8 +834,8 @@ export default class AnalyticsDatabaseService<
             ALTER TABLE ${databaseName}.${this.model.tableName}
             DELETE WHERE TRUE `.append(whereStatement);
 
-    logger.debug(`${this.model.tableName} Delete Statement`);
-    logger.debug(statement);
+    logger.debug(`${this.model.tableName} Delete Statement`, { tableName: this.model.tableName } as LogAttributes);
+    logger.debug(statement, { tableName: this.model.tableName } as LogAttributes);
 
     return statement;
   }
@@ -855,8 +888,8 @@ export default class AnalyticsDatabaseService<
 
       await this.execute(deleteStatement);
 
-      logger.debug(`${this.model.tableName} Delete Statement executed`);
-      logger.debug(deleteStatement);
+      logger.debug(`${this.model.tableName} Delete Statement executed`, { tableName: this.model.tableName } as LogAttributes);
+      logger.debug(deleteStatement, { tableName: this.model.tableName } as LogAttributes);
     } catch (error) {
       await this.onDeleteError(error as Exception);
       throw this.getException(error as Exception);
@@ -914,8 +947,8 @@ export default class AnalyticsDatabaseService<
 
       await this.execute(statement);
 
-      logger.debug(`${this.model.tableName} Update Statement executed`);
-      logger.debug(statement);
+      logger.debug(`${this.model.tableName} Update Statement executed`, { tableName: this.model.tableName } as LogAttributes);
+      logger.debug(statement, { tableName: this.model.tableName } as LogAttributes);
     } catch (error) {
       await this.onUpdateError(error as Exception);
       throw this.getException(error as Exception);
@@ -1143,8 +1176,8 @@ export default class AnalyticsDatabaseService<
 
       await this.execute(insertStatement);
 
-      logger.debug(`${this.model.tableName} Create Statement executed`);
-      logger.debug(insertStatement);
+      logger.debug(`${this.model.tableName} Create Statement executed`, { tableName: this.model.tableName } as LogAttributes);
+      logger.debug(insertStatement, { tableName: this.model.tableName } as LogAttributes);
 
       if (!createBy.props.ignoreHooks) {
         for (let i: number = 0; i < items.length; i++) {
@@ -1212,7 +1245,8 @@ export default class AnalyticsDatabaseService<
           logger.warn(
             `Realtime is not initialized. Skipping emitModelEvent for ${
               this.getModel().tableName
-            }`
+            }`,
+            { tableName: this.getModel().tableName } as LogAttributes,
           );
         }
       }
@@ -1294,7 +1328,7 @@ export default class AnalyticsDatabaseService<
           ...ClusterKeyAuthorization.getClusterKeyHeaders(),
         },
       }).catch((error: Error) => {
-        logger.error(error);
+        logger.error(error, { projectId: projectId?.toString(), tableName: this.getModel().tableName } as LogAttributes);
       });
     }
   }

package/Server/Services/BillingInvoiceService.ts

@@ -15,7 +15,7 @@ import SubscriptionStatus, {
 } from "../../Types/Billing/SubscriptionStatus";
 import ObjectID from "../../Types/ObjectID";
 import Semaphore, { SemaphoreMutex } from "../Infrastructure/Semaphore";
-import logger from "../Utils/Logger";
+import logger, { LogAttributes } from "../Utils/Logger";
 import OneUptimeDate from "../../Types/Date";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 
@@ -51,7 +51,9 @@ export class Service extends DatabaseService<Model> {
           " at " +
           OneUptimeDate.getCurrentDateAsFormattedString(),
       );
-      logger.error(err);
+      logger.error(err, {
+        projectId: data.projectId?.toString(),
+      } as LogAttributes);
     }
 
     let project: Project | null = await ProjectService.findOneById({
@@ -183,7 +185,9 @@ export class Service extends DatabaseService<Model> {
             " at " +
             OneUptimeDate.getCurrentDateAsFormattedString(),
         );
-        logger.error(err);
+        logger.error(err, {
+          projectId: data.projectId?.toString(),
+        } as LogAttributes);
       }
     }
   }

package/Server/Services/BillingService.ts

@@ -7,7 +7,7 @@ import {
 import Project from "../../Models/DatabaseModels/Project";
 import ServerMeteredPlan from "../Types/Billing/MeteredPlan/ServerMeteredPlan";
 import Errors from "../Utils/Errors";
-import logger from "../Utils/Logger";
+import logger, { LogAttributes } from "../Utils/Logger";
 import BaseService from "./BaseService";
 import MailService from "./MailService";
 import ProjectService from "./ProjectService";
@@ -821,7 +821,7 @@ export class BillingService extends BaseService {
     try {
       await this.stripe.subscriptions.del(subscriptionId);
     } catch (err) {
-      logger.error(err);
+      logger.error(err, { subscriptionId } as LogAttributes);
     }
   }
 
@@ -981,6 +981,7 @@ export class BillingService extends BaseService {
       if (!stripeInvoice) {
         logger.error(
           `[Invoice Email] Invoice ${invoiceId} not found in Stripe`,
+          { projectId: projectId?.toString() } as LogAttributes,
         );
         return;
       }
@@ -994,6 +995,7 @@ export class BillingService extends BaseService {
       if (!toEmail) {
         logger.error(
           `[Invoice Email] No recipient email found for invoice ${invoiceId}`,
+          { projectId: projectId?.toString() } as LogAttributes,
         );
         return;
       }
@@ -1049,6 +1051,7 @@ export class BillingService extends BaseService {
     } catch (err) {
       logger.error(
         `[Invoice Email] Failed to send invoice ${invoiceId} by email: ${err}`,
+        { projectId: projectId?.toString() } as LogAttributes,
       );
       // Don't throw - sending email is not critical
     }
@@ -1092,6 +1095,7 @@ export class BillingService extends BaseService {
     } catch (err) {
       logger.error(
         `[Invoice Email] Failed to check invoice email preference for customer ${customerId}: ${err}`,
+        { customerId } as LogAttributes,
       );
       return false;
     }
@@ -1125,6 +1129,7 @@ export class BillingService extends BaseService {
     if (!invoice || !invoice.id) {
       logger.error(
         `[Invoice Email] Failed to create invoice for customer ${customerId}`,
+        { projectId: projectId?.toString() } as LogAttributes,
       );
       throw new APIException(Errors.BillingService.INVOICE_NOT_GENERATED);
     }
@@ -1165,6 +1170,7 @@ export class BillingService extends BaseService {
     } catch (err) {
       logger.error(
         `[Invoice Email] Failed to pay invoice ${invoice.id}, voiding: ${err}`,
+        { projectId: projectId?.toString() } as LogAttributes,
       );
       // mark invoice as failed and do not collect payment.
       await this.voidInvoice(invoice.id!);
@@ -1382,6 +1388,7 @@ export class BillingService extends BaseService {
       } catch (err) {
         logger.error(
           `[Invoice Email] Failed to send invoice by email for invoice ${invoice.id}: ${err}`,
+          { customerId } as LogAttributes,
         );
         // Don't throw - webhook should still return success
       }

package/Server/Services/DashboardDomainService.ts

@@ -2,7 +2,7 @@ import CreateBy from "../Types/Database/CreateBy";
 import DeleteBy from "../Types/Database/DeleteBy";
 import { OnCreate, OnDelete } from "../Types/Database/Hooks";
 import GreenlockUtil from "../Utils/Greenlock/Greenlock";
-import logger from "../Utils/Logger";
+import logger, { LogAttributes } from "../Utils/Logger";
 import DatabaseService from "./DatabaseService";
 import DomainService from "./DomainService";
 import HTTPErrorResponse from "../../Types/API/HTTPErrorResponse";
@@ -164,6 +164,7 @@ export class Service extends DatabaseService<DashboardDomain> {
 
           logger.debug(
             "Ordering SSL for domain: " + dashboardDomain.fullDomain,
+            { fullDomain: dashboardDomain.fullDomain } as LogAttributes,
           );
 
           await GreenlockUtil.orderCert({
@@ -173,7 +174,10 @@ export class Service extends DatabaseService<DashboardDomain> {
             },
           });
 
-          logger.debug("SSL ordered for domain: " + dashboardDomain.fullDomain);
+          logger.debug(
+            "SSL ordered for domain: " + dashboardDomain.fullDomain,
+            { fullDomain: dashboardDomain.fullDomain } as LogAttributes,
+          );
 
           await this.updateOneById({
             id: dashboardDomain.id!,
@@ -241,7 +245,7 @@ export class Service extends DatabaseService<DashboardDomain> {
 
       return true;
     } catch (err) {
-      logger.error(err);
+      logger.error(err, { fullDomain: fulldomain } as LogAttributes);
       return false;
     }
   }
@@ -283,7 +287,9 @@ export class Service extends DatabaseService<DashboardDomain> {
   @CaptureSpan()
   public async isCnameValid(fullDomain: string): Promise<boolean> {
     try {
-      logger.debug("Checking for CNAME " + fullDomain);
+      logger.debug("Checking for CNAME " + fullDomain, {
+        fullDomain,
+      } as LogAttributes);
 
       const dashboardDomain: DashboardDomain | null = await this.findOneBy({
         query: {
@@ -304,7 +310,10 @@ export class Service extends DatabaseService<DashboardDomain> {
 
       const token: string = dashboardDomain.cnameVerificationToken!;
 
-      logger.debug("Checking for CNAME " + fullDomain + " with token " + token);
+      logger.debug(
+        "Checking for CNAME " + fullDomain + " with token " + token,
+        { fullDomain } as LogAttributes,
+      );
 
       try {
         const result: HTTPErrorResponse | HTTPResponse<JSONObject> =
@@ -317,8 +326,10 @@ export class Service extends DatabaseService<DashboardDomain> {
             ),
           });
 
-        logger.debug("CNAME verification result");
-        logger.debug(result);
+        logger.debug("CNAME verification result", {
+          fullDomain,
+        } as LogAttributes);
+        logger.debug(result, { fullDomain } as LogAttributes);
 
         if (result.isSuccess()) {
           await this.updateCnameStatusForDashboardDomain({
@@ -329,8 +340,10 @@ export class Service extends DatabaseService<DashboardDomain> {
           return true;
         }
       } catch (err) {
-        logger.debug("Failed checking for CNAME " + fullDomain);
-        logger.debug(err);
+        logger.debug("Failed checking for CNAME " + fullDomain, {
+          fullDomain,
+        } as LogAttributes);
+        logger.debug(err, { fullDomain } as LogAttributes);
       }
 
       try {
@@ -344,8 +357,10 @@ export class Service extends DatabaseService<DashboardDomain> {
             ),
           });
 
-        logger.debug("CNAME verification result for https");
-        logger.debug(resultHttps);
+        logger.debug("CNAME verification result for https", {
+          fullDomain,
+        } as LogAttributes);
+        logger.debug(resultHttps, { fullDomain } as LogAttributes);
 
         if (resultHttps.isSuccess()) {
           await this.updateCnameStatusForDashboardDomain({
@@ -356,8 +371,10 @@ export class Service extends DatabaseService<DashboardDomain> {
           return true;
         }
       } catch (err) {
-        logger.debug("Failed checking for CNAME " + fullDomain);
-        logger.debug(err);
+        logger.debug("Failed checking for CNAME " + fullDomain, {
+          fullDomain,
+        } as LogAttributes);
+        logger.debug(err, { fullDomain } as LogAttributes);
       }
 
       try {
@@ -374,6 +391,7 @@ export class Service extends DatabaseService<DashboardDomain> {
           if (!cnameRecord) {
             logger.debug(
               `No CNAME record found for ${fullDomain}. Expected record: ${DashboardCNameRecord}`,
+              { fullDomain } as LogAttributes,
             );
             await this.updateCnameStatusForDashboardDomain({
               domain: fullDomain,
@@ -389,6 +407,7 @@ export class Service extends DatabaseService<DashboardDomain> {
           ) {
             logger.debug(
               `CNAME record for ${fullDomain} matches the expected record: ${DashboardCNameRecord}`,
+              { fullDomain } as LogAttributes,
             );
 
             await this.updateCnameStatusForDashboardDomain({
@@ -401,11 +420,14 @@ export class Service extends DatabaseService<DashboardDomain> {
 
           logger.debug(
             `CNAME record for ${fullDomain} is ${cnameRecord} and it does not match the expected record: ${DashboardCNameRecord}`,
+            { fullDomain } as LogAttributes,
           );
         }
       } catch (err) {
-        logger.debug("Failed checking for CNAME " + fullDomain);
-        logger.debug(err);
+        logger.debug("Failed checking for CNAME " + fullDomain, {
+          fullDomain,
+        } as LogAttributes);
+        logger.debug(err, { fullDomain } as LogAttributes);
       }
 
       await this.updateCnameStatusForDashboardDomain({
@@ -455,6 +477,7 @@ export class Service extends DatabaseService<DashboardDomain> {
 
     logger.debug(
       `DashboardCerts:RemoveCerts - Checking CNAME ${dashboardDomain.fullDomain}`,
+      { fullDomain: dashboardDomain.fullDomain } as LogAttributes,
     );
 
     const isValid: boolean = await this.isSSLProvisioned(
@@ -483,8 +506,11 @@ export class Service extends DatabaseService<DashboardDomain> {
         } catch (err) {
           logger.error(
             "Cannot order cert for domain: " + dashboardDomain.fullDomain,
+            { fullDomain: dashboardDomain.fullDomain } as LogAttributes,
           );
-          logger.error(err);
+          logger.error(err, {
+            fullDomain: dashboardDomain.fullDomain,
+          } as LogAttributes);
         }
       }
     } else {
@@ -525,10 +551,14 @@ export class Service extends DatabaseService<DashboardDomain> {
 
           for (const domain of domains) {
             try {
-              logger.debug("Ordering SSL for domain: " + domain.fullDomain);
+              logger.debug("Ordering SSL for domain: " + domain.fullDomain, {
+                fullDomain: domain.fullDomain,
+              } as LogAttributes);
               await this.orderCert(domain);
             } catch (e) {
-              logger.error(e);
+              logger.error(e, {
+                fullDomain: domain.fullDomain,
+              } as LogAttributes);
             }
           }
 
@@ -566,7 +596,7 @@ export class Service extends DatabaseService<DashboardDomain> {
       try {
         await this.isCnameValid(domain.fullDomain as string);
       } catch (e) {
-        logger.error(e);
+        logger.error(e, { fullDomain: domain.fullDomain } as LogAttributes);
       }
     }
   }
@@ -591,7 +621,9 @@ export class Service extends DatabaseService<DashboardDomain> {
           },
         });
 
-        logger.debug(`DomainModel removed from greenlock: ${domain}`);
+        logger.debug(`DomainModel removed from greenlock: ${domain}`, {
+          fullDomain: domain,
+        } as LogAttributes);
       },
     });
   }
@@ -637,8 +669,10 @@ export class Service extends DatabaseService<DashboardDomain> {
         try {
           await this.orderCert(domain);
         } catch (err) {
-          logger.error("Cannot order cert for domain: " + domain.fullDomain);
-          logger.error(err);
+          logger.error("Cannot order cert for domain: " + domain.fullDomain, {
+            fullDomain: domain.fullDomain,
+          } as LogAttributes);
+          logger.error(err, { fullDomain: domain.fullDomain } as LogAttributes);
         }
       }
     }

package/Server/Services/DashboardService.ts

@@ -3,7 +3,7 @@ import { OnCreate } from "../Types/Database/Hooks";
 import CookieUtil from "../Utils/Cookie";
 import { ExpressRequest } from "../Utils/Express";
 import JSONWebToken from "../Utils/JsonWebToken";
-import logger from "../Utils/Logger";
+import logger, { LogAttributes } from "../Utils/Logger";
 import DatabaseService from "./DatabaseService";
 import BadDataException from "../../Types/Exception/BadDataException";
 import NotAuthenticatedException from "../../Types/Exception/NotAuthenticatedException";
@@ -140,7 +140,9 @@ export class Service extends DatabaseService<Model> {
           req.ips[0];
 
         if (!ipAccessedFrom) {
-          logger.error("IP address not found in request.");
+          logger.error("IP address not found in request.", {
+            dashboardId: dashboardId?.toString(),
+          } as LogAttributes);
           return {
             hasReadAccess: false,
             error: new ForbiddenException(
@@ -160,6 +162,7 @@ export class Service extends DatabaseService<Model> {
         if (!isIPWhitelisted) {
           logger.error(
             `IP address ${ipAccessedFrom} is not whitelisted for dashboard ${dashboardId.toString()}.`,
+            { dashboardId: dashboardId?.toString() } as LogAttributes,
           );
 
           return {
@@ -206,7 +209,9 @@ export class Service extends DatabaseService<Model> {
         };
       }
     } catch (err) {
-      logger.error(err);
+      logger.error(err, {
+        dashboardId: dashboardId?.toString(),
+      } as LogAttributes);
     }
 
     return {
@@ -238,7 +243,9 @@ export class Service extends DatabaseService<Model> {
         payload["type"] === DASHBOARD_MASTER_PASSWORD_COOKIE_IDENTIFIER
       );
     } catch (err) {
-      logger.error(err);
+      logger.error(err, {
+        dashboardId: data.dashboardId?.toString(),
+      } as LogAttributes);
     }
 
     return false;

package/Server/Services/DatabaseService.ts

@@ -30,7 +30,7 @@ import UpdateByID from "../Types/Database/UpdateByID";
 import UpdateByIDAndFetch from "../Types/Database/UpdateByIDAndFetch";
 import UpdateOneBy from "../Types/Database/UpdateOneBy";
 import Encryption from "../Utils/Encryption";
-import logger from "../Utils/Logger";
+import logger, { LogAttributes } from "../Utils/Logger";
 import BaseService from "./BaseService";
 import BaseModel from "../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel";
 import { WorkflowRoute } from "../../ServiceRoute";
@@ -585,11 +585,17 @@ class DatabaseService<TBaseModel extends BaseModel> extends BaseService {
     projectId: ObjectID,
     modelEventType: ModelEventType,
   ): Promise<void> {
-    logger.debug("Realtime Events Enabled");
-    logger.debug(this.model.enableRealtimeEventsOn);
+    logger.debug("Realtime Events Enabled", {
+      projectId: projectId?.toString(),
+    } as LogAttributes);
+    logger.debug(this.model.enableRealtimeEventsOn, {
+      projectId: projectId?.toString(),
+    } as LogAttributes);
 
     if (Realtime.isInitialized() && this.model.enableRealtimeEventsOn) {
-      logger.debug("Emitting realtime event");
+      logger.debug("Emitting realtime event", {
+        projectId: projectId?.toString(),
+      } as LogAttributes);
       let shouldEmitEvent: boolean = false;
 
       if (
@@ -614,19 +620,27 @@ class DatabaseService<TBaseModel extends BaseModel> extends BaseService {
       }
 
       if (!shouldEmitEvent) {
-        logger.debug("Realtime event not enabled for this event type");
+        logger.debug("Realtime event not enabled for this event type", {
+          projectId: projectId?.toString(),
+        } as LogAttributes);
         return;
       }
 
-      logger.debug("Emitting realtime event");
+      logger.debug("Emitting realtime event", {
+        projectId: projectId?.toString(),
+      } as LogAttributes);
       Realtime.emitModelEvent({
         tenantId: projectId,
         eventType: modelEventType,
         modelId: modelId,
         modelType: this.modelType,
       }).catch((err: Error) => {
-        logger.error("Cannot emit realtime event");
-        logger.error(err);
+        logger.error("Cannot emit realtime event", {
+          projectId: projectId?.toString(),
+        } as LogAttributes);
+        logger.error(err, {
+          projectId: projectId?.toString(),
+        } as LogAttributes);
       });
     }
   }
@@ -659,7 +673,9 @@ class DatabaseService<TBaseModel extends BaseModel> extends BaseService {
           ...ClusterKeyAuthorization.getClusterKeyHeaders(),
         },
       }).catch((error: Error) => {
-        logger.error(error);
+        logger.error(error, {
+          projectId: projectId?.toString(),
+        } as LogAttributes);
       });
     }
   }
@@ -1531,8 +1547,12 @@ class DatabaseService<TBaseModel extends BaseModel> extends BaseService {
           ...data,
         } as any;
 
-        logger.debug("Updated Item");
-        logger.debug(JSON.stringify(updatedItem, null, 2));
+        logger.debug("Updated Item", {
+          projectId: updateBy.props.tenantId?.toString(),
+        } as LogAttributes);
+        logger.debug(JSON.stringify(updatedItem, null, 2), {
+          projectId: updateBy.props.tenantId?.toString(),
+        } as LogAttributes);
 
         await this.getRepository().save(updatedItem);