@mastra/mcp 1.6.0 → 1.6.1-alpha.0

package/dist/index.js

@@ -1,4 +1,5 @@
 import { AsyncLocalStorage } from 'async_hooks';
+import { createRequire } from 'module';
 import { MastraBase } from '@mastra/core/base';
 import { createTool, isValidationError } from '@mastra/core/tools';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
@@ -415,7 +416,57 @@ function isReconnectableMCPError(error) {
 
 // src/client/client.ts
 var DEFAULT_SERVER_CONNECT_TIMEOUT_MSEC = 3e3;
+var require2 = createRequire(import.meta.url);
 var SSE_FALLBACK_STATUS_CODES = [400, 404, 405];
+var DATADOG_TRACER_TEST_SYMBOL = /* @__PURE__ */ Symbol.for("mastra.mcp.dd-trace-test-tracer");
+function shouldDetachPersistentTransportRequest(init) {
+  return (init?.method ?? "GET").toUpperCase() === "GET";
+}
+function getDatadogScope() {
+  const testTracer = globalThis[DATADOG_TRACER_TEST_SYMBOL];
+  const tracer = testTracer ?? loadDatadogTracer();
+  if (typeof tracer?.scope === "function") {
+    return tracer.scope();
+  }
+  if (typeof tracer?.default?.scope === "function") {
+    return tracer.default.scope();
+  }
+  return null;
+}
+function loadDatadogTracer() {
+  if (!isDatadogTracerLikelyLoaded()) {
+    return null;
+  }
+  try {
+    return require2("dd-trace");
+  } catch {
+    return null;
+  }
+}
+function isDatadogTracerLikelyLoaded() {
+  if (globalThis[DATADOG_TRACER_TEST_SYMBOL]) {
+    return true;
+  }
+  if (process.execArgv.some((arg) => arg.includes("dd-trace"))) {
+    return true;
+  }
+  if (process.env.NODE_OPTIONS?.includes("dd-trace")) {
+    return true;
+  }
+  try {
+    const resolvedPath = require2.resolve("dd-trace");
+    return Boolean(require2.cache[resolvedPath]);
+  } catch {
+    return false;
+  }
+}
+function runOutsideDatadogTraceScope(callback) {
+  const scope = getDatadogScope();
+  if (!scope) {
+    return callback();
+  }
+  return scope.activate(null, callback);
+}
 function convertLogLevelToLoggerMethod(level) {
   switch (level) {
     case "debug":
@@ -610,7 +661,11 @@ var InternalMastraMCPClient = class extends MastraBase {
   }
   async connectHttp(url) {
     const { requestInit, eventSourceInit, authProvider, connectTimeout, fetch: userFetch } = this.serverConfig;
-    const fetch2 = userFetch ? (url2, init) => userFetch(url2, init, this.operationContextStore.getStore() ?? null) : void 0;
+    const fetch2 = (requestUrl, init) => {
+      const requestContext = this.operationContextStore.getStore() ?? null;
+      const executeFetch = () => userFetch ? userFetch(requestUrl, init, requestContext) : globalThis.fetch(requestUrl, init);
+      return shouldDetachPersistentTransportRequest(init) ? runOutsideDatadogTraceScope(executeFetch) : executeFetch();
+    };
     this.log("debug", `Attempting to connect to URL: ${url}`);
     let shouldTrySSE = url.pathname.endsWith(`/sse`);
     if (!shouldTrySSE) {
@@ -639,7 +694,7 @@ var InternalMastraMCPClient = class extends MastraBase {
     if (shouldTrySSE) {
       this.log("debug", "Falling back to deprecated HTTP+SSE transport...");
       try {
-        const sseEventSourceInit = fetch2 ? { ...eventSourceInit, fetch: fetch2 } : eventSourceInit;
+        const sseEventSourceInit = { ...eventSourceInit, fetch: fetch2 };
         const sseTransport = new SSEClientTransport(url, {
           requestInit,
           eventSourceInit: sseEventSourceInit,