@moostjs/otel 0.6.9 → 0.6.10

package/dist/index.cjs

@@ -1,30 +1,8 @@
-//#region rolldown:runtime
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key$1; i < n; i++) {
-		key$1 = keys[i];
-		if (!__hasOwnProp.call(to, key$1) && key$1 !== except) __defProp(to, key$1, {
-			get: ((k) => from[k]).bind(null, key$1),
-			enumerable: !(desc = __getOwnPropDesc(from, key$1)) || desc.enumerable
-		});
-	}
-	return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
-	value: mod,
-	enumerable: true
-}) : target, mod));
-
-//#endregion
-const __opentelemetry_api = __toESM(require("@opentelemetry/api"));
-const moost = __toESM(require("moost"));
-const __moostjs_event_http = __toESM(require("@moostjs/event-http"));
-const __opentelemetry_sdk_trace_base = __toESM(require("@opentelemetry/sdk-trace-base"));
+Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+let _opentelemetry_api = require("@opentelemetry/api");
+let moost = require("moost");
+let _moostjs_event_http = require("@moostjs/event-http");
+let _opentelemetry_sdk_trace_base = require("@opentelemetry/sdk-trace-base");
 
 //#region packages/otel/src/context.ts
 /** Event context key storing the root OpenTelemetry span. */ const otelSpanKey = (0, moost.key)("otel.span");
