@moostjs/otel 0.6.50 → 0.6.51

package/dist/index.cjs

@@ -1,7 +1,9 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 let _opentelemetry_api = require("@opentelemetry/api");
 let moost = require("moost");
+let _opentelemetry_core = require("@opentelemetry/core");
 let _moostjs_event_http = require("@moostjs/event-http");
+let net = require("net");
 let _opentelemetry_sdk_trace_base = require("@opentelemetry/sdk-trace-base");
 
 //#region packages/otel/src/context.ts
@@ -185,12 +187,39 @@ 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();
+const otelHostSpanKey = (0, moost.globalKey)("otel.hostSpan");
 /**
-* 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 server span of the http instrumentation (`@opentelemetry/instrumentation-http`) for this
+* network request, when no Moost event owns it yet.
+*
+* The instrumentation publishes it as the request's RPC metadata, so it is found even when a host
+* app's middleware span (Express instrumentation) is active, not the server span itself. Without
+* RPC metadata only an active SERVER span qualifies — anything else active (a lifecycle span of a
+* running event, a client span) is a parent, not the request's own span. An in-process request
+* (`fetch()` / `request()` on the HTTP app) runs on a fake socket and never attaches: it is not
+* the network request the server span stands for.
+*/ function getHostServerSpan(req) {
+	if (!(req?.socket instanceof net.Socket)) return;
+	const rpc = (0, _opentelemetry_core.getRPCMetadata)(_opentelemetry_api.context.active());
+	if (rpc?.type === _opentelemetry_core.RPCType.HTTP && rpc.span) return claimedSpans.has(rpc.span) ? void 0 : {
+		span: rpc.span,
+		rpc,
+		mount: getMountRoute(req, rpc)
+	};
+	const active = _opentelemetry_api.trace.getActiveSpan();
+	return active?.kind === _opentelemetry_api.SpanKind.SERVER && !claimedSpans.has(active) ? {
+		span: active,
+		mount: ""
+	} : void 0;
+}
+/**
+* The route template a host app mounted Moost under, when it stripped that path from `req.url`
+* (`app.use('/api', moostMiddleware)`): the route the host's own instrumentation reported
+* for the request so far. Empty when Moost sees the whole path.
+*/ function getMountRoute(req, rpc) {
+	const path = (url) => url?.split("?")[0];
+	if (!req.originalUrl || path(req.originalUrl) === path(req.url) || !rpc.route) return "";
+	return rpc.route.replace(/\/+$/, "");
 }
 /**
 * The controller context of the current event, or `undefined` while no handler is resolved yet
@@ -239,16 +268,23 @@ function readHandlerOtelMeta(controller, method) {
 		if (eventType === "init") return cb();
 		const { registerSpan } = useOtelContext();
 		const isHttp = eventType === _moostjs_event_http.httpKind.name;
+		const req = isHttp ? this.getRequest() : void 0;
 		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);
+		const host = getHostServerSpan(req);
+		const active = _opentelemetry_api.trace.getActiveSpan();
+		const span = host?.span ?? tracer.startSpan(isHttp ? req?.method || "HTTP" : `${eventType} Event`, isHttp && !active ? { kind: _opentelemetry_api.SpanKind.SERVER } : void 0);
 		claimedSpans.add(span);
 		registerSpan(span);
-		return this.withSpan(span, cb, {
+		if (host) (0, moost.current)().set(otelHostSpanKey, host);
+		const opts = {
 			withMetrics: true,
-			endSpan: !attached
-		});
+			endSpan: !host
+		};
+		if (host && active && active !== host.span) {
+			const outer = _opentelemetry_api.context.active();
+			return this.withSpan(span, () => _opentelemetry_api.context.with(outer, cb), opts);
+		}
+		return this.withSpan(span, cb, opts);
 	}
 	getEventType() {
 		const ctx = (0, moost.current)();
@@ -300,8 +336,15 @@ function readHandlerOtelMeta(controller, method) {
 			const span = getSpan();
 			if (span) {
 				span.setAttributes(chm.attrs);
-				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>"}`);
+				if (chm.attrs["moost.event_type"] === _moostjs_event_http.httpKind.name) {
+					const host = ctx.has(otelHostSpanKey) ? ctx.get(otelHostSpanKey) : void 0;
+					const httpRoute = _route ? `${host?.mount || ""}${_route}` : void 0;
+					span.updateName(`${this.getRequest()?.method || ""} ${httpRoute || "<unresolved>"}`);
+					if (httpRoute) {
+						span.setAttribute("http.route", httpRoute);
+						if (host?.rpc) host.rpc.route = httpRoute;
+					}
+				} else span.updateName(`${chm.attrs["moost.event_type"]} ${_route || "<unresolved>"}`);
 			}
 		}
 		if (name !== "Controller:registered") ctx.set(otelRouteKey, route);
@@ -328,6 +371,7 @@ function readHandlerOtelMeta(controller, method) {
 		const ctx = (0, moost.current)();
 		const route = ctx.has(otelRouteKey) ? ctx.get(otelRouteKey) : void 0;
 		const startTime = ctx.has(otelStartTimeKey) ? ctx.get(otelStartTimeKey) : void 0;
+		if (startTime === void 0 && route === void 0 && a["moost.event_type"] === _moostjs_event_http.httpKind.name) return;
 		const duration = Date.now() - (startTime || Date.now() - 1);
 		const attrs = {
 			...ctx.has(customMetricAttrsKey) ? ctx.get(customMetricAttrsKey) : {},

package/dist/index.d.ts

@@ -4,8 +4,7 @@ import * as moost from 'moost';
 import { Mate, TMoostMetadata, TMateParamMeta, ContextInjector, TContextInjectorHook } from 'moost';
 import { EventContext } from '@wooksjs/event-core';
 import { BatchSpanProcessor, ReadableSpan, SimpleSpanProcessor } from '@opentelemetry/sdk-trace-base';
-import * as http from 'http';
-import { ServerResponse } from 'http';
+import { IncomingMessage, ServerResponse } from 'http';
 
 /** Event context key storing the root OpenTelemetry span. */
 declare const otelSpanKey: moost.Key<Span | undefined>;
