@safaricom-mxl/effect-sdk 0.0.23 → 0.0.24

package/dist/{server-25vCyy-w.mjs → server-BMDPjez-.mjs}

@@ -1,109 +1,45 @@
-import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.mjs";
-import { Cause, Config, Context, Duration, Effect, Layer, ManagedRuntime, Match, Option, References, Schedule, Schema, Semaphore } from "effect";
+import { t as __exportAll } from "./rolldown-runtime-D8jQpDG7.mjs";
+import { Cause, Config, Context, Duration, Effect, Layer, ManagedRuntime, Match, Option, Predicate, References, Schedule, Schema, Semaphore } from "effect";
+import * as Otel from "@opentelemetry/api";
+import { SpanKind, SpanStatusCode, TraceFlags, context, propagation, trace } from "@opentelemetry/api";
 import { FetchHttpClient, HttpClient, HttpClientRequest, HttpMiddleware } from "effect/http";
+import { SchemaJITCompiler } from "effect/schema";
+import * as Option$1 from "effect/Option";
 import { Otlp } from "effect/observability";
 import { AsyncLocalStorageContextManager } from "@opentelemetry/context-async-hooks";
-import * as Otel from "@opentelemetry/api";
-import { SpanKind, SpanStatusCode, TraceFlags, context, propagation, trace } from "@opentelemetry/api";
-import * as Tracer from "effect/Tracer";
+import * as Tracer$1 from "effect/Tracer";
 import { v7 } from "uuid";
 import { platform, provider, runtime } from "std-env";
-import { SchemaJITCompiler } from "effect/schema";
-import * as Option$1 from "effect/Option";
 import * as OtelTracer from "@effect/opentelemetry/OtelTracer";
