@bitfab/sdk 0.74.6 → 0.74.7

package/dist/{http-C_f9vk_C.cjs → http-sX8XbCY8.cjs}

@@ -5,7 +5,7 @@ let _opentelemetry_core = require("@opentelemetry/core");
 let _opentelemetry_resources = require("@opentelemetry/resources");
 let _opentelemetry_sdk_trace = require("@opentelemetry/sdk-trace");
 //#region src/version.generated.ts
-const __version__ = "0.74.6";
+const __version__ = "0.74.7";
 const __packageName__ = "@bitfab/sdk";
 //#endregion
 //#region src/traceCompletion.ts
@@ -1015,20 +1015,21 @@ function warnAboutShadowedKeys(traceId, record) {
 	require_autoTrace.warn(`trace metadata key(s) ${shadowed.join(", ")} on trace ${traceId} were set both by the caller and by an integration's own trace export; the caller's value is the one kept on the trace.`);
 }
 function mergeCallerMetadataIntoTracePayload(payload) {
-	const externalTrace = payload.externalTrace;
-	if (typeof externalTrace !== "object" || externalTrace === null) return payload;
-	const external = externalTrace;
-	const traceId = typeof payload.id === "string" && payload.id !== "" ? payload.id : external.id;
+	const traceKey = "rawTrace" in payload ? "rawTrace" : "externalTrace";
+	const rawTrace = payload[traceKey];
+	if (typeof rawTrace !== "object" || rawTrace === null) return payload;
+	const trace = rawTrace;
+	const traceId = typeof payload.id === "string" && payload.id !== "" ? payload.id : trace.id;
 	if (typeof traceId !== "string" || traceId === "") return payload;
 	const record = findRecord(traceId);
 	if (!record || Object.keys(record.caller).length === 0) return payload;
-	const exported = external.metadata;
+	const exported = trace.metadata;
 	if (typeof exported === "object" && exported !== null) Object.assign(record.derived, exported);
 	warnAboutShadowedKeys(traceId, record);
 	return {
 		...payload,
-		externalTrace: {
-			...external,
+		[traceKey]: {
+			...trace,
 			metadata: {
 				...record.derived,
 				...record.caller
@@ -1524,10 +1525,10 @@ const EXIT_FLUSH_TIMEOUT_MS = 5e3;
 const DEFAULT_LIFECYCLE_TIMEOUT_MS = 3e4;
 const pendingTracePromises = /* @__PURE__ */ new Set();
 const liveHttpClients = /* @__PURE__ */ new Set();
-async function releaseHeldExternalSpans(timeoutMs) {
+async function releaseHeldSpans(timeoutMs) {
 	const deadline = Date.now() + Math.max(timeoutMs, 0);
 	let released = true;
-	for (const client of [...liveHttpClients]) released = await client.releaseHeldExternalSpans?.(Math.max(0, deadline - Date.now())) !== false && released;
+	for (const client of [...liveHttpClients]) released = await client.releaseHeldSpans?.(Math.max(0, deadline - Date.now())) !== false && released;
 	return released;
 }
 function stopSimulationPlans() {
@@ -1542,9 +1543,9 @@ function awaitOnExit(promise) {
 }
 async function flushTraces(timeoutMs = 5e3) {
 	const deadline = Date.now() + Math.max(timeoutMs, 0);
-	const released = await releaseHeldExternalSpans(planWaitSliceMs(timeoutMs));
+	const released = await releaseHeldSpans(planWaitSliceMs(timeoutMs));
 	const requestsFlushed = await awaitPendingRequests(Math.max(0, deadline - Date.now()));
-	const releasedAfterDeferred = await releaseHeldExternalSpans(0);
+	const releasedAfterDeferred = await releaseHeldSpans(0);
 	const transportsFlushed = await flushTraceTransports(Math.max(0, deadline - Date.now()));
 	return released && releasedAfterDeferred && requestsFlushed && transportsFlushed;
 }
@@ -1575,7 +1576,7 @@ if (typeof process !== "undefined" && process.versions != null && process.versio
 		};
 		const deadline = setTimeout(stopFlushing, 1e4);
 		unrefTimer(deadline);
-		releaseHeldExternalSpans(planWaitMs).catch(() => {}).then(() => {
+		releaseHeldSpans(planWaitMs).catch(() => {}).then(() => {
 			stopSimulationPlans();
 		}).then(() => Promise.allSettled([...Array.from(pendingTracePromises).map((p) => p.catch(() => {})), shutdownTraceTransports(EXIT_FLUSH_TIMEOUT_MS).catch(() => false)])).then(() => {
 			clearTimeout(deadline);
@@ -1626,7 +1627,7 @@ function carrierName(operation, payload) {
 }
 function payloadTimestamp(payload, field) {
 	const rawSpan = asPayloadRecord(payload.rawSpan);
-	const rawTrace = asPayloadRecord(payload.externalTrace) ?? asPayloadRecord(payload.rawTrace);
+	const rawTrace = asPayloadRecord(payload.rawTrace) ?? asPayloadRecord(payload.externalTrace);
 	const raw = rawSpan?.[field] ?? rawTrace?.[field];
 	if (typeof raw !== "string") return;
 	const parsed = Date.parse(raw);
@@ -1653,20 +1654,38 @@ function carrierRef(payload) {
 }
 function sourceTraceIdOf(payload) {
 	if (typeof payload.sourceTraceId === "string") return payload.sourceTraceId;
-	const id = (payload.externalTrace ?? payload.rawTrace)?.id;
+	const id = (payload.rawTrace ?? payload.externalTrace)?.id;
 	return typeof id === "string" ? id : void 0;
 }
 let carrierSeq = 0;
 function describeError(error) {
 	return error instanceof Error ? error.message : String(error);
 }
-function warnDroppedExternalSpan(error) {
-	require_autoTrace.warnOnce("external-span-dropped", `a span was dropped because the send step failed: ${describeError(error)}`);
+function warnDroppedSpan(error) {
+	require_autoTrace.warnOnce("span-dropped", `a span was dropped because the send step failed: ${describeError(error)}`);
 }
-function warnDroppedExternalTrace(error) {
-	require_autoTrace.warnOnce("external-trace-dropped", `a trace was dropped because the send step failed: ${describeError(error)}`);
+function warnDroppedTrace(error) {
+	require_autoTrace.warnOnce("trace-dropped", `a trace was dropped because the send step failed: ${describeError(error)}`);
 }
 var HttpClient = class {
+	get externalSpanTransform() {
+		return this.spanPayloadTransform;
+	}
+	set externalSpanTransform(transform) {
+		this.spanPayloadTransform = transform;
+	}
+	get externalTraceTransform() {
+		return this.tracePayloadTransform;
+	}
+	set externalTraceTransform(transform) {
+		this.tracePayloadTransform = transform;
+	}
+	get releaseHeldExternalSpans() {
+		return this.releaseHeldSpans;
+	}
+	set releaseHeldExternalSpans(release) {
+		this.releaseHeldSpans = release;
+	}
 	constructor(config) {
 		this.traceDeliveries = /* @__PURE__ */ new Map();
 		this.deferredWork = /* @__PURE__ */ new Set();
@@ -1781,10 +1800,10 @@ var HttpClient = class {
 	}
 	async settleDeferredWork(timeoutMs = DEFAULT_LIFECYCLE_TIMEOUT_MS) {
 		const deadline = Date.now() + Math.max(timeoutMs, 0);
-		const released = await this.releaseHeldExternalSpans?.(planWaitSliceMs(timeoutMs));
+		const released = await this.releaseHeldSpans?.(planWaitSliceMs(timeoutMs));
 		await replayContextReady.catch(() => {});
 		const settled = await waitForPromises(Array.from(this.deferredWork), Math.max(0, deadline - Date.now()));
-		const releasedAfterDeferred = await this.releaseHeldExternalSpans?.(0);
+		const releasedAfterDeferred = await this.releaseHeldSpans?.(0);
 		return released !== false && releasedAfterDeferred !== false && settled;
 	}
 	async waitForPendingRequests(timeoutMs = DEFAULT_LIFECYCLE_TIMEOUT_MS) {
@@ -1801,9 +1820,9 @@ var HttpClient = class {
 			const settled = await this.settleDeferredWork(Math.max(0, deadline - Date.now()));
 			this.stopSimulationPlan?.();
 			this.closed = true;
-			this.externalSpanTransform = void 0;
-			this.externalTraceTransform = void 0;
-			this.releaseHeldExternalSpans = void 0;
+			this.spanPayloadTransform = void 0;
+			this.tracePayloadTransform = void 0;
+			this.releaseHeldSpans = void 0;
 			this.stopSimulationPlan = void 0;
 			const transport = this.traceTransport;
 			this.traceTransport = void 0;
@@ -1923,25 +1942,25 @@ var HttpClient = class {
 		};
 		this.getTraceTransport()?.submit("internal_trace", body, carrierMeta("internal_trace", body, void 0));
 	}
-	sendExternalSpan(payload) {
+	sendSpanPayload(payload) {
 		const ref = carrierRef(payload);
 		if (ref?.spanId !== void 0) this.traceCompletion.record(ref.traceId, ref.spanId);
 		const drop = () => {
 			if (ref?.spanId !== void 0) this.traceCompletion.abort(ref.traceId, ref.spanId);
 		};
-		const gate = this.externalSpanTransform;
+		const gate = this.spanPayloadTransform;
 		if (gate === void 0) {
-			this.submitExternalSpan(payload);
+			this.submitSpanPayload(payload);
 			return;
 		}
 		try {
-			gate(payload, (ready) => this.submitExternalSpan(ready), drop);
+			gate(payload, (ready) => this.submitSpanPayload(ready), drop);
 		} catch (error) {
 			drop();
-			warnDroppedExternalSpan(error);
+			warnDroppedSpan(error);
 		}
 	}
-	submitExternalSpan(payload) {
+	submitSpanPayload(payload) {
 		const body = {
 			...payload,
 			sdkVersion: __version__
@@ -1950,35 +1969,47 @@ var HttpClient = class {
 		delete body[DECLARED_NODE_FIELD];
 		this.getTraceTransport()?.submit("external_span", body, this.recordedMeta("external_span", payload, carrierRef(payload)));
 	}
-	sendExternalTrace(rawPayload) {
+	sendTracePayload(rawPayload) {
 		const payload = mergeCallerMetadataIntoTracePayload(rawPayload);
 		const traceId = sourceTraceIdOf(payload);
 		if (payload.completed === true && traceId !== void 0) {
-			this.traceCompletion.close(traceId, (expectedSpanCount) => this.sendCountedExternalTrace({
+			this.traceCompletion.close(traceId, (expectedSpanCount) => this.sendCountedTracePayload({
 				...payload,
 				expectedSpanCount
 			}), payload.dropped === true);
 			return;
 		}
 		if (traceId !== void 0) this.traceCompletion.open(traceId);
-		this.sendCountedExternalTrace(payload);
+		this.sendCountedTracePayload(payload);
 	}
-	sendCountedExternalTrace(payload) {
+	sendCountedTracePayload(payload) {
 		try {
-			const gate = this.externalTraceTransform;
-			if (gate === void 0) this.submitExternalTrace(payload);
-			else gate(payload, (ready) => this.submitExternalTrace(ready));
+			const gate = this.tracePayloadTransform;
+			if (gate === void 0) this.submitTracePayload(payload);
+			else gate(payload, (ready) => this.submitTracePayload(ready));
 		} catch (error) {
-			warnDroppedExternalTrace(error);
+			warnDroppedTrace(error);
 		}
 	}
-	submitExternalTrace(payload) {
+	submitTracePayload(payload) {
 		this.getTraceTransport()?.submit("external_trace", {
 			...payload,
 			sdkPackage: __packageName__,
 			sdkVersion: __version__
 		}, this.recordedMeta("external_trace", payload, payload.completed === true ? carrierRef(payload) : void 0));
 	}
+	sendExternalSpan(payload) {
+		this.sendSpanPayload(payload);
+	}
+	submitExternalSpan(payload) {
+		this.submitSpanPayload(payload);
+	}
+	sendExternalTrace(rawPayload) {
+		this.sendTracePayload(rawPayload);
+	}
+	submitExternalTrace(payload) {
+		this.submitTracePayload(payload);
+	}
 	async patchTrace(traceId, payload) {
 		const endpoint = `/api/sdk/traces/${encodeURIComponent(traceId)}`;
 		await this.request(endpoint, payload, { method: "PATCH" });
@@ -2058,9 +2089,9 @@ var HttpClient = class {
 			dbBranchSettings: rest.dbBranchSettings ?? null
 		};
 	}
-	async getExternalSpan(spanId, options) {
+	async getSpanRaw(spanId, options) {
 		const query = options?.view === "replay" ? "?view=replay" : "";
-		const url = `${this.serviceUrl}/api/sdk/externalSpans/${spanId}${query}`;
+		const url = `${this.serviceUrl}/api/sdk/spans/${spanId}/raw${query}`;
 		const controller = new AbortController();
 		const timeoutId = setTimeout(() => controller.abort(), 3e4);
 		try {
@@ -2085,13 +2116,16 @@ var HttpClient = class {
 			clearTimeout(timeoutId);
 		}
 	}
-	async getSpanTree(externalSpanId, options) {
+	getExternalSpan(spanId, options) {
+		return this.getSpanRaw(spanId, options);
+	}
+	async getSpanTree(spanId, options) {
 		const searchParams = new URLSearchParams();
 		if (options?.includeOutputs === false) searchParams.set("includeOutputs", "false");
 		if (options?.includeRootOutput === false) searchParams.set("includeRootOutput", "false");
 		const encodedQuery = searchParams.toString();
 		const query = encodedQuery ? `?${encodedQuery}` : "";
-		const url = `${this.serviceUrl}/api/sdk/replay/spanTree/${externalSpanId}${query}`;
+		const url = `${this.serviceUrl}/api/sdk/replay/spanTree/${spanId}${query}`;
 		const controller = new AbortController();
 		const timeoutId = setTimeout(() => controller.abort(), 3e4);
 		try {
@@ -2320,4 +2354,4 @@ Object.defineProperty(exports, "unrefTimer", {
 	}
 });
 
-//# sourceMappingURL=http-C_f9vk_C.cjs.map
+//# sourceMappingURL=http-sX8XbCY8.cjs.map