@mastra/datadog 1.4.16-alpha.0 → 1.4.16

package/dist/index.js

@@ -327,8 +327,14 @@ var DatadogBridge = class extends BaseExporter {
 	startLinkKeys = /* @__PURE__ */ new WeakMap();
 	traceContext = /* @__PURE__ */ new Map();
 	openSpanCounts = /* @__PURE__ */ new Map();
+	flushGraceMs;
+	/** True when spans or evaluations were handed to dd-trace since the last flush() */
+	pendingSend = false;
+	/** Grace wait in progress, shared by flush() calls that overlap it */
+	graceWait = null;
 	constructor(config = {}) {
 		super(config);
+		this.flushGraceMs = config.flushGraceMs ?? 2e3;
 		const mlApp = config.mlApp ?? process.env.DD_LLMOBS_ML_APP;
 		const apiKey = config.apiKey ?? process.env.DD_API_KEY;
 		const site = config.site ?? process.env.DD_SITE ?? "datadoghq.com";
@@ -435,6 +441,7 @@ var DatadogBridge = class extends BaseExporter {
 			return;
 		}
 		try {
+			this.pendingSend = true;
 			tracer.llmobs.submitEvaluation({
 				traceId: score.traceId,
 				spanId: toDatadogSpanId(score.spanId)
@@ -567,7 +574,10 @@ var DatadogBridge = class extends BaseExporter {
 			});
 		}
 		try {
-			if (typeof ddSpan.finish === "function") ddSpan.finish(endTime.getTime());
+			if (typeof ddSpan.finish === "function") {
+				this.pendingSend = true;
+				ddSpan.finish(endTime.getTime());
+			}
 		} catch (error) {
 			this.logger.error("[DatadogBridge] Failed to finish dd span", {
 				error,
@@ -672,6 +682,7 @@ var DatadogBridge = class extends BaseExporter {
 		} catch (e) {
 			this.logger.error("Error flushing llmobs", { error: e });
 		}
+		await this.waitForBackgroundSend();
 		try {
 			await flushApmExporter();
 			this.logger.debug("Datadog APM exporter flushed");
@@ -679,11 +690,32 @@ var DatadogBridge = class extends BaseExporter {
 			this.logger.error("Error flushing Datadog APM exporter", { error: e });
 		}
 	}
+	/**
+	* `llmobs.flush()` returns before the background writer's HTTP request
+	* completes and dd-trace gives nothing to await, so wait a bounded time
+	* instead. Starts one wait per batch of new data, so the repeated flushes
+	* during shutdown don't stack. A flush that overlaps a running wait joins
+	* it, so no caller resolves before the data it produced had its wait.
+	*/
+	async waitForBackgroundSend() {
+		if (!(this.flushGraceMs > 0) || !Number.isFinite(this.flushGraceMs)) return;
+		if (this.pendingSend) {
+			this.pendingSend = false;
+			const wait = new Promise((resolve) => setTimeout(resolve, this.flushGraceMs)).finally(() => {
+				if (this.graceWait === wait) this.graceWait = null;
+			});
+			this.graceWait = wait;
+		}
+		await this.graceWait;
+	}
 	async shutdown() {
 		for (const [spanId, ddSpan] of this.ddSpanMap) {
 			this.logger.warn(`[DatadogBridge] Force-finishing APM span that was not properly closed [id=${spanId}]`);
 			try {
-				if (typeof ddSpan.finish === "function") ddSpan.finish();
+				if (typeof ddSpan.finish === "function") {
+					this.pendingSend = true;
+					ddSpan.finish();
+				}
 			} catch {}
 		}
 		this.ddSpanMap.clear();
@@ -748,8 +780,14 @@ var DatadogExporter = class extends BaseExporter {
 	config;
 	traceContext = /* @__PURE__ */ new Map();
 	traceState = /* @__PURE__ */ new Map();
+	flushGraceMs;
+	/** True when spans or evaluations were handed to dd-trace since the last flush() */
+	pendingSend = false;
+	/** Grace wait in progress, shared by flush() calls that overlap it */
+	graceWait = null;
 	constructor(config = {}) {
 		super(config);
+		this.flushGraceMs = config.flushGraceMs ?? 2e3;
 		const mlApp = config.mlApp ?? process.env.DD_LLMOBS_ML_APP;
 		const apiKey = config.apiKey ?? process.env.DD_API_KEY;
 		const site = config.site ?? process.env.DD_SITE ?? "datadoghq.com";
@@ -927,6 +965,7 @@ var DatadogExporter = class extends BaseExporter {
 			return;
 		}
 		try {
+			this.pendingSend = true;
 			tracer.llmobs.submitEvaluation({
 				traceId: exported.traceId,
 				spanId: exported.spanId
@@ -961,6 +1000,25 @@ var DatadogExporter = class extends BaseExporter {
 		} catch (e) {
 			this.logger.error("Error flushing llmobs", { error: e });
 		}
+		await this.waitForBackgroundSend();
+	}
+	/**
+	* `llmobs.flush()` returns before the background writer's HTTP request
+	* completes and dd-trace gives nothing to await, so wait a bounded time
+	* instead. Starts one wait per batch of new data, so the repeated flushes
+	* during shutdown don't stack. A flush that overlaps a running wait joins
+	* it, so no caller resolves before the data it produced had its wait.
+	*/
+	async waitForBackgroundSend() {
+		if (!(this.flushGraceMs > 0) || !Number.isFinite(this.flushGraceMs)) return;
+		if (this.pendingSend) {
+			this.pendingSend = false;
+			const wait = new Promise((resolve) => setTimeout(resolve, this.flushGraceMs)).finally(() => {
+				if (this.graceWait === wait) this.graceWait = null;
+			});
+			this.graceWait = wait;
+		}
+		await this.graceWait;
 	}
 	/**
 	* Gracefully shuts down the exporter.
@@ -1165,6 +1223,7 @@ var DatadogExporter = class extends BaseExporter {
 			model: span.attributes?.model,
 			provider: span.attributes?.provider
 		} : inheritedModelAttrs;
+		this.pendingSend = true;
 		tracer.llmobs.trace(traceOptions, (ddSpan) => {
 			const annotations = this.buildAnnotations(span);
 			if (Object.keys(annotations).length > 0) tracer.llmobs.annotate(ddSpan, annotations);