-//#region src/server/otel-context-bridge.ts
-const evaluate = "~effect/Effect/evaluate";
-const contextManagerProbe = Otel.createContextKey("mxl.effect-sdk.context-manager-probe");
-let contextManagerInstalled = false;
-function hasWorkingContextManager() {
-	return Otel.context.with(Otel.ROOT_CONTEXT.setValue(contextManagerProbe, true), () => Otel.context.active().getValue(contextManagerProbe) === true);
-}
-/**
-* Install AsyncLocalStorage so `Otel.context.with` actually propagates.
-* Does not replace a context manager the host app already registered.
-*/
-function ensureOtelContextManager() {
-	if (contextManagerInstalled) return;
-	if (hasWorkingContextManager()) {
-		contextManagerInstalled = true;
-		return;
-	}
-	const manager = new AsyncLocalStorageContextManager();
-	manager.enable();
-	if (!Otel.context.setGlobalContextManager(manager)) {
-		manager.disable();
-		contextManagerInstalled = true;
-		return;
-	}
-	contextManagerInstalled = true;
-}
-function formatTraceparent(span) {
-	const flags = span.sampled ? "01" : "00";
-	return `00-${span.traceId}-${span.spanId}-${flags}`;
-}
-function buildTraceCarrierFromSpan(span, headers) {
-	const carrier = { traceparent: formatTraceparent(span) };
-	if (headers?.["tracestate"]) carrier["tracestate"] = headers["tracestate"];
-	if (headers?.["baggage"]) carrier["baggage"] = headers["baggage"];
-	return carrier;
-}
-/**
-* Put Effect span ids on the global OpenTelemetry context.
-*
-* Id-only `setSpanContext`. Live `Otel.Span` objects come from
-* `OtelTracer.currentOtelSpan` in Effect space, not from a private TypeId.
-*/
-function effectSpanToOtelContext(activeContext, span) {
-	return Otel.trace.setSpanContext(activeContext, {
-		isRemote: span._tag === "ExternalSpan",
-		spanId: span.spanId,
-		traceFlags: span.sampled ? Otel.TraceFlags.SAMPLED : Otel.TraceFlags.NONE,
-		traceId: span.traceId
-	});
-}
-/**
-* Wrap a tracer so Effect spans activate global `@opentelemetry/api` context.
-*
-* Prefer this over `Otlp.layerJson({ tracerContext })` until Effect changes
-* that hook. On effect@4.0.2 the callback is still `(primitive, span)`
-* and must return the evaluation, but `EffectPrimitive` only evaluates with a
-* `fiber`. Keep this wrap until Effect passes fiber or evaluates after the hook.
-*/
-function wrapTracerWithOtelContextBridge(base) {
-	ensureOtelContextManager();
-	const existingContext = base.context;
-	return Tracer.make({
-		span(options) {
-			return base.span(options);
-		},
-		context(primitive, fiber) {
-			if (fiber.cache.span === void 0) {
-				if (existingContext) return existingContext(primitive, fiber);
-				return primitive[evaluate](fiber);
-			}
-			return Otel.context.with(effectSpanToOtelContext(Otel.context.active(), fiber.cache.span), () => {
-				if (existingContext) return existingContext(primitive, fiber);
-				return primitive[evaluate](fiber);
-			});
-		}
-	});
-}
-/**
-* Layer that wraps the configured Effect tracer with a global OTel context bridge.
-*
-* Must be provided over `Otlp.layerJson` so queue propagation, log correlation,
-* and outbound W3C headers see the active server span.
-*/
-const otelGlobalContextBridgeLayer = Layer.effect(Tracer.Tracer, Effect.gen(function* () {
-	return wrapTracerWithOtelContextBridge(yield* Tracer.Tracer);
-}));
-//#endregion
-//#region src/server/otlp.ts
-function normalizeOtlpBaseUrl(url) {
-	const trimmed = url.replace(/\/$/, "");
-	if (trimmed.endsWith("/v1/traces") || trimmed.endsWith("/v1/logs")) return trimmed.replace(/\/v1\/(traces|logs|metrics)$/, "");
-	return trimmed;
-}
+// src/shared/span-options.ts
+const prefixMatcher = (prefixes) => {
+	const list = prefixes === void 0 ? [] : [...prefixes];
+	return list.length > 0 ? (name) => list.some((prefix) => name.startsWith(prefix)) : void 0;
+};
+const failureIdentifier = (error) => {
+	if (Predicate.hasProperty(error, "_tag") && typeof error._tag === "string") return error._tag;
+	if (Predicate.hasProperty(error, "name") && typeof error.name === "string") return error.name;
+	const body = Predicate.hasProperty(error, "error") ? error.error : void 0;
+	if (Predicate.hasProperty(body, "_tag") && typeof body._tag === "string") return body._tag;
+};
+const resolveSpanFilter = (input = {}) => {
+	const dropName = prefixMatcher(input.dropSpanNames);
+	const dropPredicate = input.dropSpan;
+	const drop = dropName !== void 0 && dropPredicate !== void 0 ? (span) => dropName(span.name) || dropPredicate(span) : dropName !== void 0 ? (span) => dropName(span.name) : dropPredicate;
+	const identifiers = /* @__PURE__ */ new Set([...input.anticipatedErrorIdentifiers ?? [], ...input.anticipatedErrorTags ?? []]);
+	const byIdentifier = identifiers.size > 0 ? (error) => {
+		const identifier = failureIdentifier(error);
+		return identifier !== void 0 && identifiers.has(identifier);
+	} : void 0;
+	const byPredicate = input.isAnticipatedError;
+	const isAnticipated = byIdentifier !== void 0 && byPredicate !== void 0 ? (error) => byIdentifier(error) || byPredicate(error) : byIdentifier ?? byPredicate;
+	return {
+		dropSubtree: prefixMatcher(input.dropSpanSubtrees),
+		drop,
+		isAnticipated,
+		includeCauseInStack: input.includeCauseInStack ?? false
+	};
+};
 /** Resolve the OTLP exporter endpoint from standard env vars. */
 const endpoint = Effect.gen(function* () {
 	const otlp = yield* Config.option(Config.String("OTEL_EXPORTER_OTLP_ENDPOINT"));
@@ -155,36 +91,547 @@ const otelResourceAttributes = Effect.gen(function* () {
 		onNone: () => ({}),
 		onSome: (value) => parseOtelResourceAttributes(value)
 	});
-});
+});
+/**
+* Parse `OTEL_EXPORTER_OTLP_HEADERS` (`key=value,key2=value2`) into a header map.
+*/
+const parseOtlpHeaders = (input) => {
+	const result = {};
+	for (const pair of input.split(",")) {
+		const eq = pair.indexOf("=");
+		if (eq === -1) continue;
+		const key = pair.slice(0, eq).trim();
+		if (!key) continue;
+		const raw = pair.slice(eq + 1).trim();
+		try {
+			result[key] = decodeURIComponent(raw);
+		} catch {
+			result[key] = raw;
+		}
+	}
+	return result;
+};
+/** Resolve OTLP export headers from env. */
+const otlpHeaders = Effect.gen(function* () {
+	const raw = yield* Config.option(Config.String("OTEL_EXPORTER_OTLP_HEADERS"));
+	return Option.match(raw, {
+		onNone: () => ({}),
+		onSome: (value) => parseOtlpHeaders(value)
+	});
+});
+// src/shared/try-sync.ts
+/** Run a throwing synchronous call, `None` if it threw. */
+const trySync = (thunk) => Effect.runSync(Effect.option(Effect.try(thunk)));
+/** Run a throwing synchronous call, `undefined` if it threw. */
+const trySyncOrUndefined = (thunk) => Option.getOrUndefined(trySync(thunk));
+// src/server/container.ts
+const CONTAINER_ID_RE = /\/docker\/containers\/([0-9a-f]{64})\//;
+const CGROUP_ID_RE = /([0-9a-f]{64})/;
+const SHORT_ID_HOSTNAME_RE = /^[0-9a-f]{12}$/;
+/**
+* Pure derivation from probed inputs — the testable core. Every probe call is
+* guarded by the caller (`getContainerAttributes` wraps the whole thing).
+*/
+const deriveContainerAttributes = (probe) => {
+	const inDocker = trySyncOrUndefined(() => probe.exists("/.dockerenv")) ?? false;
+	const attrs = {};
+	if (inDocker) attrs["container.runtime.name"] = "docker";
+	const containerId = trySyncOrUndefined(() => probe.readFile("/proc/self/mountinfo").match(CONTAINER_ID_RE)?.[1]) ?? trySyncOrUndefined(() => probe.readFile("/proc/self/cgroup").match(CGROUP_ID_RE)?.[1]) ?? (inDocker ? trySyncOrUndefined(() => {
+		const name = probe.hostname();
+		return SHORT_ID_HOSTNAME_RE.test(name) ? name : void 0;
+	}) : void 0);
+	if (containerId) attrs["container.id"] = containerId;
+	return attrs;
+};
+let cached;
+/**
+* Read live container identity from the filesystem, memoized for the process
+* lifetime (container identity cannot change under a running process). Returns
+* `{}` anywhere the probes aren't available — non-Linux, workerd, browsers.
+*/
+const getContainerAttributes = () => {
+	if (cached) return cached;
+	const proc = globalThis.process;
+	const loadBuiltin = proc?.getBuiltinModule;
+	if (proc?.platform !== "linux" || typeof loadBuiltin !== "function") {
+		cached = {};
+		return cached;
+	}
+	const fs = trySyncOrUndefined(() => loadBuiltin("node:fs"));
+	const os = trySyncOrUndefined(() => loadBuiltin("node:os"));
+	if (!fs || !os) {
+		cached = {};
+		return cached;
+	}
+	cached = deriveContainerAttributes({
+		exists: (path) => fs.existsSync(path),
+		readFile: (path) => fs.readFileSync(path, "utf8"),
+		hostname: () => os.hostname()
+	});
+	return cached;
+};
+// src/shared/dependency-spans.ts
+const MAX_FLUSH_SPAN_LINKS = 32;
+function dbClientSpanAttributes(dbSystem, operation) {
+	return {
+		"db.system": dbSystem,
+		"db.system.name": dbSystem,
+		"peer.service": dbSystem,
+		...operation ? { "db.operation.name": operation } : {}
+	};
+}
+function queueProducerSpanAttributes(destinationName, peerService = "mxl-worker") {
+	return {
+		"messaging.destination.name": destinationName,
+		"messaging.system": "bullmq",
+		"peer.service": peerService
+	};
+}
+function queueConsumerSpanAttributes(destinationName) {
+	return {
+		"messaging.destination.name": destinationName,
+		"messaging.system": "bullmq"
+	};
+}
+function kafkaProducerSpanAttributes(topic, peerService = "kafka") {
+	return {
+		"messaging.destination.name": topic,
+		"messaging.system": "kafka",
+		"peer.service": peerService
+	};
+}
+function bufferSpanAttributes(bufferName, operation) {
+	return {
+		"buffer.name": bufferName,
+		"db.operation.name": operation,
+		"db.system": "redis",
+		"db.system.name": "redis",
+		"peer.service": "redis"
+	};
+}
+function geoSpanAttributes() {
+	return {
+		"db.operation.name": "resolve",
+		"db.system": "maxmind",
+		"db.system.name": "maxmind",
+		"peer.service": "maxmind"
+	};
+}
+function addSpanLinksFromTraceCarriers(carriers) {
+	const span = trace.getActiveSpan();
+	if (!span) return 0;
+	const seen = /* @__PURE__ */ new Set();
+	let linked = 0;
+	for (const carrier of carriers) {
+		if (!carrier.traceparent || seen.has(carrier.traceparent)) continue;
+		seen.add(carrier.traceparent);
+		const extracted = propagation.extract(context.active(), carrier);
+		const linkedContext = trace.getSpanContext(extracted);
+		if (!linkedContext) continue;
+		span.addLink({ context: linkedContext });
+		linked += 1;
+		if (linked >= MAX_FLUSH_SPAN_LINKS) break;
+	}
+	return linked;
+}
+function withDependencySpan(name, attributesOrOptions, program) {
+	const options = isWithDependencySpanOptions(attributesOrOptions) ? attributesOrOptions : { attributes: attributesOrOptions };
+	const attributes = options.attributes ?? {};
+	const kind = options.kind ?? "client";
+	return program.pipe(Effect.withSpan(name, {
+		attributes,
+		kind
+	}));
+}
+function isWithDependencySpanOptions(value) {
+	return typeof value === "object" && ("kind" in value || "attributes" in value && typeof value.attributes === "object");
+}
+/** Promise-based dependency span for non-Effect code paths. */
+async function withPromiseDependencySpan(name, attributes, operation, kind = "client") {
+	const tracer = trace.getTracer("mxl-effect-sdk");
+	const spanKind = kind === "producer" ? SpanKind.PRODUCER : kind === "consumer" ? SpanKind.CONSUMER : SpanKind.CLIENT;
+	return tracer.startActiveSpan(name, {
+		attributes,
+		kind: spanKind
+	}, async (span) => {
+		try {
+			const result = await operation();
+			span.end();
+			return result;
+		} catch (error) {
+			if (error instanceof Error) {
+				span.recordException(error);
+				span.setStatus({
+					code: SpanStatusCode.ERROR,
+					message: error.message
+				});
+			} else span.setStatus({
+				code: SpanStatusCode.ERROR,
+				message: String(error)
+			});
+			span.end();
+			throw error;
+		}
+	});
+}
+const RESERVED_EVENT_NAMES = ["session_start", "session_end"];
+const isReservedEventName = (name) => RESERVED_EVENT_NAMES.some((reserved) => reserved === name);
+const coerceTrackProps = (props) => {
+	if (props === void 0) return {};
+	const attributes = {};
+	for (const [key, value] of Object.entries(props)) {
+		if (value === void 0) continue;
+		attributes[key] = typeof value === "string" ? value : String(value);
+	}
+	return attributes;
+};
+const toEventTimestamp = (value) => (value instanceof Date ? value : new Date(value ?? Date.now())).toISOString();
+const encodeProductEventLine = (input) => {
+	const trimmed = typeof input.name === "string" ? input.name.trim() : "";
+	if (trimmed.length === 0 || isReservedEventName(trimmed)) return;
+	const options = input.options ?? {};
+	return {
+		attributes: coerceTrackProps(options.attributes),
+		group_id: options.groupId ?? "",
+		name: trimmed.slice(0, 80),
+		page_path: options.pagePath ?? "",
+		service_name: input.serviceName,
+		session_id: options.sessionId ?? "",
+		source: input.source,
+		timestamp: toEventTimestamp(options.timestamp),
+		traceparent: options.traceparent,
+		url: options.url ?? "",
+		user_id: options.userId ?? "",
+		visitor_id: options.visitorId ?? ""
+	};
+};
+const encodeNdjson = (lines) => `${lines.map((line) => JSON.stringify(line)).join("\n")}\n`;
+// src/version.ts
+const SDK_NAME = "mxl-effect-sdk";
+const SDK_VERSION = "0.0.24";
+// src/server/events.ts
+var events_exports = /* @__PURE__ */ __exportAll({
+	MxlEvents: () => MxlEvents,
+	ProductEventsPostError: () => ProductEventsPostError,
+	layer: () => layer$1,
+	make: () => make$1,
+	makeHandle: () => makeHandle
+});
+const DEFAULT_FLUSH_INTERVAL = Duration.seconds(5);
+const DEFAULT_MAX_BATCH_SIZE = 100;
+const MAX_BUFFERED_EVENTS = 1e3;
+const WARN_INTERVAL_MS = 3e4;
+const DEFAULT_BASKET_URL = "http://127.0.0.1:8000";
+var MxlEvents = class extends Context.Service()("@safaricom-mxl/effect-sdk/MxlEvents") {};
+var ProductEventsPostError = class extends Schema.TaggedError()("@safaricom-mxl/effect-sdk/ProductEventsPostError", {
+	cause: Schema.optionalKey(Schema.Defect()),
+	message: Schema.String,
+	status: Schema.optionalKey(Schema.Number)
+}) {};
+SchemaJITCompiler.enable(ProductEventsPostError.ast);
+const stringOrUndefined$1 = (value) => value && value.length > 0 ? value : void 0;
+const resolveEventsConfig = (config) => {
+	const endpoint = (config.endpoint ?? process.env["MXL_BASKET_URL"] ?? DEFAULT_BASKET_URL).replace(/\/$/, "");
+	return {
+		apiKey: stringOrUndefined$1(config.apiKey ?? process.env["MXL_API_KEY"]),
+		clientId: stringOrUndefined$1(config.clientId ?? process.env["MXL_CLIENT_ID"]),
+		serviceName: config.serviceName ?? process.env["OTEL_SERVICE_NAME"] ?? "unknown",
+		url: `${endpoint}${config.eventsPath ?? "/events"}`
+	};
+};
+const make$1 = Effect.fn("MxlEvents.make")(function* (config = {}) {
+	const resolved = resolveEventsConfig(config);
+	const maxBatchSize = Math.max(1, config.maxBatchSize ?? DEFAULT_MAX_BATCH_SIZE);
+	const client = (yield* HttpClient.HttpClient).pipe(HttpClient.filterStatusOk);
+	const flushing = yield* Semaphore.make(1);
+	let buffer = [];
+	let warnedAboutName = false;
+	let warnedAboutClient = false;
+	let lastPostWarnAt = 0;
+	const warnPost = (error) => {
+		const now = Date.now();
+		if (now - lastPostWarnAt < WARN_INTERVAL_MS) return;
+		lastPostWarnAt = now;
+		console.warn(`[MxlEvents] ${error.message} (dropping batch)`, error.cause ?? "");
+	};
+	const warnMissingClient = () => {
+		if (warnedAboutClient) return;
+		warnedAboutClient = true;
+		console.warn("[MxlEvents] no client id — set MXL_CLIENT_ID or pass `clientId`; dropping events");
+	};
+	const warnEmptyName = () => {
+		if (warnedAboutName) return;
+		warnedAboutName = true;
+		console.warn("[MxlEvents] track() needs a non-empty event name; the call was ignored.");
+	};
+	const post = (lines) => {
+		const headers = {
+			"mxl-client-id": resolved.clientId ?? "",
+			"mxl-sdk-name": SDK_NAME,
+			"mxl-sdk-version": SDK_VERSION,
+			"user-agent": `${SDK_NAME}-server/${SDK_VERSION}`
+		};
+		if (resolved.apiKey) headers["mxl-api-key"] = resolved.apiKey;
+		return HttpClientRequest.post(resolved.url).pipe(HttpClientRequest.setHeaders(headers), HttpClientRequest.bodyText(encodeNdjson(lines), "application/x-ndjson"), client.execute, Effect.asVoid, Effect.mapError((error) => error.response !== void 0 ? new ProductEventsPostError({
+			message: `POST ${resolved.url} → ${error.response.status}`,
+			status: error.response.status
+		}) : new ProductEventsPostError({
+			cause: error,
+			message: `POST ${resolved.url} failed: ${error.message}`
+		})));
+	};
+	const flush = flushing.withPermits(1)(Effect.suspend(() => {
+		if (buffer.length === 0) return Effect.void;
+		const batch = buffer;
+		buffer = [];
+		if (resolved.clientId === void 0) {
+			warnMissingClient();
+			return Effect.void;
+		}
+		return post(batch).pipe(Effect.catchCause((cause) => Effect.sync(() => {
+			warnPost(Option.getOrElse(Cause.findErrorOption(cause), () => new ProductEventsPostError({
+				cause: Cause.squash(cause),
+				message: `POST ${resolved.url} failed`
+			})));
+		})));
+	}));
+	const track = (name, options = {}) => Effect.sync(() => {
+		const line = encodeProductEventLine({
+			name,
+			options,
+			serviceName: resolved.serviceName,
+			source: "server"
+		});
+		if (line === void 0) {
+			warnEmptyName();
+			return false;
+		}
+		buffer.push(line);
+		if (buffer.length > MAX_BUFFERED_EVENTS) buffer.splice(0, buffer.length - MAX_BUFFERED_EVENTS);
+		return buffer.length >= maxBatchSize;
+	}).pipe(Effect.flatMap((full) => full ? Effect.forkDetach(flush) : Effect.void), Effect.asVoid);
+	const interval = config.flushInterval ?? DEFAULT_FLUSH_INTERVAL;
+	if (Duration.toMillis(interval) > 0) yield* Effect.forkScoped(flush.pipe(Effect.schedule(Schedule.spaced(interval))));
+	yield* Effect.addFinalizer(() => flush);
+	return {
+		flush,
+		track
+	};
+});
+const layer$1 = (config = {}) => Layer.effect(MxlEvents, make$1(config)).pipe(Layer.provide(FetchHttpClient.layer));
+const makeHandle = (config = {}) => {
+	const runtime = ManagedRuntime.make(layer$1(config));
+	const swallow = (promise) => promise.then(() => void 0, () => void 0);
+	return {
+		dispose: () => swallow(runtime.dispose()),
+		flush: () => swallow(runtime.runPromise(Effect.gen(function* () {
+			yield* (yield* MxlEvents).flush;
+		}))),
+		track: (name, options) => {
+			swallow(runtime.runPromise(Effect.gen(function* () {
+				yield* (yield* MxlEvents).track(name, options);
+			})));
+		}
+	};
+};
+// src/server/trace-correlation.ts
+const ZERO_TRACE_ID = "00000000000000000000000000000000";
+const ZERO_SPAN_ID = "0000000000000000";
+/** Parse W3C `traceparent` (`00-{traceId}-{spanId}-{flags}`). */
+function parseTraceparent(traceparent) {
+	if (!traceparent) return {};
+	const parts = traceparent.trim().split("-");
+	if (parts.length < 4) return {};
+	const traceId = parts[1];
+	const spanId = parts[2];
+	if (!traceId || !spanId) return {};
+	if (traceId.length !== 32 || spanId.length !== 16) return {};
+	if (traceId === ZERO_TRACE_ID || spanId === ZERO_SPAN_ID) return {};
+	return {
+		spanId,
+		traceId
+	};
+}
+/**
+* Resolve trace/span IDs for log correlation.
+*
+* Prefers the active OpenTelemetry span (when a host bridge or queue propagation
+* is active), then falls back to a W3C `traceparent` carrier.
+*/
+function getEffectTraceCorrelation(options) {
+	const activeSpan = trace.getSpan(context.active());
+	if (activeSpan) {
+		const spanContext = activeSpan.spanContext();
+		if (spanContext.traceId && spanContext.traceId !== ZERO_TRACE_ID && spanContext.spanId && spanContext.spanId !== ZERO_SPAN_ID) return {
+			spanId: spanContext.spanId,
+			traceId: spanContext.traceId
+		};
+	}
+	return parseTraceparent(options?.traceparent);
+}
+/** Build log annotation fields from active span correlation. */
+function traceCorrelationLogAnnotations(options) {
+	const { traceparent, ...extra } = options ?? {};
+	const correlation = getEffectTraceCorrelation({ traceparent });
+	const annotations = { ...extra };
+	if (correlation.traceId) {
+		annotations["trace.trace_id"] = correlation.traceId;
+		annotations["trace_id"] = correlation.traceId;
+	}
+	if (correlation.spanId) {
+		annotations["trace.span_id"] = correlation.spanId;
+		annotations["span_id"] = correlation.spanId;
+	}
+	return annotations;
+}
+/** Annotate Effect logs with the active span's trace/span IDs. */
+function annotateLogsWithActiveSpanCorrelation(program, fields) {
+	return Effect.gen(function* () {
+		const { traceparent, ...extra } = fields ?? {};
+		const annotations = { ...extra };
+		const currentSpan = yield* Effect.currentSpan.pipe(Effect.option);
+		if (Option$1.isSome(currentSpan)) {
+			annotations["trace.trace_id"] = currentSpan.value.traceId;
+			annotations["trace_id"] = currentSpan.value.traceId;
+			annotations["trace.span_id"] = currentSpan.value.spanId;
+			annotations["span_id"] = currentSpan.value.spanId;
+		} else Object.assign(annotations, traceCorrelationLogAnnotations({
+			...traceparent !== void 0 ? { traceparent } : {},
+			...extra
+		}));
+		if (Object.keys(annotations).length === 0) return yield* program;
+		return yield* program.pipe(Effect.annotateLogs(annotations));
+	});
+}
+// src/server/evlog-bridge.ts
+function headerValue$1(headers, name) {
+	if (!headers) return void 0;
+	const direct = headers[name];
+	if (direct !== void 0) return direct;
+	const lower = headers[name.toLowerCase()];
+	if (lower !== void 0) return lower;
+}
+function assignTraceFields(event, traceId, spanId, overwrite) {
+	if (overwrite || event["trace_id"] === void 0) event["trace_id"] = traceId;
+	if (overwrite || event["span_id"] === void 0) event["span_id"] = spanId;
+	if (overwrite || event["traceId"] === void 0) event["traceId"] = traceId;
+	if (overwrite || event["spanId"] === void 0) event["spanId"] = spanId;
+	const trace = typeof event["trace"] === "object" && event["trace"] !== null ? event["trace"] : {};
+	if (overwrite || trace["trace_id"] === void 0) trace["trace_id"] = traceId;
+	if (overwrite || trace["span_id"] === void 0) trace["span_id"] = spanId;
+	if (Object.keys(trace).length > 0) event["trace"] = trace;
+}
+/**
+* Enrich evlog wide events with trace/span IDs from OTel global context or W3C headers.
+*
+* Use `createEffectTraceEnricher` in the MXL evlog enricher chain.
+*/
+function createEffectTraceEnricher(options = {}) {
+	const overwrite = options.overwrite ?? false;
+	return (ctx) => {
+		const traceparent = headerValue$1(ctx.headers, "traceparent");
+		const correlation = getEffectTraceCorrelation({ traceparent });
+		if (correlation.traceId && correlation.spanId) {
+			assignTraceFields(ctx.event, correlation.traceId, correlation.spanId, overwrite);
+			return;
+		}
+		const parsed = parseTraceparent(traceparent);
+		if (parsed.traceId && parsed.spanId) assignTraceFields(ctx.event, parsed.traceId, parsed.spanId, overwrite);
+	};
+}
+// src/server/otel-context-bridge.ts
+const evaluate = "~effect/Effect/evaluate";
+const contextManagerProbe = Otel.createContextKey("mxl.effect-sdk.context-manager-probe");
+let contextManagerInstalled = false;
+function hasWorkingContextManager() {
+	return Otel.context.with(Otel.ROOT_CONTEXT.setValue(contextManagerProbe, true), () => Otel.context.active().getValue(contextManagerProbe) === true);
+}
+/**
+* Install AsyncLocalStorage so `Otel.context.with` actually propagates.
+* Does not replace a context manager the host app already registered.
+*/
+function ensureOtelContextManager() {
+	if (contextManagerInstalled) return;
+	if (hasWorkingContextManager()) {
+		contextManagerInstalled = true;
+		return;
+	}
+	const manager = new AsyncLocalStorageContextManager();
+	manager.enable();
+	if (!Otel.context.setGlobalContextManager(manager)) {
+		manager.disable();
+		contextManagerInstalled = true;
+		return;
+	}
+	contextManagerInstalled = true;
+}
+function formatTraceparent(span) {
+	const flags = span.sampled ? "01" : "00";
+	return `00-${span.traceId}-${span.spanId}-${flags}`;
+}
+function buildTraceCarrierFromSpan(span, headers) {
+	const carrier = { traceparent: formatTraceparent(span) };
+	if (headers?.["tracestate"]) carrier["tracestate"] = headers["tracestate"];
+	if (headers?.["baggage"]) carrier["baggage"] = headers["baggage"];
+	return carrier;
+}
+/**
+* Put Effect span ids on the global OpenTelemetry context.
+*
+* Id-only `setSpanContext`. Live `Otel.Span` objects come from
+* `OtelTracer.currentOtelSpan` in Effect space, not from a private TypeId.
+*/
+function effectSpanToOtelContext(activeContext, span) {
+	return Otel.trace.setSpanContext(activeContext, {
+		isRemote: span._tag === "ExternalSpan",
+		spanId: span.spanId,
+		traceFlags: span.sampled ? Otel.TraceFlags.SAMPLED : Otel.TraceFlags.NONE,
+		traceId: span.traceId
+	});
+}
 /**
-* Parse `OTEL_EXPORTER_OTLP_HEADERS` (`key=value,key2=value2`) into a header map.
+* Wrap a tracer so Effect spans activate global `@opentelemetry/api` context.
+*
+* Prefer this over `Otlp.layerJson({ tracerContext })` until Effect changes
+* that hook. On effect@4.0.6 the callback is still `(primitive, span)`
+* and must return the evaluation, but `EffectPrimitive` only evaluates with a
+* `fiber`. Keep this wrap until Effect passes fiber or evaluates after the hook.
 */
