@moostjs/otel 0.4.8 → 0.4.10

package/dist/index.cjs

@@ -115,7 +115,7 @@ class SpanInjector extends moost.ContextInjector {
         const fn = typeof attributes === 'function' ? attributes : cb;
         const attrs = typeof attributes === 'object' ? attributes : undefined;
         if (name === 'Event:start' && attrs?.eventType) {
-            return this.startEvent(name, attrs.eventType, fn);
+            return this.startEvent(attrs.eventType, fn);
         }
         else if (name !== 'Event:start') {
             if (this.getIgnoreSpan()) {
@@ -147,7 +147,10 @@ class SpanInjector extends moost.ContextInjector {
             });
         }
     }
-    startEvent(name, eventType, cb) {
+    startEvent(eventType, cb) {
+        if (eventType === 'init') {
+            return cb();
+        }
         const { registerSpan } = useOtelContext();
         let span = api.trace.getActiveSpan();
         if (eventType === 'HTTP') {
@@ -177,13 +180,14 @@ class SpanInjector extends moost.ContextInjector {
     getControllerHandlerMeta() {
         const { getMethod, getMethodMeta, getController, getControllerMeta, getRoute } = moost.useControllerContext();
         const methodName = getMethod();
-        const cMeta = getControllerMeta();
-        const mMeta = getMethodMeta();
+        const controller = getController();
+        const cMeta = controller ? getControllerMeta() : undefined;
+        const mMeta = controller ? getMethodMeta() : undefined;
         return {
             ignoreMeter: cMeta?.otelIgnoreMeter || mMeta?.otelIgnoreMeter,
             ignoreSpan: cMeta?.otelIgnoreSpan || mMeta?.otelIgnoreSpan,
             attrs: {
-                'moost.controller': moost.getConstructor(getController()).name,
+                'moost.controller': controller ? moost.getConstructor(controller).name : undefined,
                 'moost.handler': methodName,
                 'moost.handler_description': mMeta?.description,
                 'moost.handler_label': mMeta?.label,

package/dist/index.d.ts

@@ -198,14 +198,14 @@ declare class SpanInjector extends ContextInjector<TContextInjectorHook> {
     with<T>(name: TContextInjectorHook, attributes: TAttributes, cb: () => T): T;
     with<T>(name: TContextInjectorHook, cb: () => T): T;
     patchRsponse(): void;
-    startEvent<T>(name: string, eventType: string, cb: () => T): T;
+    startEvent<T>(eventType: string, cb: () => T): T;
     getEventType(): string;
     getIgnoreSpan(): boolean | undefined;
     getControllerHandlerMeta(): {
         ignoreMeter: boolean | undefined;
         ignoreSpan: boolean | undefined;
         attrs: {
-            'moost.controller': string;
+            'moost.controller': string | undefined;
             'moost.handler': string | undefined;
             'moost.handler_description': string | undefined;
             'moost.handler_label': string | undefined;

package/dist/index.mjs

@@ -113,7 +113,7 @@ class SpanInjector extends ContextInjector {
         const fn = typeof attributes === 'function' ? attributes : cb;
         const attrs = typeof attributes === 'object' ? attributes : undefined;
         if (name === 'Event:start' && attrs?.eventType) {
-            return this.startEvent(name, attrs.eventType, fn);
+            return this.startEvent(attrs.eventType, fn);
         }
         else if (name !== 'Event:start') {
             if (this.getIgnoreSpan()) {
@@ -145,7 +145,10 @@ class SpanInjector extends ContextInjector {
             });
         }
     }
-    startEvent(name, eventType, cb) {
+    startEvent(eventType, cb) {
+        if (eventType === 'init') {
+            return cb();
+        }
         const { registerSpan } = useOtelContext();
         let span = trace.getActiveSpan();
         if (eventType === 'HTTP') {
@@ -175,13 +178,14 @@ class SpanInjector extends ContextInjector {
     getControllerHandlerMeta() {
         const { getMethod, getMethodMeta, getController, getControllerMeta, getRoute } = useControllerContext();
         const methodName = getMethod();
-        const cMeta = getControllerMeta();
-        const mMeta = getMethodMeta();
+        const controller = getController();
+        const cMeta = controller ? getControllerMeta() : undefined;
+        const mMeta = controller ? getMethodMeta() : undefined;
         return {
             ignoreMeter: cMeta?.otelIgnoreMeter || mMeta?.otelIgnoreMeter,
             ignoreSpan: cMeta?.otelIgnoreSpan || mMeta?.otelIgnoreSpan,
             attrs: {
-                'moost.controller': getConstructor$2(getController()).name,
+                'moost.controller': controller ? getConstructor$2(controller).name : undefined,
                 'moost.handler': methodName,
                 'moost.handler_description': mMeta?.description,
                 'moost.handler_label': mMeta?.label,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moostjs/otel",
-  "version": "0.4.8",
+  "version": "0.4.10",
   "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.8"
+    "moost": "0.4.10"
   }
 }