@oneuptime/common 10.0.53 → 10.0.54

package/build/dist/Server/Utils/Workspace/Slack/Slack.js

@@ -27,9 +27,12 @@ export default class SlackUtil extends WorkspaceBase {
             .startsWith("https://hooks.slack.com/services/");
     }
     static async getUsernameFromUserId(data) {
-        var _a, _b, _c;
-        logger.debug("Getting username from user ID with data:");
-        logger.debug(data);
+        var _a, _b, _c, _d;
+        const usernameLogAttributes = {
+            projectId: (_a = data.projectId) === null || _a === void 0 ? void 0 : _a.toString(),
+        };
+        logger.debug("Getting username from user ID with data:", usernameLogAttributes);
+        logger.debug(data, usernameLogAttributes);
         const response = await API.post({
             url: URL.fromString("https://slack.com/api/users.info"),
             data: {
@@ -44,38 +47,39 @@ export default class SlackUtil extends WorkspaceBase {
                 exponentialBackoff: true,
             },
         });
-        logger.debug("Response from Slack API for getting user info:");
-        logger.debug(response);
+        logger.debug("Response from Slack API for getting user info:", usernameLogAttributes);
+        logger.debug(response, usernameLogAttributes);
         if (response instanceof HTTPErrorResponse) {
-            logger.error("Error response from Slack API:");
-            logger.error(response);
+            logger.error("Error response from Slack API:", usernameLogAttributes);
+            logger.error(response, usernameLogAttributes);
             throw response;
         }
         // check for ok response
-        if (((_a = response.jsonData) === null || _a === void 0 ? void 0 : _a["ok"]) !== true) {
-            logger.error("Invalid response from Slack API:");
-            logger.error(response.jsonData);
+        if (((_b = response.jsonData) === null || _b === void 0 ? void 0 : _b["ok"]) !== true) {
+            logger.error("Invalid response from Slack API:", usernameLogAttributes);
+            logger.error(response.jsonData, usernameLogAttributes);
             return null;
         }
-        if (!((_c = (_b = response.jsonData) === null || _b === void 0 ? void 0 : _b["user"]) === null || _c === void 0 ? void 0 : _c["name"])) {
-            logger.error("Invalid response from Slack API:");
-            logger.error(response.jsonData);
+        if (!((_d = (_c = response.jsonData) === null || _c === void 0 ? void 0 : _c["user"]) === null || _d === void 0 ? void 0 : _d["name"])) {
+            logger.error("Invalid response from Slack API:", usernameLogAttributes);
+            logger.error(response.jsonData, usernameLogAttributes);
             return null;
         }
         const username = response.jsonData["user"]["name"];
-        logger.debug("Username obtained:");
-        logger.debug(username);
+        logger.debug("Username obtained:", usernameLogAttributes);
+        logger.debug(username, usernameLogAttributes);
         return username;
     }
     static async showModalToUser(data) {
         var _a, _b;
-        logger.debug("Showing modal to user with data:");
-        logger.debug(data);
+        const modalLogAttributes = { triggerId: data.triggerId };
+        logger.debug("Showing modal to user with data:", modalLogAttributes);
+        logger.debug(data, modalLogAttributes);
         const modalJson = this.getModalBlock({
             payloadModalBlock: data.modalBlock,
         });
-        logger.debug("Modal JSON generated:");
-        logger.debug(JSON.stringify(modalJson, null, 2));
+        logger.debug("Modal JSON generated:", modalLogAttributes);
+        logger.debug(JSON.stringify(modalJson, null, 2), modalLogAttributes);
         // use view.open API to show modal
         const result = await API.post({
             url: URL.fromString("https://slack.com/api/views.open"),
@@ -93,17 +97,17 @@ export default class SlackUtil extends WorkspaceBase {
             },
         });
         if (result instanceof HTTPErrorResponse) {
-            logger.error("Error response from Slack API:");
-            logger.error(result);
+            logger.error("Error response from Slack API:", modalLogAttributes);
+            logger.error(result, modalLogAttributes);
             throw result;
         }
         if (((_a = result.jsonData) === null || _a === void 0 ? void 0 : _a["ok"]) !== true) {
-            logger.error("Invalid response from Slack API:");
-            logger.error(result.jsonData);
+            logger.error("Invalid response from Slack API:", modalLogAttributes);
+            logger.error(result.jsonData, modalLogAttributes);
             const messageFromSlack = (_b = result.jsonData) === null || _b === void 0 ? void 0 : _b["error"];
             throw new BadRequestException("Error from Slack " + messageFromSlack);
         }
-        logger.debug("Modal shown to user successfully.");
+        logger.debug("Modal shown to user successfully.", modalLogAttributes);
     }
     static async sendEphemeralMessageToChannel(data) {
         var _a, _b;
@@ -127,17 +131,25 @@ export default class SlackUtil extends WorkspaceBase {
             },
         });
         if (response instanceof HTTPErrorResponse) {
-            logger.error("Error response from Slack API for ephemeral message:");
-            logger.error(response);
+            logger.error("Error response from Slack API for ephemeral message:", {
+                channelId: data.channelId,
+            });
+            logger.error(response, { channelId: data.channelId });
             throw response;
         }
         if (((_a = response.jsonData) === null || _a === void 0 ? void 0 : _a["ok"]) !== true) {
-            logger.error("Invalid response from Slack API for ephemeral message:");
-            logger.error(response.jsonData);
+            logger.error("Invalid response from Slack API for ephemeral message:", {
+                channelId: data.channelId,
+            });
+            logger.error(response.jsonData, {
+                channelId: data.channelId,
+            });
             const messageFromSlack = (_b = response.jsonData) === null || _b === void 0 ? void 0 : _b["error"];
             throw new BadRequestException("Error from Slack " + messageFromSlack);
         }
-        logger.debug("Ephemeral message sent successfully.");
+        logger.debug("Ephemeral message sent successfully.", {
+            channelId: data.channelId,
+        });
     }
     static async sendDirectMessageToUser(data) {
         // Send direct message to user
@@ -155,7 +167,7 @@ export default class SlackUtil extends WorkspaceBase {
         });
     }
     static async archiveChannels(data) {
-        var _a, _b;
+        var _a, _b, _c;
         if (data.sendMessageBeforeArchiving) {
             await this.sendMessage({
                 workspaceMessagePayload: {
@@ -170,8 +182,11 @@ export default class SlackUtil extends WorkspaceBase {
                 projectId: data.projectId,
             });
         }
-        logger.debug("Archiving channels with data:");
-        logger.debug(data);
+        const archiveLogAttributes = {
+            projectId: (_a = data.projectId) === null || _a === void 0 ? void 0 : _a.toString(),
+        };
+        logger.debug("Archiving channels with data:", archiveLogAttributes);
+        logger.debug(data, archiveLogAttributes);
         for (const channelId of data.channelIds) {
             const response = await API.post({
                 url: URL.fromString("https://slack.com/api/conversations.archive"),
@@ -187,26 +202,27 @@ export default class SlackUtil extends WorkspaceBase {
                     exponentialBackoff: true,
                 },
             });
-            logger.debug("Response from Slack API for archiving channel:");
-            logger.debug(response);
+            logger.debug("Response from Slack API for archiving channel:", archiveLogAttributes);
+            logger.debug(response, archiveLogAttributes);
             if (response instanceof HTTPErrorResponse) {
-                logger.error("Error response from Slack API:");
-                logger.error(response);
+                logger.error("Error response from Slack API:", archiveLogAttributes);
+                logger.error(response, archiveLogAttributes);
                 throw response;
             }
-            if (((_a = response.jsonData) === null || _a === void 0 ? void 0 : _a["ok"]) !== true) {
-                logger.error("Invalid response from Slack API:");
-                logger.error(response.jsonData);
-                const messageFromSlack = (_b = response.jsonData) === null || _b === void 0 ? void 0 : _b["error"];
+            if (((_b = response.jsonData) === null || _b === void 0 ? void 0 : _b["ok"]) !== true) {
+                logger.error("Invalid response from Slack API:", archiveLogAttributes);
+                logger.error(response.jsonData, archiveLogAttributes);
+                const messageFromSlack = (_c = response.jsonData) === null || _c === void 0 ? void 0 : _c["error"];
                 throw new BadRequestException("Error from Slack " + messageFromSlack);
             }
         }
-        logger.debug("Channels archived successfully.");
+        logger.debug("Channels archived successfully.", archiveLogAttributes);
     }
     static async joinChannel(data) {
         var _a, _b;
-        logger.debug("Joining channel with data:");
-        logger.debug(data);
+        const joinLogAttributes = { channelId: data.channelId };
+        logger.debug("Joining channel with data:", joinLogAttributes);
+        logger.debug(data, joinLogAttributes);
         // Join channel
         const response = await API.post({
             url: URL.fromString("https://slack.com/api/conversations.join"),
@@ -222,21 +238,21 @@ export default class SlackUtil extends WorkspaceBase {
                 exponentialBackoff: true,
             },
         });
-        logger.debug("Response from Slack API for joining channel:");
-        logger.debug(response);
+        logger.debug("Response from Slack API for joining channel:", joinLogAttributes);
+        logger.debug(response, joinLogAttributes);
         if (response instanceof HTTPErrorResponse) {
-            logger.error("Error response from Slack API:");
-            logger.error(response);
+            logger.error("Error response from Slack API:", joinLogAttributes);
+            logger.error(response, joinLogAttributes);
             throw response;
         }
         if (((_a = response.jsonData) === null || _a === void 0 ? void 0 : _a["ok"]) !== true) {
-            logger.error("Invalid response from Slack API:");
-            logger.error(response.jsonData);
+            logger.error("Invalid response from Slack API:", joinLogAttributes);
+            logger.error(response.jsonData, joinLogAttributes);
             const messageFromSlack = (_b = response.jsonData) === null || _b === void 0 ? void 0 : _b["error"];
             throw new BadRequestException("Error from Slack " + messageFromSlack);
         }
-        logger.debug("Channel joined successfully with data:");
-        logger.debug(data);
+        logger.debug("Channel joined successfully with data:", joinLogAttributes);
+        logger.debug(data, joinLogAttributes);
     }
     static async inviteUserToChannelByChannelId(data) {
         var _a, _b;
@@ -247,11 +263,16 @@ export default class SlackUtil extends WorkspaceBase {
             userId: data.workspaceUserId,
         });
         if (isUserInChannel) {
-            logger.debug("User already in channel.");
+            logger.debug("User already in channel.", {
+                channelId: data.channelId,
+            });
             return;
         }
-        logger.debug("Inviting user to channel with data:");
-        logger.debug(data);
+        const inviteByIdLogAttributes = {
+            channelId: data.channelId,
+        };
+        logger.debug("Inviting user to channel with data:", inviteByIdLogAttributes);
+        logger.debug(data, inviteByIdLogAttributes);
         const response = await API.post({
             url: URL.fromString("https://slack.com/api/conversations.invite"),
             data: {
@@ -267,28 +288,33 @@ export default class SlackUtil extends WorkspaceBase {
                 exponentialBackoff: true,
             },
         });
-        logger.debug("Response from Slack API for inviting user:");
-        logger.debug(response);
+        logger.debug("Response from Slack API for inviting user:", inviteByIdLogAttributes);
+        logger.debug(response, inviteByIdLogAttributes);
         if (response instanceof HTTPErrorResponse) {
-            logger.error("Error response from Slack API:");
-            logger.error(response);
+            logger.error("Error response from Slack API:", inviteByIdLogAttributes);
+            logger.error(response, inviteByIdLogAttributes);
             throw response;
         }
         if (((_a = response.jsonData) === null || _a === void 0 ? void 0 : _a["ok"]) !== true) {
-            logger.error("Invalid response from Slack API:");
-            logger.error(response.jsonData);
+            logger.error("Invalid response from Slack API:", inviteByIdLogAttributes);
+            logger.error(response.jsonData, inviteByIdLogAttributes);
             const messageFromSlack = (_b = response.jsonData) === null || _b === void 0 ? void 0 : _b["error"];
             throw new BadRequestException("Error from Slack " + messageFromSlack);
         }
-        logger.debug("User invited to channel successfully.");
+        logger.debug("User invited to channel successfully.", inviteByIdLogAttributes);
     }
     static async inviteUserToChannelByChannelName(data) {
+        var _a, _b;
         if (data.channelName && data.channelName.startsWith("#")) {
             // trim # from channel name
             data.channelName = data.channelName.substring(1);
         }
-        logger.debug("Inviting user to channel with data:");
-        logger.debug(data);
+        logger.debug("Inviting user to channel with data:", {
+            projectId: (_a = data.projectId) === null || _a === void 0 ? void 0 : _a.toString(),
+        });
+        logger.debug(data, {
+            projectId: (_b = data.projectId) === null || _b === void 0 ? void 0 : _b.toString(),
+        });
         const channelId = (await this.getWorkspaceChannelFromChannelName({
             authToken: data.authToken,
             channelName: data.channelName,
@@ -301,8 +327,12 @@ export default class SlackUtil extends WorkspaceBase {
         });
     }
     static async createChannelsIfDoesNotExist(data) {
-        logger.debug("Creating channels if they do not exist with data:");
-        logger.debug(data);
+        var _a;
+        const createChLogAttributes = {
+            projectId: (_a = data.projectId) === null || _a === void 0 ? void 0 : _a.toString(),
+        };
+        logger.debug("Creating channels if they do not exist with data:", createChLogAttributes);
+        logger.debug(data, createChLogAttributes);
         const workspaceChannels = [];
         for (let channelName of data.channelNames) {
             /*
@@ -320,45 +350,50 @@ export default class SlackUtil extends WorkspaceBase {
                 projectId: data.projectId,
             });
             if (existingChannel) {
-                logger.debug(`Channel ${channelName} already exists.`);
+                logger.debug(`Channel ${channelName} already exists.`, createChLogAttributes);
                 workspaceChannels.push(existingChannel);
                 continue;
             }
-            logger.debug(`Channel ${channelName} does not exist. Creating channel.`);
+            logger.debug(`Channel ${channelName} does not exist. Creating channel.`, createChLogAttributes);
             const channel = await this.createChannel({
                 authToken: data.authToken,
                 channelName: channelName,
                 projectId: data.projectId,
             });
             if (channel) {
-                logger.debug(`Channel ${channelName} created successfully.`);
+                logger.debug(`Channel ${channelName} created successfully.`, createChLogAttributes);
                 workspaceChannels.push(channel);
             }
         }
-        logger.debug("Channels created or found:");
-        logger.debug(workspaceChannels);
+        logger.debug("Channels created or found:", createChLogAttributes);
+        logger.debug(workspaceChannels, createChLogAttributes);
         return workspaceChannels;
     }
     static async getWorkspaceChannelFromChannelName(data) {
-        logger.debug("Getting workspace channel ID from channel name with data:");
-        logger.debug(data);
+        var _a;
+        const getChNameLogAttributes = {
+            projectId: (_a = data.projectId) === null || _a === void 0 ? void 0 : _a.toString(),
+        };
+        logger.debug("Getting workspace channel ID from channel name with data:", getChNameLogAttributes);
+        logger.debug(data, getChNameLogAttributes);
         const channel = await this.getWorkspaceChannelByName({
             authToken: data.authToken,
             channelName: data.channelName,
             projectId: data.projectId,
         });
         if (!channel) {
-            logger.error("Channel not found.");
+            logger.error("Channel not found.", getChNameLogAttributes);
             throw new BadDataException("Channel not found.");
         }
-        logger.debug("Workspace channel obtained:");
-        logger.debug(channel);
+        logger.debug("Workspace channel obtained:", getChNameLogAttributes);
+        logger.debug(channel, getChNameLogAttributes);
         return channel;
     }
     static async getWorkspaceChannelFromChannelId(data) {
         var _a, _b, _c, _d;
-        logger.debug("Getting workspace channel from channel ID with data:");
-        logger.debug(data);
+        const getChIdLogAttributes = { channelId: data.channelId };
+        logger.debug("Getting workspace channel from channel ID with data:", getChIdLogAttributes);
+        logger.debug(data, getChIdLogAttributes);
         const response = await API.post({
             url: URL.fromString("https://slack.com/api/conversations.info"),
             data: {
@@ -373,23 +408,23 @@ export default class SlackUtil extends WorkspaceBase {
                 exponentialBackoff: true,
             },
         });
-        logger.debug("Response from Slack API for getting channel info:");
-        logger.debug(response);
+        logger.debug("Response from Slack API for getting channel info:", getChIdLogAttributes);
+        logger.debug(response, getChIdLogAttributes);
         if (response instanceof HTTPErrorResponse) {
-            logger.error("Error response from Slack API:");
-            logger.error(response);
+            logger.error("Error response from Slack API:", getChIdLogAttributes);
+            logger.error(response, getChIdLogAttributes);
             throw response;
         }
         // check for ok response
         if (((_a = response.jsonData) === null || _a === void 0 ? void 0 : _a["ok"]) !== true) {
-            logger.error("Invalid response from Slack API:");
-            logger.error(response.jsonData);
+            logger.error("Invalid response from Slack API:", getChIdLogAttributes);
+            logger.error(response.jsonData, getChIdLogAttributes);
             const messageFromSlack = (_b = response.jsonData) === null || _b === void 0 ? void 0 : _b["error"];
             throw new BadRequestException("Error from Slack " + messageFromSlack);
         }
         if (!((_d = (_c = response.jsonData) === null || _c === void 0 ? void 0 : _c["channel"]) === null || _d === void 0 ? void 0 : _d["name"])) {
-            logger.error("Invalid response from Slack API:");
-            logger.error(response.jsonData);
+            logger.error("Invalid response from Slack API:", getChIdLogAttributes);
+            logger.error(response.jsonData, getChIdLogAttributes);
             throw new Error("Invalid response");
         }
         const channel = {
@@ -397,14 +432,17 @@ export default class SlackUtil extends WorkspaceBase {
             id: data.channelId,
             workspaceType: WorkspaceType.Slack,
         };
-        logger.debug("Workspace channel obtained:");
-        logger.debug(channel);
+        logger.debug("Workspace channel obtained:", getChIdLogAttributes);
+        logger.debug(channel, getChIdLogAttributes);
         return channel;
     }
     static async getAllWorkspaceChannels(data) {
-        var _a, _b, _c;
-        logger.debug("Getting all workspace channels with data:");
-        logger.debug(data);
+        var _a, _b, _c, _d;
+        const getAllChLogAttributes = {
+            projectId: (_a = data.projectId) === null || _a === void 0 ? void 0 : _a.toString(),
+        };
+        logger.debug("Getting all workspace channels with data:", getAllChLogAttributes);
+        logger.debug(data, getAllChLogAttributes);
         const channels = {};
         let cursor = undefined;
         const maxPages = 100;
@@ -432,15 +470,15 @@ export default class SlackUtil extends WorkspaceBase {
                 },
             });
             if (response instanceof HTTPErrorResponse) {
-                logger.error("Error response from Slack API:");
-                logger.error(response);
+                logger.error("Error response from Slack API:", getAllChLogAttributes);
+                logger.error(response, getAllChLogAttributes);
                 throw response;
             }
             // check for ok response
-            if (((_a = response.jsonData) === null || _a === void 0 ? void 0 : _a["ok"]) !== true) {
-                logger.error("Invalid response from Slack API:");
-                logger.error(response.jsonData);
-                const messageFromSlack = (_b = response.jsonData) === null || _b === void 0 ? void 0 : _b["error"];
+            if (((_b = response.jsonData) === null || _b === void 0 ? void 0 : _b["ok"]) !== true) {
+                logger.error("Invalid response from Slack API:", getAllChLogAttributes);
+                logger.error(response.jsonData, getAllChLogAttributes);
+                const messageFromSlack = (_c = response.jsonData) === null || _c === void 0 ? void 0 : _c["error"];
                 throw new BadRequestException("Error from Slack " + messageFromSlack);
             }
             for (const channel of response.jsonData["channels"]) {
@@ -462,7 +500,7 @@ export default class SlackUtil extends WorkspaceBase {
                     lastUpdated: OneUptimeDate.toString(OneUptimeDate.getCurrentDate()),
                 };
             }
-            cursor = (_c = response.jsonData["response_metadata"]) === null || _c === void 0 ? void 0 : _c["next_cursor"];
+            cursor = (_d = response.jsonData["response_metadata"]) === null || _d === void 0 ? void 0 : _d["next_cursor"];
             pageCount++;
         } while (cursor && pageCount < maxPages);
         // Update cache in bulk
@@ -473,20 +511,23 @@ export default class SlackUtil extends WorkspaceBase {
             });
         }
         catch (error) {
-            logger.error("Error bulk updating channel cache:");
-            logger.error(error);
+            logger.error("Error bulk updating channel cache:", getAllChLogAttributes);
+            logger.error(error, getAllChLogAttributes);
             // Don't fail the request if caching fails
         }
-        logger.debug("All workspace channels obtained:");
+        logger.debug("All workspace channels obtained:", getAllChLogAttributes);
         return channels;
     }
     static async updateChannelsInCache(data) {
+        var _a, _b;
         const projectAuth = await WorkspaceProjectAuthTokenService.getProjectAuth({
             projectId: data.projectId,
             workspaceType: WorkspaceType.Slack,
         });
         if (!projectAuth) {
-            logger.debug("No project auth found, cannot update cache");
+            logger.debug("No project auth found, cannot update cache", {
+                projectId: (_a = data.projectId) === null || _a === void 0 ? void 0 : _a.toString(),
+            });
             return;
         }
         const miscData = projectAuth.miscData || {};
@@ -503,23 +544,29 @@ export default class SlackUtil extends WorkspaceBase {
             workspaceProjectId: projectAuth.workspaceProjectId,
             miscData: miscData,
         });
-        logger.debug("Channel cache updated successfully");
+        logger.debug("Channel cache updated successfully", {
+            projectId: (_b = data.projectId) === null || _b === void 0 ? void 0 : _b.toString(),
+        });
     }
     static async getChannelFromCache(data) {
-        logger.debug("Getting channel from cache with data:");
-        logger.debug(data);
+        var _a;
+        const cacheGetLogAttributes = {
+            projectId: (_a = data.projectId) === null || _a === void 0 ? void 0 : _a.toString(),
+        };
+        logger.debug("Getting channel from cache with data:", cacheGetLogAttributes);
+        logger.debug(data, cacheGetLogAttributes);
         const projectAuth = await WorkspaceProjectAuthTokenService.getProjectAuth({
             projectId: data.projectId,
             workspaceType: WorkspaceType.Slack,
         });
         if (!projectAuth || !projectAuth.miscData) {
-            logger.debug("No project auth found or no misc data");
+            logger.debug("No project auth found or no misc data", cacheGetLogAttributes);
             return null;
         }
         const miscData = projectAuth.miscData;
         const channelCache = miscData.channelCache;
         if (!channelCache || !channelCache[data.channelName]) {
-            logger.debug("Channel not found in cache");
+            logger.debug("Channel not found in cache", cacheGetLogAttributes);
             return null;
         }
         const cachedChannelData = channelCache[data.channelName];
@@ -528,19 +575,23 @@ export default class SlackUtil extends WorkspaceBase {
             name: cachedChannelData.name,
             workspaceType: WorkspaceType.Slack,
         };
-        logger.debug("Channel found in cache:");
-        logger.debug(channel);
+        logger.debug("Channel found in cache:", cacheGetLogAttributes);
+        logger.debug(channel, cacheGetLogAttributes);
         return channel;
     }
     static async updateChannelCache(data) {
-        logger.debug("Updating channel cache with data:");
-        logger.debug(data);
+        var _a;
+        const cacheUpdateLogAttributes = {
+            projectId: (_a = data.projectId) === null || _a === void 0 ? void 0 : _a.toString(),
+        };
+        logger.debug("Updating channel cache with data:", cacheUpdateLogAttributes);
+        logger.debug(data, cacheUpdateLogAttributes);
         const projectAuth = await WorkspaceProjectAuthTokenService.getProjectAuth({
             projectId: data.projectId,
             workspaceType: WorkspaceType.Slack,
         });
         if (!projectAuth) {
-            logger.debug("No project auth found, cannot update cache");
+            logger.debug("No project auth found, cannot update cache", cacheUpdateLogAttributes);
             return;
         }
         const miscData = projectAuth.miscData || {};
@@ -561,12 +612,15 @@ export default class SlackUtil extends WorkspaceBase {
             workspaceProjectId: projectAuth.workspaceProjectId,
             miscData: miscData,
         });
-        logger.debug("Channel cache updated successfully");
+        logger.debug("Channel cache updated successfully", cacheUpdateLogAttributes);
     }
     static async getWorkspaceChannelByName(data) {
-        var _a, _b, _c;
-        logger.debug("Getting workspace channel by name with data:");
-        logger.debug(data);
+        var _a, _b, _c, _d;
+        const getByNameLogAttributes = {
+            projectId: (_a = data.projectId) === null || _a === void 0 ? void 0 : _a.toString(),
+        };
+        logger.debug("Getting workspace channel by name with data:", getByNameLogAttributes);
+        logger.debug(data, getByNameLogAttributes);
         // Normalize channel name
         let normalizedChannelName = data.channelName;
         if (normalizedChannelName && normalizedChannelName.startsWith("#")) {
@@ -580,14 +634,14 @@ export default class SlackUtil extends WorkspaceBase {
                 channelName: normalizedChannelName,
             });
             if (cachedChannel) {
-                logger.debug("Channel found in cache:");
-                logger.debug(cachedChannel);
+                logger.debug("Channel found in cache:", getByNameLogAttributes);
+                logger.debug(cachedChannel, getByNameLogAttributes);
                 return cachedChannel;
             }
         }
         catch (error) {
-            logger.error("Error getting channel from cache, falling back to API:");
-            logger.error(error);
+            logger.error("Error getting channel from cache, falling back to API:", getByNameLogAttributes);
+            logger.error(error, getByNameLogAttributes);
         }
         let cursor = undefined;
         const maxPages = 500;
@@ -615,20 +669,20 @@ export default class SlackUtil extends WorkspaceBase {
                 },
             });
             if (response instanceof HTTPErrorResponse) {
-                logger.error("Error response from Slack API:");
-                logger.error(response);
+                logger.error("Error response from Slack API:", getByNameLogAttributes);
+                logger.error(response, getByNameLogAttributes);
                 throw response;
             }
             // check for ok response
-            if (((_a = response.jsonData) === null || _a === void 0 ? void 0 : _a["ok"]) !== true) {
-                logger.error("Invalid response from Slack API:");
-                logger.error(response.jsonData);
-                const messageFromSlack = (_b = response.jsonData) === null || _b === void 0 ? void 0 : _b["error"];
+            if (((_b = response.jsonData) === null || _b === void 0 ? void 0 : _b["ok"]) !== true) {
+                logger.error("Invalid response from Slack API:", getByNameLogAttributes);
+                logger.error(response.jsonData, getByNameLogAttributes);
+                const messageFromSlack = (_c = response.jsonData) === null || _c === void 0 ? void 0 : _c["error"];
                 throw new BadRequestException("Error from Slack " + messageFromSlack);
             }
-            logger.debug("Searching for " + normalizedChannelName);
-            logger.debug("Searching channels in current page...");
-            logger.debug(JSON.stringify(response.jsonData["channels"], null, 2));
+            logger.debug("Searching for " + normalizedChannelName, getByNameLogAttributes);
+            logger.debug("Searching channels in current page...", getByNameLogAttributes);
+            logger.debug(JSON.stringify(response.jsonData["channels"], null, 2), getByNameLogAttributes);
             for (const channel of response.jsonData["channels"]) {
                 if (!channel["id"] || !channel["name"]) {
                     continue;
@@ -648,8 +702,8 @@ export default class SlackUtil extends WorkspaceBase {
                 };
                 const channelName = channel["name"].toLowerCase();
                 if (channelName === normalizedChannelName) {
-                    logger.debug("Channel found:");
-                    logger.debug(channel);
+                    logger.debug("Channel found:", getByNameLogAttributes);
+                    logger.debug(channel, getByNameLogAttributes);
                     // Update cache before returning
                     try {
                         await this.updateChannelsInCache({
@@ -658,14 +712,14 @@ export default class SlackUtil extends WorkspaceBase {
                         });
                     }
                     catch (error) {
-                        logger.error("Error bulk updating channel cache:");
-                        logger.error(error);
+                        logger.error("Error bulk updating channel cache:", getByNameLogAttributes);
+                        logger.error(error, getByNameLogAttributes);
                         // Don't fail the request if caching fails
                     }
                     return channelObj;
                 }
             }
-            cursor = (_c = response.jsonData["response_metadata"]) === null || _c === void 0 ? void 0 : _c["next_cursor"];
+            cursor = (_d = response.jsonData["response_metadata"]) === null || _d === void 0 ? void 0 : _d["next_cursor"];
             pageCount++;
         } while (cursor && pageCount < maxPages);
         // Update cache even if channel not found
@@ -676,11 +730,11 @@ export default class SlackUtil extends WorkspaceBase {
             });
         }
         catch (error) {
-            logger.error("Error bulk updating channel cache:");
-            logger.error(error);
+            logger.error("Error bulk updating channel cache:", getByNameLogAttributes);
+            logger.error(error, getByNameLogAttributes);
             // Don't fail the request if caching fails
         }
-        logger.debug("Channel not found:");
+        logger.debug("Channel not found:", getByNameLogAttributes);
         return null;
     }
     static getDividerBlock() {
@@ -690,8 +744,8 @@ export default class SlackUtil extends WorkspaceBase {
     }
     static getValuesFromView(data) {
         var _a, _b;
-        logger.debug("Getting values from view with data:");
-        logger.debug(JSON.stringify(data, null, 2));
+        logger.debug("Getting values from view with data:", {});
+        logger.debug(JSON.stringify(data, null, 2), {});
         const slackView = data.view;
         const values = {};
         if (!slackView["state"] || !slackView["state"]["values"]) {
@@ -716,8 +770,8 @@ export default class SlackUtil extends WorkspaceBase {
                 }
             }
         }
-        logger.debug("Values obtained from view:");
-        logger.debug(values);
+        logger.debug("Values obtained from view:", {});
+        logger.debug(values, {});
         return values;
     }
     static async doesChannelExist(data) {
@@ -736,11 +790,15 @@ export default class SlackUtil extends WorkspaceBase {
         return channel !== null;
     }
     static async sendMessage(data) {
-        logger.debug("Sending message to Slack with data:");
-        logger.debug(data);
+        var _a;
+        const sendMsgLogAttributes = {
+            projectId: (_a = data.projectId) === null || _a === void 0 ? void 0 : _a.toString(),
+        };
+        logger.debug("Sending message to Slack with data:", sendMsgLogAttributes);
+        logger.debug(data, sendMsgLogAttributes);
         const blocks = this.getBlocksFromWorkspaceMessagePayload(data.workspaceMessagePayload);
-        logger.debug("Blocks generated from workspace message payload:");
-        logger.debug(blocks);
+        logger.debug("Blocks generated from workspace message payload:", sendMsgLogAttributes);
+        logger.debug(blocks, sendMsgLogAttributes);
         const workspaceChannelsToPostTo = [];
         // Resolve channel names efficiently
         for (let channelName of data.workspaceMessagePayload.channelNames) {
@@ -757,7 +815,7 @@ export default class SlackUtil extends WorkspaceBase {
                 workspaceChannelsToPostTo.push(channel);
             }
             else {
-                logger.debug(`Channel ${channelName} does not exist.`);
+                logger.debug(`Channel ${channelName} does not exist.`, sendMsgLogAttributes);
             }
         }
         // add channel ids.
@@ -771,8 +829,8 @@ export default class SlackUtil extends WorkspaceBase {
                 workspaceChannelsToPostTo.push(channel);
             }
             catch (err) {
-                logger.error(`Error getting channel info for channel ID ${channelId}:`);
-                logger.error(err);
+                logger.error(`Error getting channel info for channel ID ${channelId}:`, sendMsgLogAttributes);
+                logger.error(err, sendMsgLogAttributes);
                 // Fallback: create channel object with empty name if API call fails
                 const channel = {
                     id: channelId,
@@ -782,8 +840,8 @@ export default class SlackUtil extends WorkspaceBase {
                 workspaceChannelsToPostTo.push(channel);
             }
         }
-        logger.debug("Channel IDs to post to:");
-        logger.debug(workspaceChannelsToPostTo);
+        logger.debug("Channel IDs to post to:", sendMsgLogAttributes);
+        logger.debug(workspaceChannelsToPostTo, sendMsgLogAttributes);
         const workspaspaceMessageResponse = {
             threads: [],
             workspaceType: WorkspaceType.Slack,
@@ -829,25 +887,28 @@ export default class SlackUtil extends WorkspaceBase {
                 if (lastThread) {
                     workspaspaceMessageResponse.threads.push(lastThread);
                 }
-                logger.debug(`Message sent to channel ID ${channel.id} successfully.`);
+                logger.debug(`Message sent to channel ID ${channel.id} successfully.`, sendMsgLogAttributes);
             }
             catch (e) {
-                logger.error(`Error sending message to channel ID ${channel.id}:`);
-                logger.error(e);
+                logger.error(`Error sending message to channel ID ${channel.id}:`, sendMsgLogAttributes);
+                logger.error(e, sendMsgLogAttributes);
                 workspaspaceMessageResponse.errors.push({
                     channel: channel,
                     error: e instanceof Error ? e.message : String(e),
                 });
             }
         }
-        logger.debug("Message sent successfully.");
-        logger.debug(workspaspaceMessageResponse);
+        logger.debug("Message sent successfully.", sendMsgLogAttributes);
+        logger.debug(workspaspaceMessageResponse, sendMsgLogAttributes);
         return workspaspaceMessageResponse;
     }
     static async sendPayloadBlocksToChannel(data) {
-        var _a, _b;
-        logger.debug("Sending payload blocks to channel with data:");
-        logger.debug(JSON.stringify(data, null, 2));
+        var _a, _b, _c;
+        const payloadBlocksLogAttributes = {
+            channelId: (_a = data.workspaceChannel) === null || _a === void 0 ? void 0 : _a.id,
+        };
+        logger.debug("Sending payload blocks to channel with data:", payloadBlocksLogAttributes);
+        logger.debug(JSON.stringify(data, null, 2), payloadBlocksLogAttributes);
         const response = await API.post({
             url: URL.fromString("https://slack.com/api/chat.postMessage"),
             data: {
@@ -864,20 +925,20 @@ export default class SlackUtil extends WorkspaceBase {
                 exponentialBackoff: true,
             },
         });
-        logger.debug("Response from Slack API for sending message:");
-        logger.debug(response);
+        logger.debug("Response from Slack API for sending message:", payloadBlocksLogAttributes);
+        logger.debug(response, payloadBlocksLogAttributes);
         if (response instanceof HTTPErrorResponse) {
-            logger.error("Error response from Slack API:");
-            logger.error(response);
+            logger.error("Error response from Slack API:", payloadBlocksLogAttributes);
+            logger.error(response, payloadBlocksLogAttributes);
             throw response;
         }
-        if (((_a = response.jsonData) === null || _a === void 0 ? void 0 : _a["ok"]) !== true) {
-            logger.error("Invalid response from Slack API:");
-            logger.error(response.jsonData);
-            const messageFromSlack = (_b = response.jsonData) === null || _b === void 0 ? void 0 : _b["error"];
+        if (((_b = response.jsonData) === null || _b === void 0 ? void 0 : _b["ok"]) !== true) {
+            logger.error("Invalid response from Slack API:", payloadBlocksLogAttributes);
+            logger.error(response.jsonData, payloadBlocksLogAttributes);
+            const messageFromSlack = (_c = response.jsonData) === null || _c === void 0 ? void 0 : _c["error"];
             throw new BadRequestException("Error from Slack " + messageFromSlack);
         }
-        logger.debug("Payload blocks sent to channel successfully.");
+        logger.debug("Payload blocks sent to channel successfully.", payloadBlocksLogAttributes);
         return {
             channel: data.workspaceChannel,
             threadId: response.jsonData["ts"],
@@ -885,8 +946,9 @@ export default class SlackUtil extends WorkspaceBase {
     }
     static async sendMessageToThread(data) {
         var _a, _b;
-        logger.debug("Sending message to thread with data:");
-        logger.debug(data);
+        const threadLogAttributes = { channelId: data.channelId };
+        logger.debug("Sending message to thread with data:", threadLogAttributes);
+        logger.debug(data, threadLogAttributes);
         const response = await API.post({
             url: URL.fromString("https://slack.com/api/chat.postMessage"),
             data: {
@@ -903,25 +965,26 @@ export default class SlackUtil extends WorkspaceBase {
                 exponentialBackoff: true,
             },
         });
-        logger.debug("Response from Slack API for sending thread message:");
-        logger.debug(response);
+        logger.debug("Response from Slack API for sending thread message:", threadLogAttributes);
+        logger.debug(response, threadLogAttributes);
         if (response instanceof HTTPErrorResponse) {
-            logger.error("Error response from Slack API:");
-            logger.error(response);
+            logger.error("Error response from Slack API:", threadLogAttributes);
+            logger.error(response, threadLogAttributes);
             throw response;
         }
         if (((_a = response.jsonData) === null || _a === void 0 ? void 0 : _a["ok"]) !== true) {
-            logger.error("Invalid response from Slack API:");
-            logger.error(response.jsonData);
+            logger.error("Invalid response from Slack API:", threadLogAttributes);
+            logger.error(response.jsonData, threadLogAttributes);
             const messageFromSlack = (_b = response.jsonData) === null || _b === void 0 ? void 0 : _b["error"];
             throw new BadRequestException("Error from Slack " + messageFromSlack);
         }
-        logger.debug("Thread message sent successfully.");
+        logger.debug("Thread message sent successfully.", threadLogAttributes);
     }
     static async getMessageByTimestamp(data) {
         var _a, _b, _c, _d;
-        logger.debug("Getting message by timestamp with data:");
-        logger.debug(data);
+        const getMsgLogAttributes = { channelId: data.channelId };
+        logger.debug("Getting message by timestamp with data:", getMsgLogAttributes);
+        logger.debug(data, getMsgLogAttributes);
         const response = await API.post({
             url: URL.fromString("https://slack.com/api/conversations.history"),
             data: {
@@ -940,44 +1003,44 @@ export default class SlackUtil extends WorkspaceBase {
                 exponentialBackoff: true,
             },
         });
-        logger.debug("Response from Slack API for getting message:");
-        logger.debug(response);
+        logger.debug("Response from Slack API for getting message:", getMsgLogAttributes);
+        logger.debug(response, getMsgLogAttributes);
         if (response instanceof HTTPErrorResponse) {
-            logger.error("Error response from Slack API:");
-            logger.error(response);
+            logger.error("Error response from Slack API:", getMsgLogAttributes);
+            logger.error(response, getMsgLogAttributes);
             throw response;
         }
         if (((_a = response.jsonData) === null || _a === void 0 ? void 0 : _a["ok"]) !== true) {
-            logger.error("Invalid response from Slack API:");
-            logger.error(response.jsonData);
+            logger.error("Invalid response from Slack API:", getMsgLogAttributes);
+            logger.error(response.jsonData, getMsgLogAttributes);
             const messageFromSlack = (_b = response.jsonData) === null || _b === void 0 ? void 0 : _b["error"];
             throw new BadRequestException("Error from Slack " + messageFromSlack);
         }
         const messages = (_c = response.jsonData) === null || _c === void 0 ? void 0 : _c["messages"];
         if (!messages || messages.length === 0) {
-            logger.debug("No messages found for timestamp.");
+            logger.debug("No messages found for timestamp.", getMsgLogAttributes);
             return null;
         }
         const messageText = (_d = messages[0]) === null || _d === void 0 ? void 0 : _d["text"];
-        logger.debug("Message text retrieved:");
-        logger.debug(messageText);
+        logger.debug("Message text retrieved:", getMsgLogAttributes);
+        logger.debug(messageText, getMsgLogAttributes);
         return messageText || null;
     }
     static getButtonsBlock(data) {
-        logger.debug("Getting buttons block with data:");
-        logger.debug(data);
+        logger.debug("Getting buttons block with data:", {});
+        logger.debug(data, {});
         const buttonsBlock = {
             type: "actions",
             elements: data.payloadButtonsBlock.buttons.map((button) => {
                 return this.getButtonBlock({ payloadButtonBlock: button });
             }),
         };
-        logger.debug("Buttons block generated:");
-        logger.debug(buttonsBlock);
+        logger.debug("Buttons block generated:", {});
+        logger.debug(buttonsBlock, {});
         return buttonsBlock;
     }
     static async createChannel(data) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g;
         /*
          * Sanitize channel name: Slack only allows lowercase letters, numbers,
          * hyphens, and underscores. Remove all other characters (including #).
@@ -985,8 +1048,11 @@ export default class SlackUtil extends WorkspaceBase {
         data.channelName = data.channelName
             .toLowerCase()
             .replace(/[^a-z0-9\-_]/g, "");
-        logger.debug("Creating channel with data:");
-        logger.debug(data);
+        const createChannelLogAttributes = {
+            projectId: (_a = data.projectId) === null || _a === void 0 ? void 0 : _a.toString(),
+        };
+        logger.debug("Creating channel with data:", createChannelLogAttributes);
+        logger.debug(data, createChannelLogAttributes);
         const response = await API.post({
             url: URL.fromString("https://slack.com/api/conversations.create"),
             data: {
@@ -1001,24 +1067,24 @@ export default class SlackUtil extends WorkspaceBase {
                 exponentialBackoff: true,
             },
         });
-        logger.debug("Response from Slack API for creating channel:");
-        logger.debug(response);
+        logger.debug("Response from Slack API for creating channel:", createChannelLogAttributes);
+        logger.debug(response, createChannelLogAttributes);
         if (response instanceof HTTPErrorResponse) {
-            logger.error("Error response from Slack API:");
-            logger.error(response);
+            logger.error("Error response from Slack API:", createChannelLogAttributes);
+            logger.error(response, createChannelLogAttributes);
             throw response;
         }
         // check for ok response
-        if (((_a = response.jsonData) === null || _a === void 0 ? void 0 : _a["ok"]) !== true) {
-            logger.error("Invalid response from Slack API:");
-            logger.error(response.jsonData);
-            const messageFromSlack = (_b = response.jsonData) === null || _b === void 0 ? void 0 : _b["error"];
+        if (((_b = response.jsonData) === null || _b === void 0 ? void 0 : _b["ok"]) !== true) {
+            logger.error("Invalid response from Slack API:", createChannelLogAttributes);
+            logger.error(response.jsonData, createChannelLogAttributes);
+            const messageFromSlack = (_c = response.jsonData) === null || _c === void 0 ? void 0 : _c["error"];
             throw new BadRequestException("Error from Slack " + messageFromSlack);
         }
-        if (!((_d = (_c = response.jsonData) === null || _c === void 0 ? void 0 : _c["channel"]) === null || _d === void 0 ? void 0 : _d["id"]) ||
-            !((_f = (_e = response.jsonData) === null || _e === void 0 ? void 0 : _e["channel"]) === null || _f === void 0 ? void 0 : _f["name"])) {
-            logger.error("Invalid response from Slack API:");
-            logger.error(response.jsonData);
+        if (!((_e = (_d = response.jsonData) === null || _d === void 0 ? void 0 : _d["channel"]) === null || _e === void 0 ? void 0 : _e["id"]) ||
+            !((_g = (_f = response.jsonData) === null || _f === void 0 ? void 0 : _f["channel"]) === null || _g === void 0 ? void 0 : _g["name"])) {
+            logger.error("Invalid response from Slack API:", createChannelLogAttributes);
+            logger.error(response.jsonData, createChannelLogAttributes);
             throw new Error("Invalid response");
         }
         const channel = {
@@ -1026,8 +1092,8 @@ export default class SlackUtil extends WorkspaceBase {
             name: response.jsonData["channel"]["name"],
             workspaceType: WorkspaceType.Slack,
         };
-        logger.debug("Channel created successfully:");
-        logger.debug(channel);
+        logger.debug("Channel created successfully:", createChannelLogAttributes);
+        logger.debug(channel, createChannelLogAttributes);
         // Cache the created channel
         try {
             const localCache = {};
@@ -1043,15 +1109,15 @@ export default class SlackUtil extends WorkspaceBase {
             });
         }
         catch (error) {
-            logger.error("Error caching created channel:");
-            logger.error(error);
+            logger.error("Error caching created channel:", createChannelLogAttributes);
+            logger.error(error, createChannelLogAttributes);
             // Don't fail the creation if caching fails
         }
         return channel;
     }
     static getHeaderBlock(data) {
-        logger.debug("Getting header block with data:");
-        logger.debug(data);
+        logger.debug("Getting header block with data:", {});
+        logger.debug(data, {});
         const headerBlock = {
             type: "header",
             text: {
@@ -1059,13 +1125,13 @@ export default class SlackUtil extends WorkspaceBase {
                 text: data.payloadHeaderBlock.text,
             },
         };
-        logger.debug("Header block generated:");
-        logger.debug(headerBlock);
+        logger.debug("Header block generated:", {});
+        logger.debug(headerBlock, {});
         return headerBlock;
     }
     static getCheckboxBlock(data) {
-        logger.debug("Getting checkbox block with data:");
-        logger.debug(data);
+        logger.debug("Getting checkbox block with data:", {});
+        logger.debug(data, {});
         const checkboxBlock = {
             type: "input",
             element: {
@@ -1104,13 +1170,13 @@ export default class SlackUtil extends WorkspaceBase {
                 text: data.payloadCheckboxBlock.description,
             };
         }
-        logger.debug("Checkbox block generated:");
-        logger.debug(checkboxBlock);
+        logger.debug("Checkbox block generated:", {});
+        logger.debug(checkboxBlock, {});
         return checkboxBlock;
     }
     static getDateTimePickerBlock(data) {
-        logger.debug("Getting date time picker block with data:");
-        logger.debug(data);
+        logger.debug("Getting date time picker block with data:", {});
+        logger.debug(data, {});
         const dateTimePickerBlock = {
             type: "input",
             element: {
@@ -1123,13 +1189,13 @@ export default class SlackUtil extends WorkspaceBase {
                 text: data.payloadDateTimePickerBlock.label,
             },
         };
-        logger.debug("Date time picker block generated:");
-        logger.debug(dateTimePickerBlock);
+        logger.debug("Date time picker block generated:", {});
+        logger.debug(dateTimePickerBlock, {});
         return dateTimePickerBlock;
     }
     static getTextAreaBlock(data) {
-        logger.debug("Getting text area block with data:");
-        logger.debug(data);
+        logger.debug("Getting text area block with data:", {});
+        logger.debug(data, {});
         const optional = data.payloadTextAreaBlock.optional || false;
         const textAreaBlock = {
             type: "input",
@@ -1156,13 +1222,13 @@ export default class SlackUtil extends WorkspaceBase {
                 text: data.payloadTextAreaBlock.description,
             };
         }
-        logger.debug("Text area block generated:");
-        logger.debug(textAreaBlock);
+        logger.debug("Text area block generated:", {});
+        logger.debug(textAreaBlock, {});
         return textAreaBlock;
     }
     static getTextBoxBlock(data) {
-        logger.debug("Getting text box block with data:");
-        logger.debug(data);
+        logger.debug("Getting text box block with data:", {});
+        logger.debug(data, {});
         const optional = data.payloadTextBoxBlock.optional || false;
         const textBoxBlock = {
             type: "input",
@@ -1188,25 +1254,25 @@ export default class SlackUtil extends WorkspaceBase {
                 text: data.payloadTextBoxBlock.description,
             };
         }
-        logger.debug("Text box block generated:");
-        logger.debug(textBoxBlock);
+        logger.debug("Text box block generated:", {});
+        logger.debug(textBoxBlock, {});
         return textBoxBlock;
     }
     static getImageBlock(data) {
-        logger.debug("Getting image block with data:");
-        logger.debug(data);
+        logger.debug("Getting image block with data:", {});
+        logger.debug(data, {});
         const imageBlock = {
             type: "image",
             image_url: data.payloadImageBlock.imageUrl.toString(),
             alt_text: data.payloadImageBlock.altText,
         };
-        logger.debug("Image block generated:");
-        logger.debug(imageBlock);
+        logger.debug("Image block generated:", {});
+        logger.debug(imageBlock, {});
         return imageBlock;
     }
     static getDropdownBlock(data) {
-        logger.debug("Getting dropdown block with data:");
-        logger.debug(data);
+        logger.debug("Getting dropdown block with data:", {});
+        logger.debug(data, {});
         const optional = data.payloadDropdownBlock.optional || false;
         const isMiltiSelect = data.payloadDropdownBlock.multiSelect || false;
         const dropdownBlock = {
@@ -1250,13 +1316,13 @@ export default class SlackUtil extends WorkspaceBase {
                 text: data.payloadDropdownBlock.description,
             };
         }
-        logger.debug("Dropdown block generated:");
-        logger.debug(dropdownBlock);
+        logger.debug("Dropdown block generated:", {});
+        logger.debug(dropdownBlock, {});
         return dropdownBlock;
     }
     static getModalBlock(data) {
-        logger.debug("Getting modal block with data:");
-        logger.debug(data);
+        logger.debug("Getting modal block with data:", {});
+        logger.debug(data, {});
         const modalBlock = {
             type: "modal",
             title: {
@@ -1277,13 +1343,13 @@ export default class SlackUtil extends WorkspaceBase {
                 messageBlocks: data.payloadModalBlock.blocks,
             }),
         };
-        logger.debug("Modal block generated:");
-        logger.debug(modalBlock);
+        logger.debug("Modal block generated:", {});
+        logger.debug(modalBlock, {});
         return modalBlock;
     }
     static getMarkdownBlock(data) {
-        logger.debug("Getting markdown block with data:");
-        logger.debug(data);
+        logger.debug("Getting markdown block with data:", {});
+        logger.debug(data, {});
         const markdownBlock = {
             type: "section",
             text: {
@@ -1293,8 +1359,8 @@ export default class SlackUtil extends WorkspaceBase {
                     : "",
             },
         };
-        logger.debug("Markdown block generated:");
-        logger.debug(markdownBlock);
+        logger.debug("Markdown block generated:", {});
+        logger.debug(markdownBlock, {});
         return markdownBlock;
     }
     static async isUserInDirectMessageChannel(data) {
@@ -1315,14 +1381,22 @@ export default class SlackUtil extends WorkspaceBase {
             },
         });
         if (response instanceof HTTPErrorResponse) {
-            logger.error("Error response from Slack API:");
-            logger.error(response);
+            logger.error("Error response from Slack API:", {
+                channelId: data.directMessageChannelId,
+            });
+            logger.error(response, {
+                channelId: data.directMessageChannelId,
+            });
             throw response;
         }
         // check for ok response
         if (((_a = response.jsonData) === null || _a === void 0 ? void 0 : _a["ok"]) !== true) {
-            logger.error("Invalid response from Slack API:");
-            logger.error(response.jsonData);
+            logger.error("Invalid response from Slack API:", {
+                channelId: data.directMessageChannelId,
+            });
+            logger.error(response.jsonData, {
+                channelId: data.directMessageChannelId,
+            });
             const messageFromSlack = (_b = response.jsonData) === null || _b === void 0 ? void 0 : _b["error"];
             throw new BadRequestException("Error from Slack " + messageFromSlack);
         }
@@ -1336,8 +1410,11 @@ export default class SlackUtil extends WorkspaceBase {
     static async isUserInChannel(data) {
         var _a, _b, _c;
         const members = [];
-        logger.debug("Checking if user is in channel with data:");
-        logger.debug(data);
+        const isInChannelLogAttributes = {
+            channelId: data.channelId,
+        };
+        logger.debug("Checking if user is in channel with data:", isInChannelLogAttributes);
+        logger.debug(data, isInChannelLogAttributes);
         let cursor = undefined;
         do {
             // check if the user is in the channel, return true if they are, false if they are not
@@ -1360,17 +1437,17 @@ export default class SlackUtil extends WorkspaceBase {
                     exponentialBackoff: true,
                 },
             });
-            logger.debug("Response from Slack API for getting channel members:");
-            logger.debug(response);
+            logger.debug("Response from Slack API for getting channel members:", isInChannelLogAttributes);
+            logger.debug(response, isInChannelLogAttributes);
             if (response instanceof HTTPErrorResponse) {
-                logger.error("Error response from Slack API:");
-                logger.error(response);
+                logger.error("Error response from Slack API:", isInChannelLogAttributes);
+                logger.error(response, isInChannelLogAttributes);
                 throw response;
             }
             // check for ok response
             if (((_a = response.jsonData) === null || _a === void 0 ? void 0 : _a["ok"]) !== true) {
-                logger.error("Invalid response from Slack API:");
-                logger.error(response.jsonData);
+                logger.error("Invalid response from Slack API:", isInChannelLogAttributes);
+                logger.error(response.jsonData, isInChannelLogAttributes);
                 const messageFromSlack = (_b = response.jsonData) === null || _b === void 0 ? void 0 : _b["error"];
                 throw new BadRequestException("Error from Slack " + messageFromSlack);
             }
@@ -1385,8 +1462,8 @@ export default class SlackUtil extends WorkspaceBase {
         return false;
     }
     static getButtonBlock(data) {
-        logger.debug("Getting button block with data:");
-        logger.debug(data);
+        logger.debug("Getting button block with data:", {});
+        logger.debug(data, {});
         const buttonBlock = {
             type: "button",
             text: {
@@ -1400,13 +1477,13 @@ export default class SlackUtil extends WorkspaceBase {
                 ? data.payloadButtonBlock.url.toString()
                 : undefined,
         };
-        logger.debug("Button block generated:");
-        logger.debug(buttonBlock);
+        logger.debug("Button block generated:", {});
+        logger.debug(buttonBlock, {});
         return buttonBlock;
     }
     static async sendMessageToChannelViaIncomingWebhook(data) {
-        logger.debug("Sending message to channel via incoming webhook with data:");
-        logger.debug(data);
+        logger.debug("Sending message to channel via incoming webhook with data:", {});
+        logger.debug(data, {});
         const apiResult = await API.post({
             url: data.url,
             data: {
@@ -1425,8 +1502,8 @@ export default class SlackUtil extends WorkspaceBase {
                 exponentialBackoff: true,
             },
         });
-        logger.debug("Response from Slack API for sending message via webhook:");
-        logger.debug(apiResult);
+        logger.debug("Response from Slack API for sending message via webhook:", {});
+        logger.debug(apiResult, {});
         return apiResult;
     }
     /**
@@ -1523,14 +1600,22 @@ export default class SlackUtil extends WorkspaceBase {
                 },
             });
             if (response instanceof HTTPErrorResponse) {
-                logger.error("Error response from Slack API for channel history:");
-                logger.error(response);
+                logger.error("Error response from Slack API for channel history:", {
+                    channelId: params.channelId,
+                });
+                logger.error(response, {
+                    channelId: params.channelId,
+                });
                 break;
             }
             const jsonData = response.jsonData;
             if (jsonData["ok"] !== true) {
-                logger.error("Invalid response from Slack API for channel history:");
-                logger.error(jsonData);
+                logger.error("Invalid response from Slack API for channel history:", {
+                    channelId: params.channelId,
+                });
+                logger.error(jsonData, {
+                    channelId: params.channelId,
+                });
                 break;
             }
             const slackMessages = jsonData["messages"] || [];
@@ -1570,7 +1655,7 @@ export default class SlackUtil extends WorkspaceBase {
             cursor = (_a = jsonData["response_metadata"]) === null || _a === void 0 ? void 0 : _a["next_cursor"];
             pageCount++;
         } while (cursor && messages.length < maxMessages && pageCount < maxPages);
-        logger.debug(`Retrieved ${messages.length} messages from Slack channel ${params.channelId}`);
+        logger.debug(`Retrieved ${messages.length} messages from Slack channel ${params.channelId}`, { channelId: params.channelId });
         // Reverse to get chronological order (Slack returns newest first)
         messages.reverse();
         return messages;