-const parseOtlpHeaders = (input) => {
-	const result = {};
-	for (const pair of input.split(",")) {
-		const eq = pair.indexOf("=");
-		if (eq === -1) continue;
-		const key = pair.slice(0, eq).trim();
-		if (!key) continue;
-		const raw = pair.slice(eq + 1).trim();
-		try {
-			result[key] = decodeURIComponent(raw);
-		} catch {
-			result[key] = raw;
+function wrapTracerWithOtelContextBridge(base) {
+	ensureOtelContextManager();
+	const existingContext = base.context;
+	return Tracer$1.make({
+		span(options) {
+			return base.span(options);
+		},
+		context(primitive, fiber) {
+			if (fiber.cache.span === void 0) {
+				if (existingContext) return existingContext(primitive, fiber);
+				return primitive[evaluate](fiber);
+			}
+			return Otel.context.with(effectSpanToOtelContext(Otel.context.active(), fiber.cache.span), () => {
+				if (existingContext) return existingContext(primitive, fiber);
+				return primitive[evaluate](fiber);
+			});
 		}
-	}
-	return result;
-};
-/** Resolve OTLP export headers from env. */
-const otlpHeaders = Effect.gen(function* () {
-	const raw = yield* Config.option(Config.String("OTEL_EXPORTER_OTLP_HEADERS"));
-	return Option.match(raw, {
-		onNone: () => ({}),
-		onSome: (value) => parseOtlpHeaders(value)
 	});
-});
-//#endregion
-//#region src/server/platform.ts
+}
+/**
+* Layer that wraps the configured Effect tracer with a global OTel context bridge.
+*
+* Must be provided over `Otlp.layerJson` so queue propagation, log correlation,
+* and outbound W3C headers see the active server span.
+*/
+const otelGlobalContextBridgeLayer = Layer.effect(Tracer$1.Tracer, Effect.gen(function* () {
+	return wrapTracerWithOtelContextBridge(yield* Tracer$1.Tracer);
+}));
+// src/server/otlp.ts
+function normalizeOtlpBaseUrl(url) {
+	const trimmed = url.replace(/\/$/, "");
+	if (trimmed.endsWith("/v1/traces") || trimmed.endsWith("/v1/logs")) return trimmed.replace(/\/v1\/(traces|logs|metrics)$/, "");
+	return trimmed;
+}
+// src/server/platform.ts
 const empty = {};
 const runtimeAttrs = (rt) => Match.value(rt).pipe(Match.when("node", () => ({ "process.runtime.name": "nodejs" })), Match.whenOr("bun", "deno", "workerd", "edge-light", "fastly", (name) => ({ "process.runtime.name": name })), Match.orElse(() => empty));
 const osAttrs = (plat) => Match.value(plat).pipe(Match.when("win32", () => ({ "os.type": "windows" })), Match.whenOr("darwin", "linux", "freebsd", "openbsd", "netbsd", (p) => ({ "os.type": p })), Match.orElse(() => empty));
@@ -296,15 +743,20 @@ const getAutoPlatformAttributes = () => {
 		env
 	});
 };
-//#endregion
-//#region src/server/resource.ts
-const stringOrUndefined$1 = (value) => typeof value === "string" && value.length > 0 ? value : void 0;
+// src/server/resource.ts
+const stringOrUndefined = (value) => typeof value === "string" && value.length > 0 ? value : void 0;
 const DEFAULT_VCS_REPOSITORY_URL = "https://gitlab.safaricom.co.ke/mxl/apm/mxl-effect-sdk";
 function resolveCommitRevision() {
-	return stringOrUndefined$1(process.env["COMMIT_SHA"]) ?? stringOrUndefined$1(process.env["VERCEL_GIT_COMMIT_SHA"]) ?? stringOrUndefined$1(process.env["GITHUB_SHA"]) ?? stringOrUndefined$1(process.env["RAILWAY_GIT_COMMIT_SHA"]) ?? stringOrUndefined$1(process.env["CF_PAGES_COMMIT_SHA"]) ?? stringOrUndefined$1(process.env["RENDER_GIT_COMMIT"]);
+	return stringOrUndefined(process.env["COMMIT_SHA"]) ?? stringOrUndefined(process.env["VERCEL_GIT_COMMIT_SHA"]) ?? stringOrUndefined(process.env["GITHUB_SHA"]) ?? stringOrUndefined(process.env["RAILWAY_GIT_COMMIT_SHA"]) ?? stringOrUndefined(process.env["CF_PAGES_COMMIT_SHA"]) ?? stringOrUndefined(process.env["RENDER_GIT_COMMIT"]);
 }
 let serviceInstanceId;
 const getServiceInstanceId = () => serviceInstanceId ??= v7();
+/**
+* Best-effort guard for `vcs.ref.head.revision`: only stamp values that look
+* like a git commit SHA — `serviceVersion` may legitimately be a semver
+* release string, which belongs in `service.version` but not in `vcs.*`.
+*/
+const isCommitSha = (value) => value !== void 0 && /^[0-9a-f]{7,40}$/i.test(value);
 const resolveResource = (config) => Effect.gen(function* () {
 	if (yield* sdkDisabled) return {
 		endpoint: void 0,
@@ -329,231 +781,68 @@ const resolveResource = (config) => Effect.gen(function* () {
 	const envResourceAttributes = yield* otelResourceAttributes;
 	const attributes = {};
 	Object.assign(attributes, getAutoPlatformAttributes());
+	Object.assign(attributes, getContainerAttributes());
 	attributes["mxl.sdk.type"] = config.sdkType ?? "server";
 	attributes["service.instance.id"] = getServiceInstanceId();
 	if (environment$1) {
 		attributes["deployment.environment"] = environment$1;
 		attributes["deployment.environment.name"] = environment$1;
-	}
-	if (serviceVersion$1) attributes["service.version"] = serviceVersion$1;
-	const commitRevision = resolveCommitRevision();
-	if (commitRevision) {
-		attributes["deployment.commit_sha"] = commitRevision;
-		attributes["vcs.ref.head.revision"] = commitRevision;
-	}
-	attributes["vcs.repository.url.full"] = stringOrUndefined$1(process.env["MXL_VCS_REPOSITORY_URL"]) ?? DEFAULT_VCS_REPOSITORY_URL;
-	Object.assign(attributes, envResourceAttributes);
-	if (config.attributes) Object.assign(attributes, config.attributes);
-	return {
-		endpoint: endpoint$1,
-		environment: environment$1,
-		headers,
-		resource: {
-			serviceName,
-			serviceVersion: serviceVersion$1,
-			attributes
-		}
-	};
-}).pipe(Effect.orDie);
-//#endregion
-//#region src/server/layer.ts
-var layer_exports = /* @__PURE__ */ __exportAll({ layer: () => layer$1 });
-/**
-* Create an Effect Layer that provides OpenTelemetry traces, logs, and metrics
-* configured for MXL's OTLP collector.
-*
-* Returns a no-op layer when `OTEL_SDK_DISABLED=true`.
-*
-* Wraps the OTLP tracer with `otelGlobalContextBridgeLayer` via `provideMerge`.
-* Measured on effect@4.0.2: `Otlp.layerJson({ tracerContext })` still
-* types the hook as `(primitive, span) => X` and Effect returns that result as
-* the evaluation, so the callback cannot call `~effect/Effect/evaluate` without
-* a `fiber`. `Layer.updateService` also cannot wrap a Tracer the OTLP layer
-* already provides. Keep the merge wrap until Effect passes fiber or evaluates
-* after a side-effect-only context hook.
-*/
-const layer$1 = (config = {}) => Layer.unwrap(Effect.gen(function* () {
-	const resolved = yield* resolveResource({
-		...config,
-		sdkType: "server"
-	});
-	if (!resolved.endpoint) return Layer.empty;
-	const otlp = Otlp.layerJson({
-		baseUrl: normalizeOtlpBaseUrl(resolved.endpoint),
-		headers: resolved.headers,
-		resource: resolved.resource,
-		maxBatchSize: config.maxBatchSize,
-		loggerExportInterval: config.loggerExportInterval,
-		metricsExportInterval: config.metricsExportInterval,
-		tracerExportInterval: config.tracerExportInterval,
-		shutdownTimeout: config.shutdownTimeout
-	}).pipe(Layer.provide(FetchHttpClient.layer));
-	return otelGlobalContextBridgeLayer.pipe(Layer.provideMerge(otlp));
-}));
-const RESERVED_EVENT_NAMES = ["session_start", "session_end"];
-const isReservedEventName = (name) => RESERVED_EVENT_NAMES.some((reserved) => reserved === name);
-const coerceTrackProps = (props) => {
-	if (props === void 0) return {};
-	const attributes = {};
-	for (const [key, value] of Object.entries(props)) {
-		if (value === void 0) continue;
-		attributes[key] = typeof value === "string" ? value : String(value);
-	}
-	return attributes;
-};
-const toEventTimestamp = (value) => (value instanceof Date ? value : new Date(value ?? Date.now())).toISOString();
-const encodeProductEventLine = (input) => {
-	const trimmed = typeof input.name === "string" ? input.name.trim() : "";
-	if (trimmed.length === 0 || isReservedEventName(trimmed)) return;
-	const options = input.options ?? {};
-	return {
-		attributes: coerceTrackProps(options.attributes),
-		group_id: options.groupId ?? "",
-		name: trimmed.slice(0, 80),
-		page_path: options.pagePath ?? "",
-		service_name: input.serviceName,
-		session_id: options.sessionId ?? "",
-		source: input.source,
-		timestamp: toEventTimestamp(options.timestamp),
-		traceparent: options.traceparent,
-		url: options.url ?? "",
-		user_id: options.userId ?? "",
-		visitor_id: options.visitorId ?? ""
-	};
-};
-const encodeNdjson = (lines) => `${lines.map((line) => JSON.stringify(line)).join("\n")}\n`;
-//#endregion
-//#region src/version.ts
-const SDK_NAME = "mxl-effect-sdk";
-const SDK_VERSION = "0.0.15";
-//#endregion
-//#region src/server/events.ts
-var events_exports = /* @__PURE__ */ __exportAll({
-	MxlEvents: () => MxlEvents,
-	ProductEventsPostError: () => ProductEventsPostError,
-	layer: () => layer,
-	make: () => make$1,
-	makeHandle: () => makeHandle
-});
-const DEFAULT_FLUSH_INTERVAL = Duration.seconds(5);
-const DEFAULT_MAX_BATCH_SIZE = 100;
-const MAX_BUFFERED_EVENTS = 1e3;
-const WARN_INTERVAL_MS = 3e4;
-const DEFAULT_BASKET_URL = "http://127.0.0.1:8000";
-var MxlEvents = class extends Context.Service()("@safaricom-mxl/effect-sdk/MxlEvents") {};
-var ProductEventsPostError = class extends Schema.TaggedError()("@safaricom-mxl/effect-sdk/ProductEventsPostError", {
-	cause: Schema.optionalKey(Schema.Defect()),
-	message: Schema.String,
-	status: Schema.optionalKey(Schema.Number)
-}) {};
-SchemaJITCompiler.enable(ProductEventsPostError.ast);
-const stringOrUndefined = (value) => value && value.length > 0 ? value : void 0;
-const resolveEventsConfig = (config) => {
-	const endpoint = (config.endpoint ?? process.env["MXL_BASKET_URL"] ?? DEFAULT_BASKET_URL).replace(/\/$/, "");
-	return {
-		apiKey: stringOrUndefined(config.apiKey ?? process.env["MXL_API_KEY"]),
-		clientId: stringOrUndefined(config.clientId ?? process.env["MXL_CLIENT_ID"]),
-		serviceName: config.serviceName ?? process.env["OTEL_SERVICE_NAME"] ?? "unknown",
-		url: `${endpoint}${config.eventsPath ?? "/events"}`
-	};
-};
-const make$1 = Effect.fn("MxlEvents.make")(function* (config = {}) {
-	const resolved = resolveEventsConfig(config);
-	const maxBatchSize = Math.max(1, config.maxBatchSize ?? DEFAULT_MAX_BATCH_SIZE);
-	const client = (yield* HttpClient.HttpClient).pipe(HttpClient.filterStatusOk);
-	const flushing = yield* Semaphore.make(1);
-	let buffer = [];
-	let warnedAboutName = false;
-	let warnedAboutClient = false;
-	let lastPostWarnAt = 0;
-	const warnPost = (error) => {
-		const now = Date.now();
-		if (now - lastPostWarnAt < WARN_INTERVAL_MS) return;
-		lastPostWarnAt = now;
-		console.warn(`[MxlEvents] ${error.message} (dropping batch)`, error.cause ?? "");
-	};
-	const warnMissingClient = () => {
-		if (warnedAboutClient) return;
-		warnedAboutClient = true;
-		console.warn("[MxlEvents] no client id — set MXL_CLIENT_ID or pass `clientId`; dropping events");
-	};
-	const warnEmptyName = () => {
-		if (warnedAboutName) return;
-		warnedAboutName = true;
-		console.warn("[MxlEvents] track() needs a non-empty event name; the call was ignored.");
-	};
-	const post = (lines) => {
-		const headers = {
-			"mxl-client-id": resolved.clientId ?? "",
-			"mxl-sdk-name": SDK_NAME,
-			"mxl-sdk-version": SDK_VERSION,
-			"user-agent": `${SDK_NAME}-server/${SDK_VERSION}`
-		};
-		if (resolved.apiKey) headers["mxl-api-key"] = resolved.apiKey;
-		return HttpClientRequest.post(resolved.url).pipe(HttpClientRequest.setHeaders(headers), HttpClientRequest.bodyText(encodeNdjson(lines), "application/x-ndjson"), client.execute, Effect.asVoid, Effect.mapError((error) => error.response !== void 0 ? new ProductEventsPostError({
-			message: `POST ${resolved.url} → ${error.response.status}`,
-			status: error.response.status
-		}) : new ProductEventsPostError({
-			cause: error,
-			message: `POST ${resolved.url} failed: ${error.message}`
-		})));
-	};
-	const flush = flushing.withPermits(1)(Effect.suspend(() => {
-		if (buffer.length === 0) return Effect.void;
-		const batch = buffer;
-		buffer = [];
-		if (resolved.clientId === void 0) {
-			warnMissingClient();
-			return Effect.void;
-		}
-		return post(batch).pipe(Effect.catchCause((cause) => Effect.sync(() => {
-			warnPost(Option.getOrElse(Cause.findErrorOption(cause), () => new ProductEventsPostError({
-				cause: Cause.squash(cause),
-				message: `POST ${resolved.url} failed`
-			})));
-		})));
-	}));
-	const track = (name, options = {}) => Effect.sync(() => {
-		const line = encodeProductEventLine({
-			name,
-			options,
-			serviceName: resolved.serviceName,
-			source: "server"
-		});
-		if (line === void 0) {
-			warnEmptyName();
-			return false;
-		}
-		buffer.push(line);
-		if (buffer.length > MAX_BUFFERED_EVENTS) buffer.splice(0, buffer.length - MAX_BUFFERED_EVENTS);
-		return buffer.length >= maxBatchSize;
-	}).pipe(Effect.flatMap((full) => full ? Effect.forkDetach(flush) : Effect.void), Effect.asVoid);
-	const interval = config.flushInterval ?? DEFAULT_FLUSH_INTERVAL;
-	if (Duration.toMillis(interval) > 0) yield* Effect.forkScoped(flush.pipe(Effect.schedule(Schedule.spaced(interval))));
-	yield* Effect.addFinalizer(() => flush);
-	return {
-		flush,
-		track
-	};
-});
-const layer = (config = {}) => Layer.effect(MxlEvents, make$1(config)).pipe(Layer.provide(FetchHttpClient.layer));
-const makeHandle = (config = {}) => {
-	const runtime = ManagedRuntime.make(layer(config));
-	const swallow = (promise) => promise.then(() => void 0, () => void 0);
+	}
+	if (serviceVersion$1) attributes["service.version"] = serviceVersion$1;
+	const commitRevision = resolveCommitRevision();
+	if (commitRevision) attributes["deployment.commit_sha"] = commitRevision;
+	const headRevision = commitRevision ?? (isCommitSha(serviceVersion$1) ? serviceVersion$1 : void 0);
+	if (headRevision) attributes["vcs.ref.head.revision"] = headRevision;
+	attributes["vcs.repository.url.full"] = stringOrUndefined(process.env["MXL_VCS_REPOSITORY_URL"]) ?? DEFAULT_VCS_REPOSITORY_URL;
+	if (config.serviceNamespace) attributes["service.namespace"] = config.serviceNamespace;
+	Object.assign(attributes, envResourceAttributes);
+	if (config.attributes) Object.assign(attributes, config.attributes);
 	return {
-		dispose: () => swallow(runtime.dispose()),
-		flush: () => swallow(runtime.runPromise(Effect.gen(function* () {
-			yield* (yield* MxlEvents).flush;
-		}))),
-		track: (name, options) => {
-			swallow(runtime.runPromise(Effect.gen(function* () {
-				yield* (yield* MxlEvents).track(name, options);
-			})));
+		endpoint: endpoint$1,
+		environment: environment$1,
+		headers,
+		resource: {
+			serviceName,
+			serviceVersion: serviceVersion$1,
+			attributes
 		}
 	};
-};
-//#endregion
-//#region src/server/flushable.ts
+}).pipe(Effect.orDie);
+// src/server/layer.ts
+var layer_exports = /* @__PURE__ */ __exportAll({ layer: () => layer });
+/**
+* Create an Effect Layer that provides OpenTelemetry traces, logs, and metrics
+* configured for MXL's OTLP collector.
+*
+* Returns a no-op layer when `OTEL_SDK_DISABLED=true`.
+*
+* Wraps the OTLP tracer with `otelGlobalContextBridgeLayer` via `provideMerge`.
+* Measured on effect@4.0.6: `Otlp.layerJson({ tracerContext })` still
+* types the hook as `(primitive, span) => X` and Effect returns that result as
+* the evaluation, so the callback cannot call `~effect/Effect/evaluate` without
+* a `fiber`. `Layer.updateService` also cannot wrap a Tracer the OTLP layer
+* already provides. Keep the merge wrap until Effect passes fiber or evaluates
+* after a side-effect-only context hook.
+*/
+const layer = (config = {}) => Layer.unwrap(Effect.gen(function* () {
+	const resolved = yield* resolveResource({
+		...config,
+		sdkType: "server"
+	});
+	if (!resolved.endpoint) return Layer.empty;
+	const otlp = Otlp.layerJson({
+		baseUrl: normalizeOtlpBaseUrl(resolved.endpoint),
+		headers: resolved.headers,
+		resource: resolved.resource,
+		maxBatchSize: config.maxBatchSize,
+		loggerExportInterval: config.loggerExportInterval,
+		metricsExportInterval: config.metricsExportInterval,
+		tracerExportInterval: config.tracerExportInterval,
+		shutdownTimeout: config.shutdownTimeout
+	}).pipe(Layer.provide(FetchHttpClient.layer));
+	return otelGlobalContextBridgeLayer.pipe(Layer.provideMerge(otlp));
+}));
+// src/server/flushable.ts
 var flushable_exports = /* @__PURE__ */ __exportAll({ make: () => make });
 const make = (config = {}) => {
 	const eventsConfig = {
@@ -567,90 +856,18 @@ const make = (config = {}) => {
 	return {
 		dispose: handle.dispose,
 		flush: handle.flush,
-		layer: Layer.mergeAll(layer$1(config), layer(eventsConfig)),
+		layer: Layer.mergeAll(layer(config), layer$1(eventsConfig)),
 		track: handle.track
 	};
 };
-//#endregion
-//#region src/server/http-middleware.ts
+// src/server/http-middleware.ts
 function shouldDisableHttpTrace(request) {
 	return request.method === "OPTIONS" || request.url === "/health" || request.url === "/healthcheck" || request.url.startsWith("/healthz") || request.url === "/metrics" || /\.(png|ico|jpg|jpeg|gif|css|js|svg|webp|woff2?)(\?.*)?$/i.test(request.url);
 }
 function tracerDisabledWhenLayer(filter = shouldDisableHttpTrace) {
 	return Layer.succeed(HttpMiddleware.TracerDisabledWhen, filter);
 }
-//#endregion
-//#region src/server/trace-correlation.ts
-const ZERO_TRACE_ID = "00000000000000000000000000000000";
-const ZERO_SPAN_ID = "0000000000000000";
-/** Parse W3C `traceparent` (`00-{traceId}-{spanId}-{flags}`). */
-function parseTraceparent(traceparent) {
-	if (!traceparent) return {};
-	const parts = traceparent.trim().split("-");
-	if (parts.length < 4) return {};
-	const traceId = parts[1];
-	const spanId = parts[2];
-	if (!traceId || !spanId) return {};
-	if (traceId.length !== 32 || spanId.length !== 16) return {};
-	if (traceId === ZERO_TRACE_ID || spanId === ZERO_SPAN_ID) return {};
-	return {
-		spanId,
-		traceId
-	};
-}
-/**
-* Resolve trace/span IDs for log correlation.
-*
-* Prefers the active OpenTelemetry span (when a host bridge or queue propagation
-* is active), then falls back to a W3C `traceparent` carrier.
-*/
-function getEffectTraceCorrelation(options) {
-	const activeSpan = trace.getSpan(context.active());
-	if (activeSpan) {
-		const spanContext = activeSpan.spanContext();
-		if (spanContext.traceId && spanContext.traceId !== ZERO_TRACE_ID && spanContext.spanId && spanContext.spanId !== ZERO_SPAN_ID) return {
-			spanId: spanContext.spanId,
-			traceId: spanContext.traceId
-		};
-	}
-	return parseTraceparent(options?.traceparent);
-}
-/** Build log annotation fields from active span correlation. */
-function traceCorrelationLogAnnotations(options) {
-	const { traceparent, ...extra } = options ?? {};
-	const correlation = getEffectTraceCorrelation({ traceparent });
-	const annotations = { ...extra };
-	if (correlation.traceId) {
-		annotations["trace.trace_id"] = correlation.traceId;
-		annotations["trace_id"] = correlation.traceId;
-	}
-	if (correlation.spanId) {
-		annotations["trace.span_id"] = correlation.spanId;
-		annotations["span_id"] = correlation.spanId;
-	}
-	return annotations;
-}
-/** Annotate Effect logs with the active span's trace/span IDs. */
-function annotateLogsWithActiveSpanCorrelation(program, fields) {
-	return Effect.gen(function* () {
-		const { traceparent, ...extra } = fields ?? {};
-		const annotations = { ...extra };
-		const currentSpan = yield* Effect.currentSpan.pipe(Effect.option);
-		if (Option$1.isSome(currentSpan)) {
-			annotations["trace.trace_id"] = currentSpan.value.traceId;
-			annotations["trace_id"] = currentSpan.value.traceId;
-			annotations["trace.span_id"] = currentSpan.value.spanId;
-			annotations["span_id"] = currentSpan.value.spanId;
-		} else Object.assign(annotations, traceCorrelationLogAnnotations({
-			...traceparent !== void 0 ? { traceparent } : {},
-			...extra
-		}));
-		if (Object.keys(annotations).length === 0) return yield* program;
-		return yield* program.pipe(Effect.annotateLogs(annotations));
-	});
-}
-//#endregion
-//#region src/server/logging.ts
+// src/server/logging.ts
 const LOG_LEVEL_BY_ENV = {
 	trace: "Debug",
 	debug: "Debug",
@@ -741,9 +958,8 @@ function logAtLevel(level, message, fields) {
 		case "Fatal": return logError(message, fields);
 	}
 }
-//#endregion
-//#region src/server/http-tracing.ts
-function headerValue$1(value) {
+// src/server/http-tracing.ts
+function headerValue(value) {
 	if (value === void 0) return void 0;
 	return typeof value === "string" ? value : value[0];
 }
@@ -758,7 +974,7 @@ function spanContextFromTraceparent(traceparent) {
 	};
 }
 function resolveTraceparentFromHeaders(headers) {
-	return headerValue$1(headers["traceparent"]);
+	return headerValue(headers["traceparent"]);
 }
 function withParentFromTraceparent(headers, program) {
 	const parentSpanContext = spanContextFromTraceparent(resolveTraceparentFromHeaders(headers));
@@ -879,8 +1095,7 @@ function buildQueueTraceCarrierEffect(headers) {
 		return buildQueueTraceCarrier(headers);
 	});
 }
-//#endregion
-//#region src/server/jobs.ts
+// src/server/jobs.ts
 function resolveParentSpanContext(options) {
 	if (options.parentSpanContext !== void 0) return options.parentSpanContext;
 	return spanContextFromCarrier(options.parentTraceCarrier);
@@ -912,149 +1127,6 @@ function jobWithSpanEffect(options, program) {
 function runJobWithSpan(runtime, options, program) {
 	return runtime.runPromise(jobWithSpanEffect(options, program));
 }
-//#endregion
-//#region src/server/evlog-bridge.ts
-function headerValue(headers, name) {
-	if (!headers) return void 0;
-	const direct = headers[name];
-	if (direct !== void 0) return direct;
-	const lower = headers[name.toLowerCase()];
-	if (lower !== void 0) return lower;
-}
-function assignTraceFields(event, traceId, spanId, overwrite) {
-	if (overwrite || event["trace_id"] === void 0) event["trace_id"] = traceId;
-	if (overwrite || event["span_id"] === void 0) event["span_id"] = spanId;
-	if (overwrite || event["traceId"] === void 0) event["traceId"] = traceId;
-	if (overwrite || event["spanId"] === void 0) event["spanId"] = spanId;
-	const trace = typeof event["trace"] === "object" && event["trace"] !== null ? event["trace"] : {};
-	if (overwrite || trace["trace_id"] === void 0) trace["trace_id"] = traceId;
-	if (overwrite || trace["span_id"] === void 0) trace["span_id"] = spanId;
-	if (Object.keys(trace).length > 0) event["trace"] = trace;
-}
-/**
-* Enrich evlog wide events with trace/span IDs from OTel global context or W3C headers.
-*
-* Use `createEffectTraceEnricher` in the MXL evlog enricher chain.
-*/
-function createEffectTraceEnricher(options = {}) {
-	const overwrite = options.overwrite ?? false;
-	return (ctx) => {
-		const traceparent = headerValue(ctx.headers, "traceparent");
-		const correlation = getEffectTraceCorrelation({ traceparent });
-		if (correlation.traceId && correlation.spanId) {
-			assignTraceFields(ctx.event, correlation.traceId, correlation.spanId, overwrite);
-			return;
-		}
-		const parsed = parseTraceparent(traceparent);
-		if (parsed.traceId && parsed.spanId) assignTraceFields(ctx.event, parsed.traceId, parsed.spanId, overwrite);
-	};
-}
-//#endregion
-//#region src/shared/dependency-spans.ts
-const MAX_FLUSH_SPAN_LINKS = 32;
-function dbClientSpanAttributes(dbSystem, operation) {
-	return {
-		"db.system": dbSystem,
-		"db.system.name": dbSystem,
-		"peer.service": dbSystem,
-		...operation ? { "db.operation.name": operation } : {}
-	};
-}
-function queueProducerSpanAttributes(destinationName, peerService = "mxl-worker") {
-	return {
-		"messaging.destination.name": destinationName,
-		"messaging.system": "bullmq",
-		"peer.service": peerService
-	};
-}
-function queueConsumerSpanAttributes(destinationName) {
-	return {
-		"messaging.destination.name": destinationName,
-		"messaging.system": "bullmq"
-	};
-}
-function kafkaProducerSpanAttributes(topic, peerService = "kafka") {
-	return {
-		"messaging.destination.name": topic,
-		"messaging.system": "kafka",
-		"peer.service": peerService
-	};
-}
-function bufferSpanAttributes(bufferName, operation) {
-	return {
-		"buffer.name": bufferName,
-		"db.operation.name": operation,
-		"db.system": "redis",
-		"db.system.name": "redis",
-		"peer.service": "redis"
-	};
-}
-function geoSpanAttributes() {
-	return {
-		"db.operation.name": "resolve",
-		"db.system": "maxmind",
-		"db.system.name": "maxmind",
-		"peer.service": "maxmind"
-	};
-}
-function addSpanLinksFromTraceCarriers(carriers) {
-	const span = trace.getActiveSpan();
-	if (!span) return 0;
-	const seen = /* @__PURE__ */ new Set();
-	let linked = 0;
-	for (const carrier of carriers) {
-		if (!carrier.traceparent || seen.has(carrier.traceparent)) continue;
-		seen.add(carrier.traceparent);
-		const extracted = propagation.extract(context.active(), carrier);
-		const linkedContext = trace.getSpanContext(extracted);
-		if (!linkedContext) continue;
-		span.addLink({ context: linkedContext });
-		linked += 1;
-		if (linked >= MAX_FLUSH_SPAN_LINKS) break;
-	}
-	return linked;
-}
-function withDependencySpan(name, attributesOrOptions, program) {
-	const options = isWithDependencySpanOptions(attributesOrOptions) ? attributesOrOptions : { attributes: attributesOrOptions };
-	const attributes = options.attributes ?? {};
-	const kind = options.kind ?? "client";
-	return program.pipe(Effect.withSpan(name, {
-		attributes,
-		kind
-	}));
-}
-function isWithDependencySpanOptions(value) {
-	return typeof value === "object" && ("kind" in value || "attributes" in value && typeof value.attributes === "object");
-}
-/** Promise-based dependency span for non-Effect code paths. */
-async function withPromiseDependencySpan(name, attributes, operation, kind = "client") {
-	const tracer = trace.getTracer("mxl-effect-sdk");
-	const spanKind = kind === "producer" ? SpanKind.PRODUCER : kind === "consumer" ? SpanKind.CONSUMER : SpanKind.CLIENT;
-	return tracer.startActiveSpan(name, {
-		attributes,
-		kind: spanKind
-	}, async (span) => {
-		try {
-			const result = await operation();
-			span.end();
-			return result;
-		} catch (error) {
-			if (error instanceof Error) {
-				span.recordException(error);
-				span.setStatus({
-					code: SpanStatusCode.ERROR,
-					message: error.message
-				});
-			} else span.setStatus({
-				code: SpanStatusCode.ERROR,
-				message: String(error)
-			});
-			span.end();
-			throw error;
-		}
-	});
-}
-//#endregion
-export { minimumLogLevelLayer as A, flushable_exports as B, withParentFromTraceparent as C, logError as D, logDebug as E, getEffectTraceCorrelation as F, parseOtelResourceAttributes as G, layer_exports as H, parseTraceparent as I, buildTraceCarrierFromSpan as J, parseOtlpHeaders as K, traceCorrelationLogAnnotations as L, resolveLogLevelFromEnv as M, serializeLogError as N, logInfo as O, annotateLogsWithActiveSpanCorrelation as P, shouldDisableHttpTrace as R, withParentFromTraceCarrier as S, logAtLevel as T, derivePlatformAttributes as U, events_exports as V, getAutoPlatformAttributes as W, otelGlobalContextBridgeLayer as X, formatTraceparent as Y, wrapTracerWithOtelContextBridge as Z, logHttpResponse as _, kafkaProducerSpanAttributes as a, spanContextFromTraceparent as b, withDependencySpan as c, jobWithSpanEffect as d, runJobWithSpan as f, logHttpRequestFailure as g, finalizeHttpSpan as h, geoSpanAttributes as i, resolveEffectLogLevelFromHttpStatus as j, logWarning as k, withPromiseDependencySpan as l, buildQueueTraceCarrierEffect as m, bufferSpanAttributes as n, queueConsumerSpanAttributes as o, buildQueueTraceCarrier as p, normalizeOtlpBaseUrl as q, dbClientSpanAttributes as r, queueProducerSpanAttributes as s, addSpanLinksFromTraceCarriers as t, createEffectTraceEnricher as u, resolveTraceparentFromHeaders as v, buildHttpStatusLogFields as w, withHttpServerSpan as x, spanContextFromCarrier as y, tracerDisabledWhenLayer as z };
+export { parseOtlpHeaders as $, normalizeOtlpBaseUrl as A, events_exports as B, serializeLogError as C, layer_exports as D, flushable_exports as E, createEffectTraceEnricher as F, kafkaProducerSpanAttributes as G, bufferSpanAttributes as H, annotateLogsWithActiveSpanCorrelation as I, withDependencySpan as J, queueConsumerSpanAttributes as K, getEffectTraceCorrelation as L, formatTraceparent as M, otelGlobalContextBridgeLayer as N, derivePlatformAttributes as O, wrapTracerWithOtelContextBridge as P, parseOtelResourceAttributes as Q, parseTraceparent as R, resolveLogLevelFromEnv as S, tracerDisabledWhenLayer as T, dbClientSpanAttributes as U, addSpanLinksFromTraceCarriers as V, geoSpanAttributes as W, deriveContainerAttributes as X, withPromiseDependencySpan as Y, getContainerAttributes as Z, logError as _, finalizeHttpSpan as a, minimumLogLevelLayer as b, resolveTraceparentFromHeaders as c, withHttpServerSpan as d, failureIdentifier as et, withParentFromTraceCarrier as f, logDebug as g, logAtLevel as h, buildQueueTraceCarrierEffect as i, buildTraceCarrierFromSpan as j, getAutoPlatformAttributes as k, spanContextFromCarrier as l, buildHttpStatusLogFields as m, runJobWithSpan as n, logHttpRequestFailure as o, withParentFromTraceparent as p, queueProducerSpanAttributes as q, buildQueueTraceCarrier as r, logHttpResponse as s, jobWithSpanEffect as t, resolveSpanFilter as tt, spanContextFromTraceparent as u, logInfo as v, shouldDisableHttpTrace as w, resolveEffectLogLevelFromHttpStatus as x, logWarning as y, traceCorrelationLogAnnotations as z };
 
-//# sourceMappingURL=server-25vCyy-w.mjs.map
+//# sourceMappingURL=server-BMDPjez-.mjs.map