@mastra/observability 1.17.2 → 1.17.3

package/dist/index.js

@@ -2,7 +2,7 @@ import { createRequire } from "module";
 import { MastraBase } from "@mastra/core/base";
 import { ErrorCategory, ErrorDomain, MastraError } from "@mastra/core/error";
 import { ConsoleLogger, LogLevel, RegisteredLogger } from "@mastra/core/logger";
-import { DEFAULT_BLOCKED_LABELS, EntityType, InternalSpans, SpanType, TracingEventType, generateSignalId, noOpLoggerContext } from "@mastra/core/observability";
+import { DEFAULT_BLOCKED_LABELS, EntityType, InternalSpans, SpanType, TracingEventType, generateSignalId, noOpLoggerContext, resolveExportedSpanId } from "@mastra/core/observability";
 import { fetchWithRetry, getNestedValue, setNestedValue } from "@mastra/core/utils";
 import { z } from "zod/v4";
 import fs from "fs";
@@ -2854,6 +2854,23 @@ var BaseSpan = class BaseSpan {
 		if (parent.isExcluded || !includeInternalSpans && parent.isInternal) return parent.getParentSpan(includeInternalSpans);
 		return this.parent;
 	}
+	/**
+	* Get the spanId that observability signals (logs, metrics, scores) should
+	* reference for this span. If this span itself reaches exporters, that is
+	* its own id. If it is excluded from export (internal span, excludeSpanTypes,
+	* or NoOpSpan), resolves to the nearest exportable ancestor instead.
+	* Returns undefined when no exportable ancestor exists.
+	*
+	* Only covers exclusions known when the span is created (`isExcluded`). A
+	* `spanFilter` or a span output processor can still drop a span at export
+	* time — both run on the exported span data after the span ends, so their
+	* verdict isn't knowable while signals are being stamped. Signals emitted
+	* inside a span dropped that way still reference its own id.
+	*/
+	getExportedSpanId() {
+		if (!this.isExcluded) return this.id;
+		return this.getParentSpanId(this.observabilityInstance.getConfig().includeInternalSpans);
+	}
 	/** Get the closest parent spanId that will reach exporters (unless includeInternalSpans) */
 	getParentSpanId(includeInternalSpans) {
 		if (!this.parent) return this.parentSpanId;
@@ -2895,7 +2912,7 @@ var BaseSpan = class BaseSpan {
 		const rootTags = rootSpan.tags?.length ? [...rootSpan.tags] : void 0;
 		this.correlationContext = {
 			traceId: this.traceId,
-			spanId: this.id,
+			spanId: this.getExportedSpanId(),
 			tags: rootTags,
 			entityType: this.entityType,
 			entityId: this.entityId,
@@ -3414,7 +3431,7 @@ var BaseObservabilityInstance = class extends MastraBase {
 		const metadata = span?.metadata ? structuredClone(span.metadata) : void 0;
 		return new LoggerContextImpl({
 			traceId: span?.traceId,
-			spanId: span?.id,
+			spanId: resolveExportedSpanId(span),
 			correlationContext,
 			metadata,
 			observabilityBus: this.observabilityBus,
@@ -3431,7 +3448,7 @@ var BaseObservabilityInstance = class extends MastraBase {
 		const metadata = span?.metadata ? structuredClone(span.metadata) : void 0;
 		return new MetricsContextImpl({
 			traceId: span?.traceId,
-			spanId: span?.id,
+			spanId: resolveExportedSpanId(span),
 			correlationContext,
 			metadata,
 			cardinalityFilter: this.cardinalityFilter,