@oneuptime/common 10.0.52 → 10.0.54

package/Models/AnalyticsModels/Metric.ts

@@ -524,6 +524,66 @@ export default class Metric extends AnalyticsBaseModel {
       },
     );
 
+    const traceIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "traceId",
+      title: "Trace ID",
+      description:
+        "Trace ID from an exemplar associated with this metric data point",
+      required: false,
+      type: TableColumnType.Text,
+      skipIndex: {
+        name: "idx_trace_id",
+        type: SkipIndexType.BloomFilter,
+        params: [0.01],
+        granularity: 1,
+      },
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceLog,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceLog,
+        ],
+        update: [],
+      },
+    });
+
+    const spanIdColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
+      key: "spanId",
+      title: "Span ID",
+      description:
+        "Span ID from an exemplar associated with this metric data point",
+      required: false,
+      type: TableColumnType.Text,
+      skipIndex: {
+        name: "idx_span_id",
+        type: SkipIndexType.BloomFilter,
+        params: [0.01],
+        granularity: 1,
+      },
+      accessControl: {
+        read: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.ReadTelemetryServiceLog,
+        ],
+        create: [
+          Permission.ProjectOwner,
+          Permission.ProjectAdmin,
+          Permission.ProjectMember,
+          Permission.CreateTelemetryServiceLog,
+        ],
+        update: [],
+      },
+    });
+
     const retentionDateColumn: AnalyticsTableColumn = new AnalyticsTableColumn({
       key: "retentionDate",
       title: "Retention Date",
@@ -587,6 +647,8 @@ export default class Metric extends AnalyticsBaseModel {
         maxColumn,
         bucketCountsColumn,
         explicitBoundsColumn,
+        traceIdColumn,
+        spanIdColumn,
         retentionDateColumn,
       ],
       projections: [],
@@ -761,6 +823,22 @@ export default class Metric extends AnalyticsBaseModel {
     this.setColumnValue("explicitBounds", v);
   }
 
+  public get traceId(): string | undefined {
+    return this.getColumnValue("traceId") as string | undefined;
+  }
+
+  public set traceId(v: string | undefined) {
+    this.setColumnValue("traceId", v);
+  }
+
+  public get spanId(): string | undefined {
+    return this.getColumnValue("spanId") as string | undefined;
+  }
+
+  public set spanId(v: string | undefined) {
+    this.setColumnValue("spanId", v);
+  }
+
   public get retentionDate(): Date | undefined {
     return this.getColumnValue("retentionDate") as Date | undefined;
   }

package/Server/API/AIAgentDataAPI.ts

@@ -29,7 +29,7 @@ import CodeRepositoryType from "../../Types/CodeRepository/CodeRepositoryType";
 import LIMIT_MAX from "../../Types/Database/LimitMax";
 import URL from "../../Types/API/URL";
 import PullRequestState from "../../Types/CodeRepository/PullRequestState";
-import logger from "../Utils/Logger";
+import logger, { getLogAttributesFromRequest } from "../Utils/Logger";
 
 export default class AIAgentDataAPI {
   public router!: ExpressRouter;
@@ -113,6 +113,7 @@ export default class AIAgentDataAPI {
 
           logger.debug(
             `LLM config fetched for project ${projectId.toString()}: ${llmProvider.llmType}`,
+            getLogAttributesFromRequest(req as any),
           );
 
           return Response.sendJsonObjectResponse(req, res, {
@@ -194,6 +195,7 @@ export default class AIAgentDataAPI {
 
           logger.debug(
             `Exception details fetched: ${exception._id} - ${exception.message?.substring(0, 100)}`,
+            getLogAttributesFromRequest(req as any),
           );
 
           return Response.sendJsonObjectResponse(req, res, {
@@ -328,6 +330,7 @@ export default class AIAgentDataAPI {
 
           logger.debug(
             `Found ${repositories.length} code repositories for service ${serviceId.toString()}`,
+            getLogAttributesFromRequest(req as any),
           );
 
           return Response.sendJsonObjectResponse(req, res, {
@@ -440,6 +443,7 @@ export default class AIAgentDataAPI {
 
           logger.debug(
             `Generated access token for repository ${codeRepository.organizationName}/${codeRepository.repositoryName}`,
+            getLogAttributesFromRequest(req as any),
           );
 
           return Response.sendJsonObjectResponse(req, res, {
@@ -623,6 +627,7 @@ export default class AIAgentDataAPI {
 
           logger.debug(
             `Recorded pull request ${pullRequestUrl} for task ${taskId.toString()}`,
+            getLogAttributesFromRequest(req as any),
           );
 
           return Response.sendJsonObjectResponse(req, res, {

package/Server/API/BillingAPI.ts

@@ -17,7 +17,7 @@ import Project from "../../Models/DatabaseModels/Project";
 import CommonAPI from "./CommonAPI";
 import ObjectID from "../../Types/ObjectID";
 import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps";
-import logger from "../Utils/Logger";
+import logger, { getLogAttributesFromRequest } from "../Utils/Logger";
 
 export default class BillingAPI {
   public router: ExpressRouter;
@@ -32,11 +32,13 @@ export default class BillingAPI {
         try {
           logger.debug(
             `[Invoice Email] Webhook endpoint hit - /billing/webhook`,
+            getLogAttributesFromRequest(req as OneUptimeRequest),
           );
 
           if (!IsBillingEnabled) {
             logger.debug(
               `[Invoice Email] Billing not enabled, returning early`,
+              getLogAttributesFromRequest(req as OneUptimeRequest),
             );
             return Response.sendJsonObjectResponse(req, res, {
               message: "Billing is not enabled",
@@ -46,6 +48,7 @@ export default class BillingAPI {
           if (!BillingWebhookSecret) {
             logger.error(
               `[Invoice Email] Billing webhook secret is not configured`,
+              getLogAttributesFromRequest(req as OneUptimeRequest),
             );
             throw new BadDataException(
               "Billing webhook secret is not configured",
@@ -55,46 +58,65 @@ export default class BillingAPI {
           const signature: string = req.headers["stripe-signature"] as string;
           logger.debug(
             `[Invoice Email] Stripe signature header present: ${Boolean(signature)}`,
+            getLogAttributesFromRequest(req as OneUptimeRequest),
           );
 
           if (!signature) {
-            logger.error(`[Invoice Email] Missing Stripe signature header`);
+            logger.error(
+              `[Invoice Email] Missing Stripe signature header`,
+              getLogAttributesFromRequest(req as OneUptimeRequest),
+            );
             throw new BadDataException("Missing Stripe signature header");
           }
 
           const rawBody: string | undefined = (req as OneUptimeRequest).rawBody;
           logger.debug(
             `[Invoice Email] Raw body present: ${Boolean(rawBody)}, length: ${rawBody?.length || 0}`,
+            getLogAttributesFromRequest(req as OneUptimeRequest),
           );
 
           if (!rawBody) {
             logger.error(
               `[Invoice Email] Missing raw body for webhook verification`,
+              getLogAttributesFromRequest(req as OneUptimeRequest),
             );
             throw new BadDataException(
               "Missing raw body for webhook verification",
             );
           }
 
-          logger.debug(`[Invoice Email] Verifying webhook signature...`);
+          logger.debug(
+            `[Invoice Email] Verifying webhook signature...`,
+            getLogAttributesFromRequest(req as OneUptimeRequest),
+          );
           const event: Stripe.Event = BillingService.verifyWebhookSignature(
             rawBody,
             signature,
           );
           logger.debug(
             `[Invoice Email] Webhook signature verified successfully, event type: ${event.type}`,
+            getLogAttributesFromRequest(req as OneUptimeRequest),
           );
 
           // Handle the event asynchronously
-          logger.debug(`[Invoice Email] Handling webhook event...`);
+          logger.debug(
+            `[Invoice Email] Handling webhook event...`,
+            getLogAttributesFromRequest(req as OneUptimeRequest),
+          );
           await BillingService.handleWebhookEvent(event);
-          logger.debug(`[Invoice Email] Webhook event handled successfully`);
+          logger.debug(
+            `[Invoice Email] Webhook event handled successfully`,
+            getLogAttributesFromRequest(req as OneUptimeRequest),
+          );
 
           return Response.sendJsonObjectResponse(req, res, {
             received: true,
           });
         } catch (err) {
-          logger.error(`[Invoice Email] Stripe webhook error: ${err}`);
+          logger.error(
+            `[Invoice Email] Stripe webhook error: ${err}`,
+            getLogAttributesFromRequest(req as OneUptimeRequest),
+          );
           next(err);
         }
       },

package/Server/API/CommonAPI.ts

@@ -5,6 +5,7 @@ import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCom
 import { PlanType } from "../../Types/Billing/SubscriptionPlan";
 import UserType from "../../Types/UserType";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
+import SpanUtil from "../Utils/Telemetry/SpanUtil";
 
 export default class CommonAPI {
   @CaptureSpan()
@@ -62,6 +63,16 @@ export default class CommonAPI {
       props.isMasterAdmin = true;
     }
 
+    // Add context attributes to the current span for observability
+    SpanUtil.addAttributesToCurrentSpan({
+      ...(props.tenantId ? { projectId: props.tenantId.toString() } : {}),
+      ...(props.userId ? { userId: props.userId.toString() } : {}),
+      ...(props.userType ? { userType: props.userType } : {}),
+      ...((req as OneUptimeRequest).requestId
+        ? { requestId: (req as OneUptimeRequest).requestId }
+        : {}),
+    });
+
     return props;
   }
 }

package/Server/API/DashboardAPI.ts

@@ -4,11 +4,12 @@ import DashboardService, {
 } from "../Services/DashboardService";
 import DashboardDomainService from "../Services/DashboardDomainService";
 import CookieUtil from "../Utils/Cookie";
-import logger from "../Utils/Logger";
+import logger, { getLogAttributesFromRequest } from "../Utils/Logger";
 import {
   ExpressRequest,
   ExpressResponse,
   NextFunction,
+  OneUptimeRequest,
 } from "../Utils/Express";
 import Response from "../Utils/Response";
 import BaseAPI from "./BaseAPI";
@@ -76,7 +77,10 @@ export default class DashboardAPI extends BaseAPI<
             try {
               dashboardId = new ObjectID(dashboardIdOrDomain);
             } catch (err) {
-              logger.error(err);
+              logger.error(
+                err,
+                getLogAttributesFromRequest(req as OneUptimeRequest),
+              );
               return Response.sendErrorResponse(
                 req,
                 res,

package/Server/API/DashboardDomainAPI.ts

@@ -7,8 +7,9 @@ import {
   ExpressRequest,
   ExpressResponse,
   NextFunction,
+  OneUptimeRequest,
 } from "../Utils/Express";
-import logger from "../Utils/Logger";
+import logger, { getLogAttributesFromRequest } from "../Utils/Logger";
 import Response from "../Utils/Response";
 import BaseAPI from "./BaseAPI";
 import CommonAPI from "./CommonAPI";
@@ -219,11 +220,17 @@ export default class DashboardDomainAPI extends BaseAPI<
             );
           }
 
-          logger.debug("Ordering SSL");
+          logger.debug(
+            "Ordering SSL",
+            getLogAttributesFromRequest(req as OneUptimeRequest),
+          );
 
           await DashboardDomainService.orderCert(domain);
 
-          logger.debug("SSL Provisioned for domain - " + domain.fullDomain);
+          logger.debug(
+            "SSL Provisioned for domain - " + domain.fullDomain,
+            getLogAttributesFromRequest(req as OneUptimeRequest),
+          );
 
           return Response.sendEmptySuccessResponse(req, res);
         } catch (e) {

package/Server/API/GitHubAPI.ts

@@ -8,7 +8,7 @@ import Response from "../Utils/Response";
 import BadDataException from "../../Types/Exception/BadDataException";
 import NotAuthenticatedException from "../../Types/Exception/NotAuthenticatedException";
 import NotAuthorizedException from "../../Types/Exception/NotAuthorizedException";
-import logger from "../Utils/Logger";
+import logger, { getLogAttributesFromRequest } from "../Utils/Logger";
 import { JSONObject } from "../../Types/JSON";
 import {
   DashboardClientUrl,
@@ -140,8 +140,14 @@ export default class GitHubAPI {
 
           return Response.redirect(req, res, URL.fromString(redirectUrl));
         } catch (error) {
-          logger.error("GitHub Auth Callback Error:");
-          logger.error(error);
+          logger.error(
+            "GitHub Auth Callback Error:",
+            getLogAttributesFromRequest(req as OneUptimeRequest),
+          );
+          logger.error(
+            error,
+            getLogAttributesFromRequest(req as OneUptimeRequest),
+          );
           return Response.sendErrorResponse(
             req,
             res,
@@ -195,8 +201,14 @@ export default class GitHubAPI {
 
           return Response.redirect(req, res, URL.fromString(installUrl));
         } catch (error) {
-          logger.error("GitHub Install Redirect Error:");
-          logger.error(error);
+          logger.error(
+            "GitHub Install Redirect Error:",
+            getLogAttributesFromRequest(req as OneUptimeRequest),
+          );
+          logger.error(
+            error,
+            getLogAttributesFromRequest(req as OneUptimeRequest),
+          );
           return Response.sendErrorResponse(
             req,
             res,
@@ -272,8 +284,14 @@ export default class GitHubAPI {
             repositories: repositories as unknown,
           } as JSONObject);
         } catch (error) {
-          logger.error("GitHub List Repositories Error:");
-          logger.error(error);
+          logger.error(
+            "GitHub List Repositories Error:",
+            getLogAttributesFromRequest(req as OneUptimeRequest),
+          );
+          logger.error(
+            error,
+            getLogAttributesFromRequest(req as OneUptimeRequest),
+          );
 
           // Handle stale installation ID - clear it from the project and return specific error
           if (error instanceof GitHubInstallationNotFoundError) {
@@ -295,12 +313,17 @@ export default class GitHubAPI {
 
                 logger.info(
                   `Cleared stale GitHub App installation ID from project ${projectId}`,
+                  getLogAttributesFromRequest(req as OneUptimeRequest),
                 );
               } catch (clearError) {
                 logger.error(
                   "Failed to clear stale installation ID from project:",
+                  getLogAttributesFromRequest(req as OneUptimeRequest),
+                );
+                logger.error(
+                  clearError,
+                  getLogAttributesFromRequest(req as OneUptimeRequest),
                 );
-                logger.error(clearError);
               }
             }
 
@@ -434,8 +457,14 @@ export default class GitHubAPI {
             repository: BaseModel.toJSON(createdRepository, CodeRepository),
           } as JSONObject);
         } catch (error) {
-          logger.error("GitHub Connect Repository Error:");
-          logger.error(error);
+          logger.error(
+            "GitHub Connect Repository Error:",
+            getLogAttributesFromRequest(req as OneUptimeRequest),
+          );
+          logger.error(
+            error,
+            getLogAttributesFromRequest(req as OneUptimeRequest),
+          );
           return Response.sendErrorResponse(
             req,
             res,
@@ -484,7 +513,10 @@ export default class GitHubAPI {
             );
           }
 
-          logger.debug(`Received GitHub webhook event: ${event}`);
+          logger.debug(
+            `Received GitHub webhook event: ${event}`,
+            getLogAttributesFromRequest(req as OneUptimeRequest),
+          );
 
           // Handle installation events - specifically when the app is uninstalled
           if (event === "installation") {
@@ -498,6 +530,7 @@ export default class GitHubAPI {
             if (action === "deleted" && installationId) {
               logger.info(
                 `GitHub App installation ${installationId} was deleted. Clearing from database...`,
+                getLogAttributesFromRequest(req as OneUptimeRequest),
               );
 
               try {
@@ -533,12 +566,17 @@ export default class GitHubAPI {
 
                 logger.info(
                   `Successfully cleared GitHub App installation ${installationId} from database`,
+                  getLogAttributesFromRequest(req as OneUptimeRequest),
                 );
               } catch (clearError) {
                 logger.error(
                   `Failed to clear GitHub App installation ${installationId} from database:`,
+                  getLogAttributesFromRequest(req as OneUptimeRequest),
+                );
+                logger.error(
+                  clearError,
+                  getLogAttributesFromRequest(req as OneUptimeRequest),
                 );
-                logger.error(clearError);
               }
             }
           }
@@ -554,8 +592,14 @@ export default class GitHubAPI {
             message: "Webhook received",
           } as JSONObject);
         } catch (error) {
-          logger.error("GitHub Webhook Error:");
-          logger.error(error);
+          logger.error(
+            "GitHub Webhook Error:",
+            getLogAttributesFromRequest(req as OneUptimeRequest),
+          );
+          logger.error(
+            error,
+            getLogAttributesFromRequest(req as OneUptimeRequest),
+          );
           return Response.sendErrorResponse(
             req,
             res,