@mastra/observability 1.8.0-alpha.1 → 1.9.0-alpha.0

package/dist/index.js

@@ -15043,14 +15043,7 @@ var SIGNAL_PUBLISH_SUFFIXES = {
   scores: "/scores/publish",
   feedback: "/feedback/publish"
 };
-var SIGNAL_PUBLISH_PATHS = {
-  traces: "/ai/spans/publish",
-  logs: "/ai/logs/publish",
-  metrics: "/ai/metrics/publish",
-  scores: "/ai/scores/publish",
-  feedback: "/ai/feedback/publish"
-};
-var SIGNAL_PAYLOAD_KEYS = {
+var SIGNAL_PUBLISH_SEGMENTS = {
   traces: "spans",
   logs: "logs",
   metrics: "metrics",
@@ -15079,6 +15072,18 @@ function createInvalidEndpointError(endpoint, text, cause) {
     cause
   );
 }
+var VALID_PROJECT_ID = /^[a-zA-Z0-9_-]+$/;
+function createInvalidProjectIdError(projectId) {
+  return new MastraError({
+    id: `CLOUD_EXPORTER_INVALID_PROJECT_ID`,
+    text: "CloudExporter projectId must only contain letters, numbers, hyphens, and underscores.",
+    domain: ErrorDomain.MASTRA_OBSERVABILITY,
+    category: ErrorCategory.USER,
+    details: {
+      projectId
+    }
+  });
+}
 function resolveBaseEndpoint(baseEndpoint) {
   const normalizedEndpoint = trimTrailingSlashes(baseEndpoint);
   const invalidText = 'CloudExporter endpoint must be a base origin like "https://collector.example.com" with no path, search, or hash.';
@@ -15095,10 +15100,17 @@ function resolveBaseEndpoint(baseEndpoint) {
     throw createInvalidEndpointError(baseEndpoint, invalidText, error48);
   }
 }
-function buildSignalEndpoint(baseEndpoint, signal) {
-  return `${baseEndpoint}${SIGNAL_PUBLISH_PATHS[signal]}`;
+function buildSignalPath(signal, projectId) {
+  const signalSegment = SIGNAL_PUBLISH_SEGMENTS[signal];
+  if (!projectId) {
+    return `/ai/${signalSegment}/publish`;
+  }
+  return `/projects/${projectId}/ai/${signalSegment}/publish`;
+}
+function buildSignalEndpoint(baseEndpoint, signal, projectId) {
+  return `${baseEndpoint}${buildSignalPath(signal, projectId)}`;
 }
-function resolveExplicitSignalEndpoint(signal, endpoint) {
+function resolveExplicitSignalEndpoint(signal, endpoint, projectId) {
   const normalizedEndpoint = trimTrailingSlashes(endpoint);
   const invalidText = `CloudExporter ${signal}Endpoint must be a base origin like "https://collector.example.com" or a full ${signal} publish URL ending in "${SIGNAL_PUBLISH_SUFFIXES[signal]}".`;
   try {
@@ -15109,7 +15121,7 @@ function resolveExplicitSignalEndpoint(signal, endpoint) {
     const normalizedOrigin = trimTrailingSlashes(parsedEndpoint.origin);
     const normalizedPathname = trimTrailingSlashes(parsedEndpoint.pathname);
     if (!normalizedPathname || normalizedPathname === "/") {
-      return buildSignalEndpoint(normalizedOrigin, signal);
+      return buildSignalEndpoint(normalizedOrigin, signal, projectId);
     }
     if (normalizedPathname.endsWith(SIGNAL_PUBLISH_SUFFIXES[signal])) {
       return `${normalizedOrigin}${normalizedPathname}`;
@@ -15152,7 +15164,12 @@ var CloudExporter = class extends BaseExporter {
   inFlightFlushes = /* @__PURE__ */ new Set();
   constructor(config2 = {}) {
     super(config2);
+    if (config2.projectId !== void 0 && !VALID_PROJECT_ID.test(config2.projectId)) {
+      throw createInvalidProjectIdError(config2.projectId);
+    }
     const accessToken = config2.accessToken ?? process.env.MASTRA_CLOUD_ACCESS_TOKEN;
+    const rawProjectId = config2.projectId ?? process.env.MASTRA_PROJECT_ID;
+    const projectId = rawProjectId && VALID_PROJECT_ID.test(rawProjectId) ? rawProjectId : void 0;
     if (!accessToken) {
       this.setDisabled("MASTRA_CLOUD_ACCESS_TOKEN environment variable not set.");
     }
@@ -15160,19 +15177,19 @@ var CloudExporter = class extends BaseExporter {
     let baseEndpoint;
     let tracesEndpoint;
     if (tracesEndpointOverride) {
-      tracesEndpoint = resolveExplicitSignalEndpoint("traces", tracesEndpointOverride);
+      tracesEndpoint = resolveExplicitSignalEndpoint("traces", tracesEndpointOverride, projectId);
     } else {
       baseEndpoint = resolveBaseEndpoint(config2.endpoint ?? DEFAULT_CLOUD_ENDPOINT);
-      tracesEndpoint = buildSignalEndpoint(baseEndpoint, "traces");
+      tracesEndpoint = buildSignalEndpoint(baseEndpoint, "traces", projectId);
     }
     const resolveConfiguredSignalEndpoint = (signal, explicitEndpoint) => {
       if (explicitEndpoint) {
-        return resolveExplicitSignalEndpoint(signal, explicitEndpoint);
+        return resolveExplicitSignalEndpoint(signal, explicitEndpoint, projectId);
       }
       if (tracesEndpointOverride) {
         return deriveSignalEndpointFromTracesEndpoint(signal, tracesEndpoint);
       }
-      return buildSignalEndpoint(baseEndpoint, signal);
+      return buildSignalEndpoint(baseEndpoint, signal, projectId);
     };
     this.cloudConfig = {
       logger: this.logger,
@@ -15396,7 +15413,7 @@ var CloudExporter = class extends BaseExporter {
     const options = {
       method: "POST",
       headers,
-      body: JSON.stringify({ [SIGNAL_PAYLOAD_KEYS[signal]]: records })
+      body: JSON.stringify({ [SIGNAL_PUBLISH_SEGMENTS[signal]]: records })
     };
     await fetchWithRetry(endpointMap[signal], options, this.cloudConfig.maxRetries);
   }