@@ -64,7 +42,7 @@ const spanStack = [];
 		return {};
 	};
 	const pushSpan = (span) => {
-		const activeSpan = __opentelemetry_api.trace.getActiveSpan();
+		const activeSpan = _opentelemetry_api.trace.getActiveSpan();
 		if (activeSpan) {
 			const origEnd = activeSpan.end;
 			Object.assign(activeSpan, { end: (t) => {
@@ -75,18 +53,17 @@ const spanStack = [];
 			} });
 			spanStack.push(activeSpan);
 		}
-		__opentelemetry_api.trace.setSpan(__opentelemetry_api.context.active(), span);
+		_opentelemetry_api.trace.setSpan(_opentelemetry_api.context.active(), span);
 	};
 	const popSpan = () => {
 		const span = spanStack.pop();
-		if (span) __opentelemetry_api.trace.setSpan(__opentelemetry_api.context.active(), span);
+		if (span) _opentelemetry_api.trace.setSpan(_opentelemetry_api.context.active(), span);
 	};
 	return {
-		trace: __opentelemetry_api.trace,
+		trace: _opentelemetry_api.trace,
 		withChildSpan: (name, cb, opts) => {
-			const tracer$1 = __opentelemetry_api.trace.getTracer("moost-tracer");
-			const span = tracer$1.startSpan(name, opts);
-			return () => __opentelemetry_api.context.with(__opentelemetry_api.trace.setSpan(__opentelemetry_api.context.active(), span), cb);
+			const span = _opentelemetry_api.trace.getTracer("moost-tracer").startSpan(name, opts);
+			return () => _opentelemetry_api.context.with(_opentelemetry_api.trace.setSpan(_opentelemetry_api.context.active(), span), cb);
 		},
 		getSpan,
 		getSpanContext,
@@ -98,7 +75,7 @@ const spanStack = [];
 	};
 }
 /** Returns the OpenTelemetry `trace` API for creating tracers and spans. */ function useTrace() {
-	return __opentelemetry_api.trace;
+	return _opentelemetry_api.trace;
 }
 /** Returns the root span for the current event, or `undefined` if no span is active. */ function useSpan() {
 	return useOtelContext().getSpan();
@@ -119,13 +96,10 @@ const spanStack = [];
 //#region packages/otel/src/metrics.ts
 let moostMetrics;
 function getMoostMetrics() {
-	if (!moostMetrics) {
-		const meter = __opentelemetry_api.metrics.getMeter("moost-meter");
-		moostMetrics = { moostEventDuration: meter.createHistogram("moost.event.duration", {
-			description: "Moost Event Duration Histogram",
-			unit: "ms"
-		}) };
-	}
+	if (!moostMetrics) moostMetrics = { moostEventDuration: _opentelemetry_api.metrics.getMeter("moost-meter").createHistogram("moost.event.duration", {
+		description: "Moost Event Duration Histogram",
+		unit: "ms"
+	}) };
 	return moostMetrics;
 }
 
@@ -143,20 +117,20 @@ function getMoostMetrics() {
 * @returns {T} The result of the callback function.
 * @throws {Error} Will throw an error if the callback function throws.
 */ function withSpan(span, cb, postProcess) {
-	const _span = typeof span.name === "string" && !span.spanContext ? __opentelemetry_api.trace.getTracer("default").startSpan(span.name, span.options) : span;
+	const _span = typeof span.name === "string" && !span.spanContext ? _opentelemetry_api.trace.getTracer("default").startSpan(span.name, span.options) : span;
 	let result = void 0;
 	const finalizeSpan = (e, r) => {
 		if (e) {
 			_span.recordException(e);
 			_span.setStatus({
-				code: __opentelemetry_api.SpanStatusCode.ERROR,
+				code: _opentelemetry_api.SpanStatusCode.ERROR,
 				message: e.message || "Unknown Error"
 			});
 		}
 		if (postProcess) postProcess(_span, e, r);
 		else _span.end();
 	};
-	__opentelemetry_api.context.with(__opentelemetry_api.trace.setSpan(__opentelemetry_api.context.active(), _span), () => {
+	_opentelemetry_api.context.with(_opentelemetry_api.trace.setSpan(_opentelemetry_api.context.active(), _span), () => {
 		try {
 			result = cb();
 		} catch (error) {
@@ -176,17 +150,17 @@ function getMoostMetrics() {
 
 //#endregion
 //#region packages/otel/src/span-injector.ts
-function _define_property(obj, key$1, value) {
-	if (key$1 in obj) Object.defineProperty(obj, key$1, {
+function _define_property(obj, key, value) {
+	if (key in obj) Object.defineProperty(obj, key, {
 		value,
 		enumerable: true,
 		configurable: true,
 		writable: true
 	});
-	else obj[key$1] = value;
+	else obj[key] = value;
 	return obj;
 }
-const tracer = __opentelemetry_api.trace.getTracer("moost-tracer");
+const tracer = _opentelemetry_api.trace.getTracer("moost-tracer");
 /** Context injector that wraps Moost lifecycle hooks with OpenTelemetry spans and records metrics. */ var SpanInjector = class extends moost.ContextInjector {
 	with(name, attributes, cb) {
 		const fn = typeof attributes === "function" ? attributes : cb;
@@ -195,7 +169,7 @@ const tracer = __opentelemetry_api.trace.getTracer("moost-tracer");
 		else if (name !== "Event:start") {
 			if (this.getIgnoreSpan()) return fn();
 			const span = tracer.startSpan(name, {
-				kind: __opentelemetry_api.SpanKind.INTERNAL,
+				kind: _opentelemetry_api.SpanKind.INTERNAL,
 				attributes: attrs
 			});
 			return this.withSpan(span, fn, {
@@ -224,7 +198,7 @@ const tracer = __opentelemetry_api.trace.getTracer("moost-tracer");
 	startEvent(eventType, cb) {
 		if (eventType === "init") return cb();
 		const { registerSpan } = useOtelContext();
-		let span = __opentelemetry_api.trace.getActiveSpan();
+		let span = _opentelemetry_api.trace.getActiveSpan();
 		if (eventType === "HTTP") this.patchRsponse();
 		else span = tracer.startSpan(`${eventType} Event`);
 		if (span) {
@@ -276,8 +250,7 @@ const tracer = __opentelemetry_api.trace.getTracer("moost-tracer");
 			const chm = this.getControllerHandlerMeta();
 			const span = getSpan();
 			if (span) {
-				const eventType = this.getEventType();
-				if (eventType === "HTTP") {
+				if (this.getEventType() === "HTTP") {
 					const req = this.getRequest();
 					span.updateName(`${req?.method || ""} ${req?.url}`);
 				}
@@ -319,9 +292,8 @@ const tracer = __opentelemetry_api.trace.getTracer("moost-tracer");
 		const route = ctx.has(otelRouteKey) ? ctx.get(otelRouteKey) : void 0;
 		const startTime = ctx.has(otelStartTimeKey) ? ctx.get(otelStartTimeKey) : void 0;
 		const duration = Date.now() - (startTime || Date.now() - 1);
-		const customAttrs = ctx.has(customMetricAttrsKey) ? ctx.get(customMetricAttrsKey) : {};
 		const attrs = {
-			...customAttrs,
+			...ctx.has(customMetricAttrsKey) ? ctx.get(customMetricAttrsKey) : {},
 			route,
 			"moost.event_type": a["moost.event_type"],
 			"moost.is_error": error ? 1 : 0
@@ -335,17 +307,16 @@ const tracer = __opentelemetry_api.trace.getTracer("moost-tracer");
 	}
 	getRequest() {
 		try {
-			return (0, moost.current)().get(__moostjs_event_http.httpKind.keys.req);
+			return (0, moost.current)().get(_moostjs_event_http.httpKind.keys.req);
 		} catch {
-			return void 0;
+			return;
 		}
 	}
 	getResponse() {
 		try {
-			const response = (0, moost.current)().get(__moostjs_event_http.httpKind.keys.response);
-			return response?.getRawRes(true);
+			return (0, moost.current)().get(_moostjs_event_http.httpKind.keys.response)?.getRawRes(true);
 		} catch {
-			return void 0;
+			return;
 		}
 	}
 	constructor(...args) {
@@ -393,7 +364,7 @@ const mate = getOtelMate();
 /**
 * Batch span processor that filters out spans marked with `@OtelIgnoreSpan()`.
 * Drop-in replacement for `BatchSpanProcessor` from `@opentelemetry/sdk-trace-base`.
-*/ var MoostBatchSpanProcessor = class extends __opentelemetry_sdk_trace_base.BatchSpanProcessor {
+*/ var MoostBatchSpanProcessor = class extends _opentelemetry_sdk_trace_base.BatchSpanProcessor {
 	onEnd(span) {
 		if (shouldSpanBeIgnored(span)) return;
 		super.onEnd(span);
@@ -405,7 +376,7 @@ const mate = getOtelMate();
 /**
 * Simple span processor that filters out spans marked with `@OtelIgnoreSpan()`.
 * Drop-in replacement for `SimpleSpanProcessor` from `@opentelemetry/sdk-trace-base`.
-*/ var MoostSimpleSpanProcessor = class extends __opentelemetry_sdk_trace_base.SimpleSpanProcessor {
+*/ var MoostSimpleSpanProcessor = class extends _opentelemetry_sdk_trace_base.SimpleSpanProcessor {
 	onEnd(span) {
 		if (shouldSpanBeIgnored(span)) return;
 		super.onEnd(span);

package/dist/index.mjs

@@ -61,8 +61,7 @@ const spanStack = [];
 	return {
 		trace,
 		withChildSpan: (name, cb, opts) => {
-			const tracer$1 = trace.getTracer("moost-tracer");
-			const span = tracer$1.startSpan(name, opts);
+			const span = trace.getTracer("moost-tracer").startSpan(name, opts);
 			return () => context.with(trace.setSpan(context.active(), span), cb);
 		},
 		getSpan,
@@ -96,13 +95,10 @@ const spanStack = [];
 //#region packages/otel/src/metrics.ts
 let moostMetrics;
 function getMoostMetrics() {
-	if (!moostMetrics) {
-		const meter = metrics.getMeter("moost-meter");
-		moostMetrics = { moostEventDuration: meter.createHistogram("moost.event.duration", {
-			description: "Moost Event Duration Histogram",
-			unit: "ms"
-		}) };
-	}
+	if (!moostMetrics) moostMetrics = { moostEventDuration: metrics.getMeter("moost-meter").createHistogram("moost.event.duration", {
+		description: "Moost Event Duration Histogram",
+		unit: "ms"
+	}) };
 	return moostMetrics;
 }
 
@@ -153,14 +149,14 @@ function getMoostMetrics() {
 
 //#endregion
 //#region packages/otel/src/span-injector.ts
-function _define_property(obj, key$1, value) {
-	if (key$1 in obj) Object.defineProperty(obj, key$1, {
+function _define_property(obj, key, value) {
+	if (key in obj) Object.defineProperty(obj, key, {
 		value,
 		enumerable: true,
 		configurable: true,
 		writable: true
 	});
-	else obj[key$1] = value;
+	else obj[key] = value;
 	return obj;
 }
 const tracer = trace.getTracer("moost-tracer");
@@ -253,8 +249,7 @@ const tracer = trace.getTracer("moost-tracer");
 			const chm = this.getControllerHandlerMeta();
 			const span = getSpan();
 			if (span) {
-				const eventType = this.getEventType();
-				if (eventType === "HTTP") {
+				if (this.getEventType() === "HTTP") {
 					const req = this.getRequest();
 					span.updateName(`${req?.method || ""} ${req?.url}`);
 				}
@@ -296,9 +291,8 @@ const tracer = trace.getTracer("moost-tracer");
 		const route = ctx.has(otelRouteKey) ? ctx.get(otelRouteKey) : void 0;
 		const startTime = ctx.has(otelStartTimeKey) ? ctx.get(otelStartTimeKey) : void 0;
 		const duration = Date.now() - (startTime || Date.now() - 1);
-		const customAttrs = ctx.has(customMetricAttrsKey) ? ctx.get(customMetricAttrsKey) : {};
 		const attrs = {
-			...customAttrs,
+			...ctx.has(customMetricAttrsKey) ? ctx.get(customMetricAttrsKey) : {},
 			route,
 			"moost.event_type": a["moost.event_type"],
 			"moost.is_error": error ? 1 : 0
@@ -314,15 +308,14 @@ const tracer = trace.getTracer("moost-tracer");
 		try {
 			return current().get(httpKind.keys.req);
 		} catch {
-			return void 0;
+			return;
 		}
 	}
 	getResponse() {
 		try {
-			const response = current().get(httpKind.keys.response);
-			return response?.getRawRes(true);
+			return current().get(httpKind.keys.response)?.getRawRes(true);
 		} catch {
-			return void 0;
+			return;
 		}
 	}
 	constructor(...args) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moostjs/otel",
-  "version": "0.6.9",
+  "version": "0.6.10",
   "description": "@moostjs/otel",
   "keywords": [
     "composables",
@@ -45,9 +45,9 @@
     "vitest": "3.2.4"
   },
   "peerDependencies": {
-    "@wooksjs/event-core": "^0.7.11",
-    "@moostjs/event-http": "^0.6.9",
-    "moost": "^0.6.9"
+    "@wooksjs/event-core": "^0.7.12",
+    "@moostjs/event-http": "^0.6.10",
+    "moost": "^0.6.10"
   },
   "scripts": {
     "pub": "pnpm publish --access public",