@moostjs/otel 0.6.49 → 0.6.50

package/dist/index.cjs

@@ -184,6 +184,29 @@ function readHandlerOtelMeta(controller, method) {
 	}
 	return meta;
 }
+/** Root spans already owned by a Moost event — never attached to (renamed, re-attributed) twice. */ const claimedSpans = /* @__PURE__ */ new WeakSet();
+/**
+* Whether the active span is the server span of the http instrumentation, not yet owned by a
+* Moost event. Anything else active (a lifecycle span of a running event, a client span) is a
+* parent, not the request's own span.
+*/ function isInstrumentationServerSpan(span) {
+	return !!span && !claimedSpans.has(span) && span.kind === _opentelemetry_api.SpanKind.SERVER;
+}
+/**
+* The controller context of the current event, or `undefined` while no handler is resolved yet
+* (an unmatched route reports `Handler:not_found` before any controller context exists).
+*/ function readControllerContext() {
+	const cc = (0, moost.useControllerContext)();
+	try {
+		return {
+			controller: cc.getController(),
+			method: cc.getMethod(),
+			route: cc.getRoute()
+		};
+	} catch {
+		return;
+	}
+}
 /** 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;
@@ -206,45 +229,39 @@ function readHandlerOtelMeta(controller, method) {
 		const res = this.getResponse();
 		if (res) {
 			const originalWriteHead = res.writeHead;
-			Object.assign(res, { writeHead: (arg0, arg1, arg2) => {
-				res._statusCode = arg0;
-				const headers = typeof arg2 === "object" ? arg2 : typeof arg1 === "object" ? arg1 : void 0;
-				res._contentLength = headers?.["content-length"] ? Number(headers["content-length"]) : 0;
-				return originalWriteHead.apply(res, [
-					arg0,
-					arg1,
-					arg2
-				]);
-			} });
+			res.writeHead = (...args) => {
+				res._statusCode = args[0];
+				return originalWriteHead.apply(res, args);
+			};
 		}
 	}
 	startEvent(eventType, cb) {
 		if (eventType === "init") return cb();
 		const { registerSpan } = useOtelContext();
-		let span = _opentelemetry_api.trace.getActiveSpan();
-		if (eventType === _moostjs_event_http.httpKind.kind) this.patchRsponse();
-		else span = tracer.startSpan(`${eventType} Event`);
-		if (span) {
-			registerSpan(span);
-			return this.withSpan(span, cb, {
-				withMetrics: true,
-				endSpan: eventType !== _moostjs_event_http.httpKind.kind
-			});
-		}
-		return cb();
+		const isHttp = eventType === _moostjs_event_http.httpKind.name;
+		if (isHttp) this.patchRsponse();
+		const active = isHttp ? _opentelemetry_api.trace.getActiveSpan() : void 0;
+		const attached = isInstrumentationServerSpan(active) ? active : void 0;
+		const span = attached ?? tracer.startSpan(`${eventType} Event`, isHttp && !active ? { kind: _opentelemetry_api.SpanKind.SERVER } : void 0);
+		claimedSpans.add(span);
+		registerSpan(span);
+		return this.withSpan(span, cb, {
+			withMetrics: true,
+			endSpan: !attached
+		});
 	}
 	getEventType() {
 		const ctx = (0, moost.current)();
 		return ctx.has(moost.eventTypeKey) ? ctx.get(moost.eventTypeKey) : void 0;
 	}
 	getIgnoreSpan() {
-		const { getController, getMethod } = (0, moost.useControllerContext)();
-		return readHandlerOtelMeta(getController(), getMethod()).ignoreSpan;
+		const cc = readControllerContext();
+		return readHandlerOtelMeta(cc?.controller, cc?.method).ignoreSpan;
 	}
 	getControllerHandlerMeta() {
-		const { getMethod, getController, getRoute } = (0, moost.useControllerContext)();
-		const methodName = getMethod();
-		const meta = readHandlerOtelMeta(getController(), methodName);
+		const cc = readControllerContext();
+		const methodName = cc?.method;
+		const meta = readHandlerOtelMeta(cc?.controller, methodName);
 		return {
 			ignoreMeter: meta.ignoreMeter,
 			ignoreSpan: meta.ignoreSpan,
@@ -255,7 +272,7 @@ function readHandlerOtelMeta(controller, method) {
 				"moost.handler_label": meta.label,
 				"moost.handler_id": meta.id,
 				"moost.ignore": meta.ignoreSpan,
-				"moost.route": getRoute(),
+				"moost.route": cc?.route,
 				"moost.event_type": this.getEventType()
 			}
 		};
@@ -273,10 +290,7 @@ function readHandlerOtelMeta(controller, method) {
 			const chm = this.getControllerHandlerMeta();
 			const span = getSpan();
 			if (span) {
-				if (this.getEventType() === _moostjs_event_http.httpKind.kind) {
-					const req = this.getRequest();
-					span.updateName(`${req?.method || ""} ${req?.url}`);
-				}
+				if (this.getEventType() === _moostjs_event_http.httpKind.name) span.updateName(this.getRequest()?.method || "HTTP");
 			}
 			this.startEventMetrics(chm.attrs, route);
 		} else if (name === "Controller:registered") {
@@ -286,7 +300,7 @@ function readHandlerOtelMeta(controller, method) {
 			const span = getSpan();
 			if (span) {
 				span.setAttributes(chm.attrs);
-				if (chm.attrs["moost.event_type"] === _moostjs_event_http.httpKind.kind) span.updateName(`${this.getRequest()?.method || ""} ${_route || "<unresolved>"}`);
+				if (chm.attrs["moost.event_type"] === _moostjs_event_http.httpKind.name) span.updateName(`${this.getRequest()?.method || ""} ${_route || "<unresolved>"}`);
 				else span.updateName(`${chm.attrs["moost.event_type"]} ${_route || "<unresolved>"}`);
 			}
 		}
@@ -321,8 +335,7 @@ function readHandlerOtelMeta(controller, method) {
 			"moost.event_type": a["moost.event_type"],
 			"moost.is_error": error ? 1 : 0
 		};
-		if (a["moost.event_type"] === _moostjs_event_http.httpKind.kind) {
-			if (!attrs.route) attrs.route = this.getRequest()?.url || "";
+		if (a["moost.event_type"] === _moostjs_event_http.httpKind.name) {
 			attrs["http.status_code"] = this.getResponse()?._statusCode || 0;
 			attrs["moost.is_error"] = attrs["moost.is_error"] || attrs["http.status_code"] > 399 ? 1 : 0;
 		}

package/dist/index.d.ts

@@ -135,7 +135,7 @@ declare class SpanInjector extends ContextInjector<TContextInjectorHook> {
             'moost.handler_label': string | undefined;
             'moost.handler_id': string | undefined;
             'moost.ignore': boolean | undefined;
-            'moost.route': string;
+            'moost.route': string | undefined;
             'moost.event_type': string | undefined;
         };
     };
@@ -149,7 +149,6 @@ declare class SpanInjector extends ContextInjector<TContextInjectorHook> {
     getRequest(): http.IncomingMessage | undefined;
     getResponse(): (ServerResponse<http.IncomingMessage> & {
         _statusCode?: number;
-        _contentLength?: number;
     }) | undefined;
 }
 

package/dist/index.mjs

@@ -183,6 +183,29 @@ function readHandlerOtelMeta(controller, method) {
 	}
 	return meta;
 }
+/** Root spans already owned by a Moost event — never attached to (renamed, re-attributed) twice. */ const claimedSpans = /* @__PURE__ */ new WeakSet();
+/**
+* Whether the active span is the server span of the http instrumentation, not yet owned by a
+* Moost event. Anything else active (a lifecycle span of a running event, a client span) is a
+* parent, not the request's own span.
+*/ function isInstrumentationServerSpan(span) {
+	return !!span && !claimedSpans.has(span) && span.kind === SpanKind.SERVER;
+}
+/**
+* The controller context of the current event, or `undefined` while no handler is resolved yet
+* (an unmatched route reports `Handler:not_found` before any controller context exists).
+*/ function readControllerContext() {
+	const cc = useControllerContext();
+	try {
+		return {
+			controller: cc.getController(),
+			method: cc.getMethod(),
+			route: cc.getRoute()
+		};
+	} catch {
+		return;
+	}
+}
 /** Context injector that wraps Moost lifecycle hooks with OpenTelemetry spans and records metrics. */ var SpanInjector = class extends ContextInjector {
 	with(name, attributes, cb) {
 		const fn = typeof attributes === "function" ? attributes : cb;
@@ -205,45 +228,39 @@ function readHandlerOtelMeta(controller, method) {
 		const res = this.getResponse();
 		if (res) {
 			const originalWriteHead = res.writeHead;
-			Object.assign(res, { writeHead: (arg0, arg1, arg2) => {
-				res._statusCode = arg0;
-				const headers = typeof arg2 === "object" ? arg2 : typeof arg1 === "object" ? arg1 : void 0;
-				res._contentLength = headers?.["content-length"] ? Number(headers["content-length"]) : 0;
-				return originalWriteHead.apply(res, [
-					arg0,
-					arg1,
-					arg2
-				]);
-			} });
+			res.writeHead = (...args) => {
+				res._statusCode = args[0];
+				return originalWriteHead.apply(res, args);
+			};
 		}
 	}
 	startEvent(eventType, cb) {
 		if (eventType === "init") return cb();
 		const { registerSpan } = useOtelContext();
-		let span = trace.getActiveSpan();
-		if (eventType === httpKind.kind) this.patchRsponse();
-		else span = tracer.startSpan(`${eventType} Event`);
-		if (span) {
-			registerSpan(span);
-			return this.withSpan(span, cb, {
-				withMetrics: true,
-				endSpan: eventType !== httpKind.kind
-			});
-		}
-		return cb();
+		const isHttp = eventType === httpKind.name;
+		if (isHttp) this.patchRsponse();
+		const active = isHttp ? trace.getActiveSpan() : void 0;
+		const attached = isInstrumentationServerSpan(active) ? active : void 0;
+		const span = attached ?? tracer.startSpan(`${eventType} Event`, isHttp && !active ? { kind: SpanKind.SERVER } : void 0);
+		claimedSpans.add(span);
+		registerSpan(span);
+		return this.withSpan(span, cb, {
+			withMetrics: true,
+			endSpan: !attached
+		});
 	}
 	getEventType() {
 		const ctx = current();
 		return ctx.has(eventTypeKey) ? ctx.get(eventTypeKey) : void 0;
 	}
 	getIgnoreSpan() {
-		const { getController, getMethod } = useControllerContext();
-		return readHandlerOtelMeta(getController(), getMethod()).ignoreSpan;
+		const cc = readControllerContext();
+		return readHandlerOtelMeta(cc?.controller, cc?.method).ignoreSpan;
 	}
 	getControllerHandlerMeta() {
-		const { getMethod, getController, getRoute } = useControllerContext();
-		const methodName = getMethod();
-		const meta = readHandlerOtelMeta(getController(), methodName);
+		const cc = readControllerContext();
+		const methodName = cc?.method;
+		const meta = readHandlerOtelMeta(cc?.controller, methodName);
 		return {
 			ignoreMeter: meta.ignoreMeter,
 			ignoreSpan: meta.ignoreSpan,
@@ -254,7 +271,7 @@ function readHandlerOtelMeta(controller, method) {
 				"moost.handler_label": meta.label,
 				"moost.handler_id": meta.id,
 				"moost.ignore": meta.ignoreSpan,
-				"moost.route": getRoute(),
+				"moost.route": cc?.route,
 				"moost.event_type": this.getEventType()
 			}
 		};
@@ -272,10 +289,7 @@ function readHandlerOtelMeta(controller, method) {
 			const chm = this.getControllerHandlerMeta();
 			const span = getSpan();
 			if (span) {
-				if (this.getEventType() === httpKind.kind) {
-					const req = this.getRequest();
-					span.updateName(`${req?.method || ""} ${req?.url}`);
-				}
+				if (this.getEventType() === httpKind.name) span.updateName(this.getRequest()?.method || "HTTP");
 			}
 			this.startEventMetrics(chm.attrs, route);
 		} else if (name === "Controller:registered") {
@@ -285,7 +299,7 @@ function readHandlerOtelMeta(controller, method) {
 			const span = getSpan();
 			if (span) {
 				span.setAttributes(chm.attrs);
-				if (chm.attrs["moost.event_type"] === httpKind.kind) span.updateName(`${this.getRequest()?.method || ""} ${_route || "<unresolved>"}`);
+				if (chm.attrs["moost.event_type"] === httpKind.name) span.updateName(`${this.getRequest()?.method || ""} ${_route || "<unresolved>"}`);
 				else span.updateName(`${chm.attrs["moost.event_type"]} ${_route || "<unresolved>"}`);
 			}
 		}
@@ -320,8 +334,7 @@ function readHandlerOtelMeta(controller, method) {
 			"moost.event_type": a["moost.event_type"],
 			"moost.is_error": error ? 1 : 0
 		};
-		if (a["moost.event_type"] === httpKind.kind) {
-			if (!attrs.route) attrs.route = this.getRequest()?.url || "";
+		if (a["moost.event_type"] === httpKind.name) {
 			attrs["http.status_code"] = this.getResponse()?._statusCode || 0;
 			attrs["moost.is_error"] = attrs["moost.is_error"] || attrs["http.status_code"] > 399 ? 1 : 0;
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moostjs/otel",
-  "version": "0.6.49",
+  "version": "0.6.50",
   "description": "@moostjs/otel",
   "keywords": [
     "composables",
@@ -46,8 +46,8 @@
   },
   "peerDependencies": {
     "@wooksjs/event-core": "^0.7.28",
-    "@moostjs/event-http": "^0.6.49",
-    "moost": "^0.6.49"
+    "@moostjs/event-http": "^0.6.50",
+    "moost": "^0.6.50"
   },
   "scripts": {
     "pub": "pnpm publish --access public",