@@ -146,8 +145,8 @@ declare class SpanInjector extends ContextInjector<TContextInjectorHook> {
     }): T;
     startEventMetrics(a: Record<string, string | number | boolean | undefined>, route?: string): void;
     endEventMetrics(a: Record<string, string | number | boolean | undefined>, error?: Error): void;
-    getRequest(): http.IncomingMessage | undefined;
-    getResponse(): (ServerResponse<http.IncomingMessage> & {
+    getRequest(): IncomingMessage | undefined;
+    getResponse(): (ServerResponse<IncomingMessage> & {
         _statusCode?: number;
     }) | undefined;
 }

package/dist/index.mjs

@@ -1,6 +1,8 @@
 import { SpanKind, SpanStatusCode, context, metrics, trace } from "@opentelemetry/api";
 import { ContextInjector, current, eventTypeKey, getConstructor, getMoostMate, globalKey, replaceContextInjector, useControllerContext } from "moost";
+import { RPCType, getRPCMetadata } from "@opentelemetry/core";
 import { httpKind } from "@moostjs/event-http";
+import { Socket } from "net";
 import { BatchSpanProcessor, SimpleSpanProcessor } from "@opentelemetry/sdk-trace-base";
 
 //#region packages/otel/src/context.ts
@@ -184,12 +186,39 @@ 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();
+const otelHostSpanKey = globalKey("otel.hostSpan");
 /**
-* 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 server span of the http instrumentation (`@opentelemetry/instrumentation-http`) for this
+* network request, when no Moost event owns it yet.
+*
+* The instrumentation publishes it as the request's RPC metadata, so it is found even when a host
+* app's middleware span (Express instrumentation) is active, not the server span itself. Without
+* RPC metadata only an active SERVER span qualifies — anything else active (a lifecycle span of a
+* running event, a client span) is a parent, not the request's own span. An in-process request
+* (`fetch()` / `request()` on the HTTP app) runs on a fake socket and never attaches: it is not
+* the network request the server span stands for.
+*/ function getHostServerSpan(req) {
+	if (!(req?.socket instanceof Socket)) return;
+	const rpc = getRPCMetadata(context.active());
+	if (rpc?.type === RPCType.HTTP && rpc.span) return claimedSpans.has(rpc.span) ? void 0 : {
+		span: rpc.span,
+		rpc,
+		mount: getMountRoute(req, rpc)
+	};
+	const active = trace.getActiveSpan();
+	return active?.kind === SpanKind.SERVER && !claimedSpans.has(active) ? {
+		span: active,
+		mount: ""
+	} : void 0;
+}
+/**
+* The route template a host app mounted Moost under, when it stripped that path from `req.url`
+* (`app.use('/api', moostMiddleware)`): the route the host's own instrumentation reported
+* for the request so far. Empty when Moost sees the whole path.
+*/ function getMountRoute(req, rpc) {
+	const path = (url) => url?.split("?")[0];
+	if (!req.originalUrl || path(req.originalUrl) === path(req.url) || !rpc.route) return "";
+	return rpc.route.replace(/\/+$/, "");
 }
 /**
 * The controller context of the current event, or `undefined` while no handler is resolved yet
@@ -238,16 +267,23 @@ function readHandlerOtelMeta(controller, method) {
 		if (eventType === "init") return cb();
 		const { registerSpan } = useOtelContext();
 		const isHttp = eventType === httpKind.name;
+		const req = isHttp ? this.getRequest() : void 0;
 		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);
+		const host = getHostServerSpan(req);
+		const active = trace.getActiveSpan();
+		const span = host?.span ?? tracer.startSpan(isHttp ? req?.method || "HTTP" : `${eventType} Event`, isHttp && !active ? { kind: SpanKind.SERVER } : void 0);
 		claimedSpans.add(span);
 		registerSpan(span);
-		return this.withSpan(span, cb, {
+		if (host) current().set(otelHostSpanKey, host);
+		const opts = {
 			withMetrics: true,
-			endSpan: !attached
-		});
+			endSpan: !host
+		};
+		if (host && active && active !== host.span) {
+			const outer = context.active();
+			return this.withSpan(span, () => context.with(outer, cb), opts);
+		}
+		return this.withSpan(span, cb, opts);
 	}
 	getEventType() {
 		const ctx = current();
@@ -299,8 +335,15 @@ function readHandlerOtelMeta(controller, method) {
 			const span = getSpan();
 			if (span) {
 				span.setAttributes(chm.attrs);
-				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>"}`);
+				if (chm.attrs["moost.event_type"] === httpKind.name) {
+					const host = ctx.has(otelHostSpanKey) ? ctx.get(otelHostSpanKey) : void 0;
+					const httpRoute = _route ? `${host?.mount || ""}${_route}` : void 0;
+					span.updateName(`${this.getRequest()?.method || ""} ${httpRoute || "<unresolved>"}`);
+					if (httpRoute) {
+						span.setAttribute("http.route", httpRoute);
+						if (host?.rpc) host.rpc.route = httpRoute;
+					}
+				} else span.updateName(`${chm.attrs["moost.event_type"]} ${_route || "<unresolved>"}`);
 			}
 		}
 		if (name !== "Controller:registered") ctx.set(otelRouteKey, route);
@@ -327,6 +370,7 @@ function readHandlerOtelMeta(controller, method) {
 		const ctx = current();
 		const route = ctx.has(otelRouteKey) ? ctx.get(otelRouteKey) : void 0;
 		const startTime = ctx.has(otelStartTimeKey) ? ctx.get(otelStartTimeKey) : void 0;
+		if (startTime === void 0 && route === void 0 && a["moost.event_type"] === httpKind.name) return;
 		const duration = Date.now() - (startTime || Date.now() - 1);
 		const attrs = {
 			...ctx.has(customMetricAttrsKey) ? ctx.get(customMetricAttrsKey) : {},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moostjs/otel",
-  "version": "0.6.50",
+  "version": "0.6.51",
   "description": "@moostjs/otel",
   "keywords": [
     "composables",
@@ -39,15 +39,16 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.9.1",
+    "@opentelemetry/core": "^2.10.0",
     "@opentelemetry/sdk-trace-base": "^2.10.0"
   },
   "devDependencies": {
     "vitest": "3.2.7"
   },
   "peerDependencies": {
-    "@wooksjs/event-core": "^0.7.28",
-    "@moostjs/event-http": "^0.6.50",
-    "moost": "^0.6.50"
+    "@wooksjs/event-core": "^0.7.29",
+    "@moostjs/event-http": "^0.6.51",
+    "moost": "^0.6.51"
   },
   "scripts": {
     "pub": "pnpm publish --access public",