fix: capture only axios 500 errors (#106)

- [x] Do not log and send non-500 Axios errors to Sentry
- [x] Use default trace created by sentry for per API call

Author: Shridhad

bun.lock

@@ -12,6 +12,7 @@
         "@segment/analytics-node": "2.2.1",
         "@sentry/node": "9.19.0",
         "@tailwindcss/postcss": "4.1.10",
+        "axios": "1.11.0",
         "body-parser": "2.2.0",
         "chalk": "5.3.0",
         "class-variance-authority": "0.7.1",
@@ -549,7 +550,7 @@
 
     "autoevals": ["autoevals@0.0.111", "", { "dependencies": { "@braintrust/core": "0.0.71", "ajv": "^8.13.0", "compute-cosine-similarity": "^1.1.0", "js-levenshtein": "^1.1.6", "js-yaml": "^4.1.0", "linear-sum-assignment": "^1.0.7", "mustache": "^4.2.0", "openai": "4.47.1", "zod": "^3.22.4", "zod-to-json-schema": "^3.22.5" } }, "sha512-H38avDrcWU6w7aP0CwCansc/Um/3Bm8yvjMX6g8TR4FIJeyY84poimdNK3GDRk+hhoiY1DovdZoEJILWC6OmgQ=="],
 
-    "axios": ["axios@1.9.0", "", { "dependencies": { "follow-redirects": "^1.15.6", "form-data": "^4.0.0", "proxy-from-env": "^1.1.0" } }, "sha512-re4CqKTJaURpzbLHtIi6XpDv20/CnpXOtjRY5/CU32L8gU8ek9UIivcfvSWvmKEngmVbrUtPpdDwWDWL7DNHvg=="],
+    "axios": ["axios@1.11.0", "", { "dependencies": { "follow-redirects": "^1.15.6", "form-data": "^4.0.4", "proxy-from-env": "^1.1.0" } }, "sha512-1Lx3WLFQWm3ooKDYZD1eXmoGO9fxYQjrycfHFC8P0sCfQVXyROp0p9PFWBehewBOdCwHc+f/b8I0fMto5eSfwA=="],
 
     "axobject-query": ["axobject-query@4.1.0", "", {}, "sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ=="],
 
@@ -1367,6 +1368,8 @@
 
     "@humanfs/node/@humanwhocodes/retry": ["@humanwhocodes/retry@0.3.1", "", {}, "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA=="],
 
+    "@neondatabase/api-client/axios": ["axios@1.9.0", "", { "dependencies": { "follow-redirects": "^1.15.6", "form-data": "^4.0.0", "proxy-from-env": "^1.1.0" } }, "sha512-re4CqKTJaURpzbLHtIi6XpDv20/CnpXOtjRY5/CU32L8gU8ek9UIivcfvSWvmKEngmVbrUtPpdDwWDWL7DNHvg=="],
+
     "@neondatabase/serverless/@types/node": ["@types/node@22.15.18", "", { "dependencies": { "undici-types": "~6.21.0" } }, "sha512-v1DKRfUdyW+jJhZNEI1PYy29S2YRxMV5AOO/x/SjKmW0acCIOqmbj6Haf9eHAhsPmrhlHSxEhv/1WszcLWV4cg=="],
 
     "@opentelemetry/core/@opentelemetry/semantic-conventions": ["@opentelemetry/semantic-conventions@1.28.0", "", {}, "sha512-lp4qAiMTD4sNWW4DbKLBkfiMZ4jbAboJIGOQr5DvciMRI494OapieI9qiODpOt0XBr1LjIDy1xAGAnVs5supTA=="],
@@ -1413,6 +1416,8 @@
 
     "ai/@ai-sdk/provider": ["@ai-sdk/provider@0.0.26", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-dQkfBDs2lTYpKM8389oopPdQgIU007GQyCbuPPrV+K6MtSII3HBfE0stUIMXUb44L+LK1t6GXPP7wjSzjO6uKg=="],
 
+    "axios/form-data": ["form-data@4.0.4", "", { "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", "es-set-tostringtag": "^2.1.0", "hasown": "^2.0.2", "mime-types": "^2.1.12" } }, "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow=="],
+
     "basic-auth/safe-buffer": ["safe-buffer@5.1.2", "", {}, "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="],
 
     "braintrust/chalk": ["chalk@4.1.2", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="],
@@ -1505,6 +1510,8 @@
 
     "@types/tedious/@types/node/undici-types": ["undici-types@6.21.0", "", {}, "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ=="],
 
+    "axios/form-data/mime-types": ["mime-types@2.1.35", "", { "dependencies": { "mime-db": "1.52.0" } }, "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="],
+
     "colorspace/color/color-convert": ["color-convert@1.9.3", "", { "dependencies": { "color-name": "1.1.3" } }, "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="],
 
     "eslint/ajv/json-schema-traverse": ["json-schema-traverse@0.4.1", "", {}, "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="],
@@ -1525,6 +1532,8 @@
 
     "@opentelemetry/instrumentation-pg/@types/pg/@types/node/undici-types": ["undici-types@6.21.0", "", {}, "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ=="],
 
+    "axios/form-data/mime-types/mime-db": ["mime-db@1.52.0", "", {}, "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="],
+
     "colorspace/color/color-convert/color-name": ["color-name@1.1.3", "", {}, "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="],
 
     "oauth2-server/type-is/mime-types/mime-db": ["mime-db@1.52.0", "", {}, "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="],

package-lock.json

@@ -41,6 +41,7 @@
     "@segment/analytics-node": "2.2.1",
     "@sentry/node": "9.19.0",
     "@tailwindcss/postcss": "4.1.10",
+    "axios": "1.11.0",
     "body-parser": "2.2.0",
     "chalk": "5.3.0",
     "class-variance-authority": "0.7.1",

package.json

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { isAxiosError } from 'axios';
 import { NEON_RESOURCES } from '../resources.js';
 import {
   NEON_HANDLERS,
@@ -10,7 +11,7 @@ import {
 import { logger } from '../utils/logger.js';
 import { createNeonClient, getPackageJson } from './api.js';
 import { track } from '../analytics/analytics.js';
-import { captureException, startNewTrace, startSpan } from '@sentry/node';
+import { captureException, setHttpStatus, startSpan } from '@sentry/node';
 import { ServerContext } from '../types/context.js';
 import { setSentryTags } from '../sentry/utils.js';
 import { ToolHandlerExtraParams } from '../tools/types.js';
@@ -47,51 +48,66 @@ export const createMcpServer = (context: ServerContext) => {
       tool.description,
       { params: tool.inputSchema },
       async (args, extra) => {
-        return await startNewTrace(async () => {
-          return await startSpan(
-            {
-              name: 'tool_call',
-              attributes: {
-                tool_name: tool.name,
-              },
+        return await startSpan(
+          {
+            name: 'tool_call',
+            attributes: {
+              tool_name: tool.name,
             },
-            async (span) => {
-              const properties = { tool_name: tool.name };
-              logger.info('tool call:', properties);
-              setSentryTags(context);
-              track({
-                userId: context.account.id,
-                event: 'tool_call',
-                properties,
-                context: { client: context.client, app: context.app },
+          },
+          async (span) => {
+            const properties = { tool_name: tool.name };
+            logger.info('tool call:', properties);
+            setSentryTags(context);
+            track({
+              userId: context.account.id,
+              event: 'tool_call',
+              properties,
+              context: { client: context.client, app: context.app },
+            });
+            const extraArgs: ToolHandlerExtraParams = {
+              ...extra,
+              account: context.account,
+            };
+            try {
+              return await toolHandler(args, neonClient, extraArgs);
+            } catch (error) {
+              span.setStatus({
+                code: 2,
               });
-              const extraArgs: ToolHandlerExtraParams = {
-                ...extra,
-                account: context.account,
-              };
-              try {
-                return await toolHandler(args, neonClient, extraArgs);
-              } catch (error) {
-                span.setStatus({
-                  code: 2,
-                });
-                if (error instanceof NeonDbError) {
-                  return handleNeonDbError(error);
-                } else {
-                  logger.error('Tool call error:', {
-                    error:
-                      error instanceof Error ? error.message : 'Unknown error',
-                    properties,
-                  });
-                  captureException(error, {
-                    extra: properties,
-                  });
-                  throw error;
+              if (error instanceof NeonDbError) {
+                return handleNeonDbError(error);
+              } else {
+                if (
+                  isAxiosError(error) &&
+                  error.response?.status &&
+                  error.response?.status < 500
+                ) {
+                  setHttpStatus(span, error.response.status);
+                  return {
+                    isError: true,
+                    content: [
+                      {
+                        type: 'text',
+                        text: error.response?.data.message || error.message,
+                      },
+                    ],
+                  };
                 }
+
+                logger.error('Tool call error:', {
+                  error:
+                    error instanceof Error ? error.message : 'Unknown error',
+                  properties,
+                });
+                captureException(error, {
+                  extra: properties,
+                });
+                throw error;
               }
-            },
-          );
-        });
+            }
+          },
+        );
       },
     );
   });