Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
709 changes: 709 additions & 0 deletions src/modules/exceptions.ts

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions src/modules/exporters/sentry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -411,8 +411,6 @@ export class SentryExporter implements Exporter {
} else if (typeof event.error === "object" && event.error !== null) {
if ("message" in event.error) {
errorMessage = String(event.error.message);
} else if ("error" in event.error) {
errorMessage = String(event.error.error);
} else {
errorMessage = JSON.stringify(event.error);
}
Expand Down
1 change: 1 addition & 0 deletions src/modules/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
export * from "./compatibility.js";
export * from "./context-parameters.js";
export * from "./exceptions.js";
export * from "./internal.js";
export * from "./logging.js";
export * from "./session.js";
Expand Down
6 changes: 2 additions & 4 deletions src/modules/internal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import {
} from "../types.js";
import { PublishEventRequestEventTypeEnum } from "mcpcat-api";
import { publishEvent } from "./eventQueue.js";
import { getMCPCompatibleErrorMessage } from "./compatibility.js";
import { writeToLog } from "./logging.js";
import { INACTIVITY_TIMEOUT_IN_MINUTES } from "./constants.js";
import { captureException } from "./exceptions.js";

/**
* Simple LRU cache for session identities.
Expand Down Expand Up @@ -325,9 +325,7 @@ export async function handleIdentify(
new Date().getTime() - identifyEvent.timestamp.getTime()) ||
undefined;
identifyEvent.isError = true;
identifyEvent.error = {
message: getMCPCompatibleErrorMessage(error),
};
identifyEvent.error = captureException(error);
publishEvent(server, identifyEvent);
}
}
9 changes: 3 additions & 6 deletions src/modules/tracing.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { getServerSessionId } from "./session.js";
import { PublishEventRequestEventTypeEnum } from "mcpcat-api";
import { publishEvent } from "./eventQueue.js";
import { getMCPCompatibleErrorMessage } from "./compatibility.js";
import { captureException } from "./exceptions.js";

function isToolResultError(result: any): boolean {
return result && typeof result === "object" && result.isError === true;
Expand Down Expand Up @@ -269,19 +270,15 @@ export function setupToolCallTracing(server: MCPServerLike): void {
// Check if the result indicates an error
if (isToolResultError(result)) {
event.isError = true;
event.error = {
message: getMCPCompatibleErrorMessage(result),
};
event.error = captureException(result);
}

event.response = result;
publishEvent(server, event);
return result;
} catch (error) {
event.isError = true;
event.error = {
message: getMCPCompatibleErrorMessage(error),
};
event.error = captureException(error);
publishEvent(server, event);
throw error;
}
Expand Down
10 changes: 3 additions & 7 deletions src/modules/tracingV2.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ import { getServerTrackingData, handleIdentify } from "./internal.js";
import { getServerSessionId } from "./session.js";
import { PublishEventRequestEventTypeEnum } from "mcpcat-api";
import { publishEvent } from "./eventQueue.js";
import { getMCPCompatibleErrorMessage } from "./compatibility.js";
import { addContextParameterToTool } from "./context-parameters.js";
import { handleReportMissing } from "./tools.js";
import { setupInitializeTracing, setupListToolsTracing } from "./tracing.js";
import { captureException } from "./exceptions.js";

// WeakMap to track which callbacks have already been wrapped
const wrappedCallbacks = new WeakMap<Function, boolean>();
Expand Down Expand Up @@ -359,9 +359,7 @@ function addTracingToToolCallback(
// Check if the result indicates an error
if (isToolResultError(result)) {
event.isError = true;
event.error = {
message: getMCPCompatibleErrorMessage(result),
};
event.error = captureException(result);
}

event.response = result;
Expand All @@ -373,9 +371,7 @@ function addTracingToToolCallback(
return result;
} catch (error) {
event.isError = true;
event.error = {
message: getMCPCompatibleErrorMessage(error),
};
event.error = captureException(error);
event.duration =
(event.timestamp &&
new Date().getTime() - event.timestamp.getTime()) ||
Expand Down
Loading