@mastra/observability 1.10.3 → 1.11.0

package/dist/index.js

@@ -19435,7 +19435,7 @@ var BaseSpan = class {
       sessionId: getMetadataString("sessionId"),
       threadId: getMetadataString("threadId"),
       requestId: getMetadataString("requestId"),
-      environment: getMetadataString("environment"),
+      environment: getMetadataString("environment") ?? this.observabilityInstance.getMastraEnvironment?.(),
       source: getMetadataString("source"),
       serviceName: getMetadataString("serviceName") ?? this.observabilityInstance.getConfig().serviceName,
       experimentId: getMetadataString("experimentId")
@@ -19707,6 +19707,12 @@ var BaseObservabilityInstance = class extends MastraBase {
    * Cardinality filter for metrics label protection.
    */
   cardinalityFilter;
+  /**
+   * Deployment environment propagated from the parent Mastra instance.
+   * Set by `Observability.setMastraContext`, read by spans as a fallback when
+   * a span's `metadata.environment` isn't set.
+   */
+  #mastraEnvironment;
   constructor(config2) {
     super({ component: RegisteredLogger.OBSERVABILITY, name: config2.serviceName });
     this.config = {
@@ -19799,6 +19805,7 @@ var BaseObservabilityInstance = class extends MastraBase {
     const tracingMetadata = !options.parent ? tracingOptions?.metadata : void 0;
     const mergedMetadata = metadata || tracingMetadata ? { ...metadata, ...tracingMetadata } : void 0;
     const enrichedMetadata = this.extractMetadataFromRequestContext(requestContext, mergedMetadata, traceState);
+    const finalMetadata = !options.parent && this.#mastraEnvironment !== void 0 && (enrichedMetadata === void 0 || enrichedMetadata.environment === void 0) ? { ...enrichedMetadata ?? {}, environment: this.#mastraEnvironment } : enrichedMetadata;
     const tags = !options.parent ? tracingOptions?.tags : void 0;
     const traceId = !options.parent ? options.traceId ?? tracingOptions?.traceId : options.traceId;
     const parentSpanId = !options.parent ? options.parentSpanId ?? tracingOptions?.parentSpanId : options.parentSpanId;
@@ -19806,7 +19813,7 @@ var BaseObservabilityInstance = class extends MastraBase {
       ...rest,
       traceId,
       parentSpanId,
-      metadata: enrichedMetadata,
+      metadata: finalMetadata,
       traceState,
       tags,
       requestContext
@@ -19859,6 +19866,20 @@ var BaseObservabilityInstance = class extends MastraBase {
   getConfig() {
     return { ...this.config };
   }
+  /**
+   * Returns the deployment environment propagated from the parent Mastra instance.
+   * Spans use this as a fallback when `metadata.environment` isn't set.
+   */
+  getMastraEnvironment() {
+    return this.#mastraEnvironment;
+  }
+  /**
+   * Internal hook used by `Observability.setMastraContext` to push the
+   * resolved Mastra-level environment into this instance.
+   */
+  __setMastraEnvironment(environment) {
+    this.#mastraEnvironment = environment;
+  }
   // ============================================================================
   // Plugin Access
   // ============================================================================
@@ -20873,7 +20894,9 @@ var Observability = class extends MastraBase {
     const instances = this.listInstances();
     const { mastra } = options;
     this.#mastra = mastra;
+    const mastraEnvironment = mastra.getEnvironment?.();
     instances.forEach((instance) => {
+      instance.__setMastraEnvironment?.(mastraEnvironment);
       const config2 = instance.getConfig();
       const exporters = instance.getExporters();
       exporters.forEach((exporter) => {
@@ -20990,6 +21013,9 @@ var Observability = class extends MastraBase {
   /** Register a named observability instance, optionally marking it as default. */
   registerInstance(name, instance, isDefault = false) {
     this.#registry.register(name, instance, isDefault);
+    if (this.#mastra) {
+      instance.__setMastraEnvironment?.(this.#mastra.getEnvironment?.());
+    }
   }
   /** Get a registered instance by name. */
   getInstance(name) {