@moostjs/otel 0.4.10 → 0.4.11

package/dist/index.cjs

@@ -91,9 +91,11 @@ const moostMetrics = {
     }),
     httpRequestSize: meter.createHistogram('http.server.request.size', {
         description: 'The size of HTTP request bodies',
+        unit: 'byte',
     }),
     httpResponseSize: meter.createHistogram('http.server.response.size', {
         description: 'The size of HTTP response bodies',
+        unit: 'byte',
     }),
     httpErrorCount: meter.createCounter('http.server.errors', {
         description: 'The number of HTTP requests that resulted in an error',
@@ -199,22 +201,30 @@ class SpanInjector extends moost.ContextInjector {
         };
     }
     hook(name, route) {
-        moost.useAsyncEventContext().store('otel').set('route', route);
-        const chm = this.getControllerHandlerMeta();
-        if (!chm.ignoreMeter) {
+        if (name === 'Handler:not_found') {
+            const chm = this.getControllerHandlerMeta();
             this.startEventMetrics(chm.attrs, route);
         }
-        const { getSpan } = useOtelContext();
-        const span = getSpan();
-        if (span) {
-            span.setAttributes(chm.attrs);
-            if (chm.attrs['moost.event_type'] === 'HTTP') {
-                span.updateName(`${this.getRequest()?.method || ''} ${route || '<unresolved>'}`);
+        else if (name === 'Controller:registered') {
+            const chm = this.getControllerHandlerMeta();
+            if (!chm.ignoreMeter) {
+                this.startEventMetrics(chm.attrs, route);
             }
-            else {
-                span.updateName(`${chm.attrs['moost.event_type']} ${route || '<unresolved>'}`);
+            const { getSpan } = useOtelContext();
+            const span = getSpan();
+            if (span) {
+                span.setAttributes(chm.attrs);
+                if (chm.attrs['moost.event_type'] === 'HTTP') {
+                    span.updateName(`${this.getRequest()?.method || ''} ${route || '<unresolved>'}`);
+                }
+                else {
+                    span.updateName(`${chm.attrs['moost.event_type']} ${route || '<unresolved>'}`);
+                }
             }
         }
+        if (name !== 'Controller:registered') {
+            moost.useAsyncEventContext().store('otel').set('route', route);
+        }
     }
     withSpan(span, cb, opts) {
         let result;

package/dist/index.d.ts

@@ -215,7 +215,7 @@ declare class SpanInjector extends ContextInjector<TContextInjectorHook> {
             'moost.event_type': string;
         };
     };
-    hook(name: 'Handler:not_found' | 'Handler:routed' | 'C', route?: string): void;
+    hook(name: 'Handler:not_found' | 'Handler:routed' | 'Controller:registered', route?: string): void;
     withSpan<T>(span: Span, cb: () => T, opts: {
         rootSpan: boolean;
         endSpan: boolean;

package/dist/index.mjs

@@ -89,9 +89,11 @@ const moostMetrics = {
     }),
     httpRequestSize: meter.createHistogram('http.server.request.size', {
         description: 'The size of HTTP request bodies',
+        unit: 'byte',
     }),
     httpResponseSize: meter.createHistogram('http.server.response.size', {
         description: 'The size of HTTP response bodies',
+        unit: 'byte',
     }),
     httpErrorCount: meter.createCounter('http.server.errors', {
         description: 'The number of HTTP requests that resulted in an error',
@@ -197,22 +199,30 @@ class SpanInjector extends ContextInjector {
         };
     }
     hook(name, route) {
-        useAsyncEventContext$1().store('otel').set('route', route);
-        const chm = this.getControllerHandlerMeta();
-        if (!chm.ignoreMeter) {
+        if (name === 'Handler:not_found') {
+            const chm = this.getControllerHandlerMeta();
             this.startEventMetrics(chm.attrs, route);
         }
-        const { getSpan } = useOtelContext();
-        const span = getSpan();
-        if (span) {
-            span.setAttributes(chm.attrs);
-            if (chm.attrs['moost.event_type'] === 'HTTP') {
-                span.updateName(`${this.getRequest()?.method || ''} ${route || '<unresolved>'}`);
+        else if (name === 'Controller:registered') {
+            const chm = this.getControllerHandlerMeta();
+            if (!chm.ignoreMeter) {
+                this.startEventMetrics(chm.attrs, route);
             }
-            else {
-                span.updateName(`${chm.attrs['moost.event_type']} ${route || '<unresolved>'}`);
+            const { getSpan } = useOtelContext();
+            const span = getSpan();
+            if (span) {
+                span.setAttributes(chm.attrs);
+                if (chm.attrs['moost.event_type'] === 'HTTP') {
+                    span.updateName(`${this.getRequest()?.method || ''} ${route || '<unresolved>'}`);
+                }
+                else {
+                    span.updateName(`${chm.attrs['moost.event_type']} ${route || '<unresolved>'}`);
+                }
             }
         }
+        if (name !== 'Controller:registered') {
+            useAsyncEventContext$1().store('otel').set('route', route);
+        }
     }
     withSpan(span, cb, opts) {
         let result;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moostjs/otel",
-  "version": "0.4.10",
+  "version": "0.4.11",
   "description": "@moostjs/otel",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -39,6 +39,6 @@
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/sdk-trace-base": "^1.25.1",
-    "moost": "0.4.10"
+    "moost": "0.4.11"
   }
 }