@oneuptime/common 10.0.53 → 10.0.55

package/Server/API/MicrosoftTeamsAPI.ts

@@ -5,7 +5,7 @@ import Express, {
 } from "../Utils/Express";
 import Response from "../Utils/Response";
 import BadRequestException from "../../Types/Exception/BadRequestException";
-import logger from "../Utils/Logger";
+import logger, { getLogAttributesFromRequest } from "../Utils/Logger";
 import { JSONObject } from "../../Types/JSON";
 import BadDataException from "../../Types/Exception/BadDataException";
 import Exception from "../../Types/Exception/Exception";
@@ -213,7 +213,10 @@ export default class MicrosoftTeamsAPI {
 
           // Handle archive errors
           archive.on("error", (err: Error) => {
-            logger.error("Archive error: " + err);
+            logger.error(
+              "Archive error: " + err,
+              getLogAttributesFromRequest(req as any),
+            );
             throw err;
           });
 
@@ -263,7 +266,10 @@ export default class MicrosoftTeamsAPI {
           // Finalize the archive
           await archive.finalize();
         } catch (error) {
-          logger.error("Error creating Teams app manifest zip: " + error);
+          logger.error(
+            "Error creating Teams app manifest zip: " + error,
+            getLogAttributesFromRequest(req as any),
+          );
           return Response.sendErrorResponse(
             req,
             res,
@@ -366,8 +372,12 @@ export default class MicrosoftTeamsAPI {
 
           logger.debug(
             "Microsoft Teams Token Request Body (static redirect): ",
+            getLogAttributesFromRequest(req as any),
+          );
+          logger.debug(
+            tokenRequestBody,
+            getLogAttributesFromRequest(req as any),
           );
-          logger.debug(tokenRequestBody);
 
           const tokenResponse: HTTPErrorResponse | HTTPResponse<JSONObject> =
             await API.post<JSONObject>({
@@ -381,14 +391,23 @@ export default class MicrosoftTeamsAPI {
             });
 
           if (tokenResponse instanceof HTTPErrorResponse) {
-            logger.error("Error getting Teams token:");
-            logger.error(tokenResponse);
+            logger.error(
+              "Error getting Teams token:",
+              getLogAttributesFromRequest(req as any),
+            );
+            logger.error(
+              tokenResponse,
+              getLogAttributesFromRequest(req as any),
+            );
             throw tokenResponse;
           }
 
           const tokenData: JSONObject = tokenResponse.data;
-          logger.debug("Microsoft Teams Token Response (static redirect): ");
-          logger.debug(tokenData);
+          logger.debug(
+            "Microsoft Teams Token Response (static redirect): ",
+            getLogAttributesFromRequest(req as any),
+          );
+          logger.debug(tokenData, getLogAttributesFromRequest(req as any));
 
           if (!tokenData["access_token"]) {
             return Response.sendErrorResponse(
@@ -413,14 +432,23 @@ export default class MicrosoftTeamsAPI {
           });
 
           if (userProfileResponse instanceof HTTPErrorResponse) {
-            logger.error("Error getting user profile:");
-            logger.error(userProfileResponse);
+            logger.error(
+              "Error getting user profile:",
+              getLogAttributesFromRequest(req as any),
+            );
+            logger.error(
+              userProfileResponse,
+              getLogAttributesFromRequest(req as any),
+            );
             throw userProfileResponse;
           }
 
           const userProfile: JSONObject = userProfileResponse.data;
-          logger.debug("User Profile: ");
-          logger.debug(userProfile);
+          logger.debug(
+            "User Profile: ",
+            getLogAttributesFromRequest(req as any),
+          );
+          logger.debug(userProfile, getLogAttributesFromRequest(req as any));
 
           await WorkspaceUserAuthTokenService.refreshAuthToken({
             projectId: new ObjectID(projectId),
@@ -462,8 +490,11 @@ export default class MicrosoftTeamsAPI {
             teamsIntegrationPageUrl.addQueryParam("needAdminConsent", "true"),
           );
         } catch (err) {
-          logger.error("Error in static Microsoft Teams auth callback: ");
-          logger.error(err);
+          logger.error(
+            "Error in static Microsoft Teams auth callback: ",
+            getLogAttributesFromRequest(req as any),
+          );
+          logger.error(err, getLogAttributesFromRequest(req as any));
           return Response.sendErrorResponse(
             req,
             res,
@@ -543,8 +574,11 @@ export default class MicrosoftTeamsAPI {
 
           return Response.redirect(req, res, URL.fromString(adminConsentUrl));
         } catch (error) {
-          logger.error("Error starting Teams admin consent: ");
-          logger.error(error);
+          logger.error(
+            "Error starting Teams admin consent: ",
+            getLogAttributesFromRequest(req as any),
+          );
+          logger.error(error, getLogAttributesFromRequest(req as any));
           return Response.sendErrorResponse(
             req,
             res,
@@ -652,8 +686,11 @@ export default class MicrosoftTeamsAPI {
             });
 
           if (tokenResp instanceof HTTPErrorResponse) {
-            logger.error("Error getting app token after admin consent:");
-            logger.error(tokenResp);
+            logger.error(
+              "Error getting app token after admin consent:",
+              getLogAttributesFromRequest(req as any),
+            );
+            logger.error(tokenResp, getLogAttributesFromRequest(req as any));
             return Response.redirect(
               req,
               res,
@@ -672,8 +709,11 @@ export default class MicrosoftTeamsAPI {
             Date.now() + Math.max(0, (expiresInSec - 60) * 1000),
           ).toISOString();
 
-          logger.debug("App Access Token acquired via admin consent: ");
-          logger.debug(tokenData);
+          logger.debug(
+            "App Access Token acquired via admin consent: ",
+            getLogAttributesFromRequest(req as any),
+          );
+          logger.debug(tokenData, getLogAttributesFromRequest(req as any));
 
           // Get available teams from user auth token
           const userId: string = stateParts[1]!;
@@ -704,8 +744,14 @@ export default class MicrosoftTeamsAPI {
               });
 
               if (teamsResponse instanceof HTTPErrorResponse) {
-                logger.error("Failed to get teams:");
-                logger.error(teamsResponse);
+                logger.error(
+                  "Failed to get teams:",
+                  getLogAttributesFromRequest(req as any),
+                );
+                logger.error(
+                  teamsResponse,
+                  getLogAttributesFromRequest(req as any),
+                );
                 return Response.redirect(
                   req,
                   res,
@@ -743,8 +789,11 @@ export default class MicrosoftTeamsAPI {
                 {} as Record<string, MicrosoftTeamsTeam>,
               );
             } catch (error) {
-              logger.error("Error getting teams:");
-              logger.error(error);
+              logger.error(
+                "Error getting teams:",
+                getLogAttributesFromRequest(req as any),
+              );
+              logger.error(error, getLogAttributesFromRequest(req as any));
               return Response.redirect(
                 req,
                 res,
@@ -784,8 +833,11 @@ export default class MicrosoftTeamsAPI {
               .addQueryParam("tenantId", tenantId),
           );
         } catch (err) {
-          logger.error("Error in Microsoft Teams admin consent callback: ");
-          logger.error(err);
+          logger.error(
+            "Error in Microsoft Teams admin consent callback: ",
+            getLogAttributesFromRequest(req as any),
+          );
+          logger.error(err, getLogAttributesFromRequest(req as any));
           // Best-effort redirect to integration page with error
           try {
             const stateParam: string | undefined =
@@ -830,7 +882,10 @@ export default class MicrosoftTeamsAPI {
           // Delegate to MicrosoftTeamsUtil which uses the Bot Framework SDK
           await MicrosoftTeamsUtil.processBotActivity(req, res);
         } catch (error) {
-          logger.error("Error in Bot Framework endpoint: " + error);
+          logger.error(
+            "Error in Bot Framework endpoint: " + error,
+            getLogAttributesFromRequest(req as any),
+          );
           if (!res.headersSent) {
             Response.sendJsonObjectResponse(req, res, {
               error: "Internal server error",
@@ -844,8 +899,11 @@ export default class MicrosoftTeamsAPI {
     router.post(
       "/microsoft-teams/webhook",
       async (req: ExpressRequest, res: ExpressResponse) => {
-        logger.debug("Microsoft Teams Webhook Request: ");
-        logger.debug(req.body);
+        logger.debug(
+          "Microsoft Teams Webhook Request: ",
+          getLogAttributesFromRequest(req as any),
+        );
+        logger.debug(req.body, getLogAttributesFromRequest(req as any));
 
         try {
           const authResult: MicrosoftTeamsRequest =
@@ -853,8 +911,11 @@ export default class MicrosoftTeamsAPI {
               req: req,
             });
 
-          logger.debug("Microsoft Teams Auth Result: ");
-          logger.debug(authResult);
+          logger.debug(
+            "Microsoft Teams Auth Result: ",
+            getLogAttributesFromRequest(req as any),
+          );
+          logger.debug(authResult, getLogAttributesFromRequest(req as any));
 
           if (authResult.isAuthorized === false) {
             return Response.sendTextResponse(req, res, "");
@@ -884,8 +945,11 @@ export default class MicrosoftTeamsAPI {
 
           return Response.sendTextResponse(req, res, "");
         } catch (error) {
-          logger.error("Error processing Teams webhook:");
-          logger.error(error);
+          logger.error(
+            "Error processing Teams webhook:",
+            getLogAttributesFromRequest(req as any),
+          );
+          logger.error(error, getLogAttributesFromRequest(req as any));
           return Response.sendTextResponse(req, res, "");
         }
       },

package/Server/API/OpenSourceDeploymentAPI.ts

@@ -6,7 +6,7 @@ import OpenSourceDeploymentService, {
   Service as OpenSourceDeploymentServiceType,
 } from "../Services/OpenSourceDeploymentService";
 import { OpenSourceDeploymentWebhookUrl } from "../EnvironmentConfig";
-import logger from "../Utils/Logger";
+import logger, { getLogAttributesFromRequest } from "../Utils/Logger";
 import Response from "../Utils/Response";
 import {
   ExpressRequest,
@@ -67,7 +67,7 @@ export default class OpenSourceDeploymentAPI extends BaseAPI<
                 instanceUrl: deployment.instanceUrl?.toString() || "",
               },
             }).catch((err: Error) => {
-              logger.error(err);
+              logger.error(err, getLogAttributesFromRequest(req as any));
             });
           }
 

package/Server/API/SlackAPI.ts

@@ -6,7 +6,7 @@ import Express, {
 import Response from "../Utils/Response";
 import SlackAuthorization from "../Middleware/SlackAuthorization";
 import BadRequestException from "../../Types/Exception/BadRequestException";
-import logger from "../Utils/Logger";
+import logger, { getLogAttributesFromRequest } from "../Utils/Logger";
 import { JSONObject } from "../../Types/JSON";
 import BadDataException from "../../Types/Exception/BadDataException";
 import {
@@ -157,8 +157,11 @@ export default class SlackAPI {
           redirect_uri: redirectUri.toString(),
         };
 
-        logger.debug("Slack Auth Request Body: ");
-        logger.debug(requestBody);
+        logger.debug(
+          "Slack Auth Request Body: ",
+          getLogAttributesFromRequest(req as any),
+        );
+        logger.debug(requestBody, getLogAttributesFromRequest(req as any));
 
         // send the request to slack api to get the access token https://slack.com/api/oauth.v2.access
 
@@ -177,8 +180,11 @@ export default class SlackAPI {
 
         const responseBody: JSONObject = response.data;
 
-        logger.debug("Slack Auth Request Body: ");
-        logger.debug(responseBody);
+        logger.debug(
+          "Slack Auth Request Body: ",
+          getLogAttributesFromRequest(req as any),
+        );
+        logger.debug(responseBody, getLogAttributesFromRequest(req as any));
 
         let slackTeamId: string | undefined = undefined;
         let slackBotAccessToken: string | undefined = undefined;
@@ -371,8 +377,11 @@ export default class SlackAPI {
           redirect_uri: redirectUri.toString(),
         };
 
-        logger.debug("Slack Auth Request Body: ");
-        logger.debug(requestBody);
+        logger.debug(
+          "Slack Auth Request Body: ",
+          getLogAttributesFromRequest(req as any),
+        );
+        logger.debug(requestBody, getLogAttributesFromRequest(req as any));
 
         // send the request to slack api to get the access token https://slack.com/api/oauth.v2.access
 
@@ -391,8 +400,11 @@ export default class SlackAPI {
 
         const responseBody: JSONObject = response.data;
 
-        logger.debug("Slack User Auth Request Body: ");
-        logger.debug(responseBody);
+        logger.debug(
+          "Slack User Auth Request Body: ",
+          getLogAttributesFromRequest(req as any),
+        );
+        logger.debug(responseBody, getLogAttributesFromRequest(req as any));
 
         if (
           responseBody["id_token"] &&
@@ -406,8 +418,11 @@ export default class SlackAPI {
               "base64",
             ).toString("utf8"),
           );
-          logger.debug("Decoded ID Token: ");
-          logger.debug(decodedIdToken);
+          logger.debug(
+            "Decoded ID Token: ",
+            getLogAttributesFromRequest(req as any),
+          );
+          logger.debug(decodedIdToken, getLogAttributesFromRequest(req as any));
           responseBody["id_token"] = decodedIdToken;
         }
 
@@ -462,12 +477,30 @@ export default class SlackAPI {
 
         // cehck if the workspace project id is same as the team id.
         if (projectAuth) {
-          logger.debug("Project Auth: ");
-          logger.debug(projectAuth.workspaceProjectId);
-          logger.debug("Response Team ID: ");
-          logger.debug(idToken["https://slack.com/team_id"]);
-          logger.debug("Response User ID: ");
-          logger.debug(idToken["https://slack.com/user_id"]);
+          logger.debug(
+            "Project Auth: ",
+            getLogAttributesFromRequest(req as any),
+          );
+          logger.debug(
+            projectAuth.workspaceProjectId,
+            getLogAttributesFromRequest(req as any),
+          );
+          logger.debug(
+            "Response Team ID: ",
+            getLogAttributesFromRequest(req as any),
+          );
+          logger.debug(
+            idToken["https://slack.com/team_id"],
+            getLogAttributesFromRequest(req as any),
+          );
+          logger.debug(
+            "Response User ID: ",
+            getLogAttributesFromRequest(req as any),
+          );
+          logger.debug(
+            idToken["https://slack.com/user_id"],
+            getLogAttributesFromRequest(req as any),
+          );
 
           if (
             projectAuth.workspaceProjectId?.toString() !==
@@ -536,18 +569,27 @@ export default class SlackAPI {
       "/slack/interactive",
       SlackAuthorization.isAuthorizedSlackRequest,
       async (req: ExpressRequest, res: ExpressResponse) => {
-        logger.debug("Slack Interactive Request: ");
+        logger.debug(
+          "Slack Interactive Request: ",
+          getLogAttributesFromRequest(req as any),
+        );
 
         const authResult: SlackRequest = await SlackAuthAction.isAuthorized({
           req: req,
         });
 
-        logger.debug("Slack Interactive Auth Result: ");
-        logger.debug(authResult);
+        logger.debug(
+          "Slack Interactive Auth Result: ",
+          getLogAttributesFromRequest(req as any),
+        );
+        logger.debug(authResult, getLogAttributesFromRequest(req as any));
 
         // if slack uninstall app then,
         if (authResult.payloadType === "app_uninstall") {
-          logger.debug("Slack App Uninstall Request: ");
+          logger.debug(
+            "Slack App Uninstall Request: ",
+            getLogAttributesFromRequest(req as any),
+          );
 
           // remove the project auth and user auth.
 
@@ -576,7 +618,10 @@ export default class SlackAPI {
             },
           });
 
-          logger.debug("Slack App Uninstall Request: Deleted all auth tokens.");
+          logger.debug(
+            "Slack App Uninstall Request: Deleted all auth tokens.",
+            getLogAttributesFromRequest(req as any),
+          );
           // return empty response.
 
           return Response.sendTextResponse(req, res, "");
@@ -768,14 +813,20 @@ export default class SlackAPI {
       "/slack/events",
       SlackAuthorization.isAuthorizedSlackRequest,
       async (req: ExpressRequest, res: ExpressResponse) => {
-        logger.debug("Slack Events API Request received");
-        logger.debug(req.body);
+        logger.debug(
+          "Slack Events API Request received",
+          getLogAttributesFromRequest(req as any),
+        );
+        logger.debug(req.body, getLogAttributesFromRequest(req as any));
 
         const payload: JSONObject = req.body;
 
         // Handle URL verification challenge from Slack
         if (payload["type"] === "url_verification") {
-          logger.debug("Slack URL verification challenge received");
+          logger.debug(
+            "Slack URL verification challenge received",
+            getLogAttributesFromRequest(req as any),
+          );
           return Response.sendJsonObjectResponse(req, res, {
             challenge: payload["challenge"],
           });
@@ -786,13 +837,19 @@ export default class SlackAPI {
           const event: JSONObject = payload["event"] as JSONObject;
 
           if (!event) {
-            logger.debug("No event found in payload");
+            logger.debug(
+              "No event found in payload",
+              getLogAttributesFromRequest(req as any),
+            );
             return Response.sendTextResponse(req, res, "ok");
           }
 
           // Handle reaction_added events
           if (event["type"] === "reaction_added") {
-            logger.debug("Reaction added event received");
+            logger.debug(
+              "Reaction added event received",
+              getLogAttributesFromRequest(req as any),
+            );
 
             /*
              * Respond immediately to Slack to prevent retry
@@ -822,6 +879,7 @@ export default class SlackAPI {
             if (!isSupportedEmoji) {
               logger.debug(
                 `Emoji "${reactionData.reaction}" is not supported. Skipping.`,
+                getLogAttributesFromRequest(req as any),
               );
               return;
             }
@@ -833,22 +891,31 @@ export default class SlackAPI {
             try {
               await SlackIncidentActions.handleEmojiReaction(reactionData);
             } catch (err) {
-              logger.error("Error handling incident emoji reaction:");
-              logger.error(err);
+              logger.error(
+                "Error handling incident emoji reaction:",
+                getLogAttributesFromRequest(req as any),
+              );
+              logger.error(err, getLogAttributesFromRequest(req as any));
             }
 
             try {
               await SlackAlertActions.handleEmojiReaction(reactionData);
             } catch (err) {
-              logger.error("Error handling alert emoji reaction:");
-              logger.error(err);
+              logger.error(
+                "Error handling alert emoji reaction:",
+                getLogAttributesFromRequest(req as any),
+              );
+              logger.error(err, getLogAttributesFromRequest(req as any));
             }
 
             try {
               await SlackAlertEpisodeActions.handleEmojiReaction(reactionData);
             } catch (err) {
-              logger.error("Error handling alert episode emoji reaction:");
-              logger.error(err);
+              logger.error(
+                "Error handling alert episode emoji reaction:",
+                getLogAttributesFromRequest(req as any),
+              );
+              logger.error(err, getLogAttributesFromRequest(req as any));
             }
 
             try {
@@ -856,8 +923,11 @@ export default class SlackAPI {
                 reactionData,
               );
             } catch (err) {
-              logger.error("Error handling incident episode emoji reaction:");
-              logger.error(err);
+              logger.error(
+                "Error handling incident episode emoji reaction:",
+                getLogAttributesFromRequest(req as any),
+              );
+              logger.error(err, getLogAttributesFromRequest(req as any));
             }
 
             try {
@@ -867,8 +937,9 @@ export default class SlackAPI {
             } catch (err) {
               logger.error(
                 "Error handling scheduled maintenance emoji reaction:",
+                getLogAttributesFromRequest(req as any),
               );
-              logger.error(err);
+              logger.error(err, getLogAttributesFromRequest(req as any));
             }
 
             return;

package/Server/API/StatusAPI.ts

@@ -5,7 +5,7 @@ import Express, {
   ExpressResponse,
   ExpressRouter,
 } from "../Utils/Express";
-import logger from "../Utils/Logger";
+import logger, { getLogAttributesFromRequest } from "../Utils/Logger";
 import Response from "../Utils/Response";
 import Telemetry, { TelemetryCounter } from "../Utils/Telemetry";
 import Exception from "../../Types/Exception/Exception";
@@ -62,7 +62,7 @@ export default class StatusAPI {
     router.get("/status", (req: ExpressRequest, res: ExpressResponse) => {
       statusCheckSuccessCounter.add(1);
 
-      logger.info("Status check: ok");
+      logger.info("Status check: ok", getLogAttributesFromRequest(req as any));
 
       Response.sendJsonObjectResponse(req, res, {
         status: "ok",
@@ -127,17 +127,20 @@ export default class StatusAPI {
     res: ExpressResponse,
   ): Promise<void> {
     try {
-      logger.info("Ready check: Init");
+      logger.info("Ready check: Init", getLogAttributesFromRequest(req as any));
       await options.readyCheck();
-      logger.info("Ready check: ok");
+      logger.info("Ready check: ok", getLogAttributesFromRequest(req as any));
       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 as any),
+      );
+      logger.error(e, getLogAttributesFromRequest(req as any));
 
       stausReadyFailed.add(1);
       Response.sendErrorResponse(
@@ -157,17 +160,20 @@ export default class StatusAPI {
     res: ExpressResponse,
   ): Promise<void> {
     try {
-      logger.info("Live check: Init");
+      logger.info("Live check: Init", getLogAttributesFromRequest(req as any));
       await options.liveCheck();
-      logger.info("Live check: ok");
+      logger.info("Live check: ok", getLogAttributesFromRequest(req as any));
       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 as any),
+      );
+      logger.error(e, getLogAttributesFromRequest(req as any));
       stausLiveFailed.add(1);
       Response.sendErrorResponse(
         req,
@@ -184,13 +190,19 @@ export default class StatusAPI {
     res: ExpressResponse,
   ): Promise<void> {
     try {
-      logger.debug("Global cache check");
+      logger.debug(
+        "Global cache check",
+        getLogAttributesFromRequest(req as any),
+      );
       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 as any),
+      );
 
       Response.sendJsonObjectResponse(req, res, {
         status: "ok",
@@ -213,7 +225,10 @@ export default class StatusAPI {
     res: ExpressResponse,
   ): Promise<void> {
     try {
-      logger.debug("Analytics database check");
+      logger.debug(
+        "Analytics database check",
+        getLogAttributesFromRequest(req as any),
+      );
       if (options.analyticsDatabaseCheck) {
         await options.analyticsDatabaseCheck();
       } else {
@@ -221,7 +236,10 @@ export default class StatusAPI {
           "Analytics database check not implemented",
         );
       }
-      logger.info("Analytics database check: ok");
+      logger.info(
+        "Analytics database check: ok",
+        getLogAttributesFromRequest(req as any),
+      );
 
       Response.sendJsonObjectResponse(req, res, {
         status: "ok",
@@ -244,7 +262,7 @@ export default class StatusAPI {
     res: ExpressResponse,
   ): Promise<void> {
     try {
-      logger.debug("Database check");
+      logger.debug("Database check", getLogAttributesFromRequest(req as any));
 
       if (options.databaseCheck) {
         await options.databaseCheck();
@@ -252,7 +270,10 @@ export default class StatusAPI {
         throw new BadRequestException("Database check not implemented");
       }
 
-      logger.info("Database check: ok");
+      logger.info(
+        "Database check: ok",
+        getLogAttributesFromRequest(req as any),
+      );
 
       Response.sendJsonObjectResponse(req, res, {
         status: "ok",