arvo-event-handler 1.1.7 → 1.1.8

package/dist/ArvoEventHandler/index.d.ts

@@ -1,6 +1,6 @@
 import { ArvoContract, ArvoEvent, ArvoExecutionSpanKind, OpenInferenceSpanKind, ResolveArvoContractRecord } from 'arvo-core';
 import { IArvoEventHandler } from './types';
-import { SpanKind } from '@opentelemetry/api';
+import { SpanKind, Tracer } from '@opentelemetry/api';
 import AbstractArvoEventHandler from '../AbstractArvoEventHandler';
 /**
  * Represents an event handler for Arvo contracts.
@@ -90,6 +90,7 @@ export default class ArvoEventHandler<TContract extends ArvoContract> extends Ab
      */
     execute(event: ArvoEvent<ResolveArvoContractRecord<TContract['accepts']>, Record<string, any>, TContract['accepts']['type']>, opentelemetry?: {
         inheritFrom: 'event' | 'execution';
+        tracer?: Tracer;
     }): Promise<ArvoEvent[]>;
     /**
      * Provides the schema for system error events.

package/dist/ArvoEventHandler/index.js

@@ -162,11 +162,13 @@ var ArvoEventHandler = /** @class */ (function (_super) {
             var spanName, spanKinds, spanOptions, span, eventFactory;
             var _a;
             var _this = this;
+            var _b;
             if (opentelemetry === void 0) { opentelemetry = {
                 inheritFrom: 'event',
+                tracer: OpenTelemetry_1.ArvoEventHandlerTracer,
             }; }
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
                         spanName = "ArvoEventHandler<".concat(this.contract.uri, ">.execute<").concat(event.type, ">");
                         spanKinds = {
@@ -182,8 +184,8 @@ var ArvoEventHandler = /** @class */ (function (_super) {
                                 _a),
                         };
                         span = opentelemetry.inheritFrom === 'event'
-                            ? (0, utils_2.createSpanFromEvent)(spanName, event, spanKinds)
-                            : OpenTelemetry_1.ArvoEventHandlerTracer.startSpan(spanName, spanOptions);
+                            ? (0, utils_2.createSpanFromEvent)(spanName, event, spanKinds, opentelemetry.tracer)
+                            : ((_b = opentelemetry.tracer) !== null && _b !== void 0 ? _b : OpenTelemetry_1.ArvoEventHandlerTracer).startSpan(spanName, spanOptions);
                         eventFactory = (0, arvo_core_1.createArvoEventFactory)(this.contract);
                         return [4 /*yield*/, api_1.context.with(api_1.trace.setSpan(api_1.context.active(), span), function () { return __awaiter(_this, void 0, void 0, function () {
                                 var otelSpanHeaders, inputEventValidation, _handleOutput, outputs, error_1, result;
@@ -257,7 +259,7 @@ var ArvoEventHandler = /** @class */ (function (_super) {
                                     }
                                 });
                             }); })];
-                    case 1: return [2 /*return*/, _b.sent()];
+                    case 1: return [2 /*return*/, _c.sent()];
                 }
             });
         });

package/dist/ArvoEventRouter/index.d.ts

@@ -1,7 +1,7 @@
 import { ArvoContract, ArvoEvent, ArvoExecutionSpanKind, OpenInferenceSpanKind } from 'arvo-core';
 import ArvoEventHandler from '../ArvoEventHandler';
 import { IArvoEventRouter } from './types';
-import { SpanKind } from '@opentelemetry/api';
+import { SpanKind, Tracer } from '@opentelemetry/api';
 import AbstractArvoEventHandler from '../AbstractArvoEventHandler';
 /**
  * ArvoEventRouter class handles routing of ArvoEvents to appropriate event handlers.
@@ -89,7 +89,10 @@ export declare class ArvoEventRouter extends AbstractArvoEventHandler {
      * - Execution units are tracked for both successful executions and errors.
      * - The router's default execution units are used for error events.
      */
-    execute(event: ArvoEvent): Promise<ArvoEvent[]>;
+    execute(event: ArvoEvent, opentelemetry?: {
+        inheritFrom: 'event' | 'execution';
+        tracer?: Tracer;
+    }): Promise<ArvoEvent[]>;
     /**
      * Provides the schema for system error events.
      *

package/dist/ArvoEventRouter/index.js

@@ -61,6 +61,7 @@ var api_1 = require("@opentelemetry/api");
 var utils_2 = require("./utils");
 var utils_3 = require("../OpenTelemetry/utils");
 var AbstractArvoEventHandler_1 = __importDefault(require("../AbstractArvoEventHandler"));
+var OpenTelemetry_1 = require("../OpenTelemetry");
 /**
  * ArvoEventRouter class handles routing of ArvoEvents to appropriate event handlers.
  */
@@ -163,19 +164,35 @@ var ArvoEventRouter = /** @class */ (function (_super) {
      * - Execution units are tracked for both successful executions and errors.
      * - The router's default execution units are used for error events.
      */
-    ArvoEventRouter.prototype.execute = function (event) {
-        return __awaiter(this, void 0, void 0, function () {
-            var span;
-            var _this = this;
+    ArvoEventRouter.prototype.execute = function (event_1) {
+        return __awaiter(this, arguments, void 0, function (event, opentelemetry) {
+            var spanName, spanKinds, spanOptions, span;
             var _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var _this = this;
+            var _b, _c;
+            if (opentelemetry === void 0) { opentelemetry = {
+                inheritFrom: 'event',
+                tracer: OpenTelemetry_1.ArvoEventHandlerTracer,
+            }; }
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
-                        span = (0, utils_3.createSpanFromEvent)("ArvoEventRouter.source<".concat((_a = this._source) !== null && _a !== void 0 ? _a : 'arvo.event.router', ">.execute<").concat(event.type, ">"), event, {
+                        spanName = "ArvoEventRouter.source<".concat((_b = this._source) !== null && _b !== void 0 ? _b : 'arvo.event.router', ">.execute<").concat(event.type, ">");
+                        spanKinds = {
                             kind: this.openTelemetrySpanKind,
                             openInference: this.openInferenceSpanKind,
                             arvoExecution: this.arvoExecutionSpanKind,
-                        });
+                        };
+                        spanOptions = {
+                            kind: spanKinds.kind,
+                            attributes: (_a = {},
+                                _a[arvo_core_1.OpenInference.ATTR_SPAN_KIND] = spanKinds.openInference,
+                                _a[arvo_core_1.ArvoExecution.ATTR_SPAN_KIND] = spanKinds.arvoExecution,
+                                _a),
+                        };
+                        span = opentelemetry.inheritFrom === 'event'
+                            ? (0, utils_3.createSpanFromEvent)(spanName, event, spanKinds, opentelemetry.tracer)
+                            : ((_c = opentelemetry.tracer) !== null && _c !== void 0 ? _c : OpenTelemetry_1.ArvoEventHandlerTracer).startSpan(spanName, spanOptions);
                         return [4 /*yield*/, api_1.context.with(api_1.trace.setSpan(api_1.context.active(), span), function () { return __awaiter(_this, void 0, void 0, function () {
                                 var otelSpanHeaders, newEvent, results, error_1;
                                 var _this = this;
@@ -195,7 +212,7 @@ var ArvoEventRouter = /** @class */ (function (_super) {
                                             if (!this.handlersMap[newEvent.type]) {
                                                 throw new Error((0, arvo_core_1.cleanString)("\n            Invalid event (type=".concat(newEvent.type, "). No valid handler \n            <handler[*].contract.accepts.type> found in the router.\n          ")));
                                             }
-                                            return [4 /*yield*/, this.handlersMap[newEvent.type].execute(newEvent)];
+                                            return [4 /*yield*/, this.handlersMap[newEvent.type].execute(newEvent, { inheritFrom: 'execution', tracer: opentelemetry.tracer })];
                                         case 2:
                                             results = _a.sent();
                                             return [2 /*return*/, results.map(function (event) {
@@ -233,7 +250,7 @@ var ArvoEventRouter = /** @class */ (function (_super) {
                                     }
                                 });
                             }); })];
-                    case 1: return [2 /*return*/, _b.sent()];
+                    case 1: return [2 /*return*/, _d.sent()];
                 }
             });
         });

package/dist/MultiArvoEventHandler/index.d.ts

@@ -1,4 +1,4 @@
-import { SpanKind } from '@opentelemetry/api';
+import { SpanKind, Tracer } from '@opentelemetry/api';
 import { ArvoEvent, ArvoExecutionSpanKind, OpenInferenceSpanKind } from 'arvo-core';
 import { IMultiArvoEventHandler } from './types';
 import AbstractArvoEventHandler from '../AbstractArvoEventHandler';
@@ -92,6 +92,7 @@ export default class MultiArvoEventHandler extends AbstractArvoEventHandler {
      */
     execute(event: ArvoEvent, opentelemetry?: {
         inheritFrom: 'event' | 'execution';
+        tracer?: Tracer;
     }): Promise<ArvoEvent[]>;
     /**
      * Provides the schema for system error events.

package/dist/MultiArvoEventHandler/index.js

@@ -155,11 +155,13 @@ var MultiArvoEventHandler = /** @class */ (function (_super) {
             var spanName, spanKinds, spanOptions, span;
             var _a;
             var _this = this;
+            var _b;
             if (opentelemetry === void 0) { opentelemetry = {
                 inheritFrom: 'event',
+                tracer: OpenTelemetry_1.ArvoEventHandlerTracer,
             }; }
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
                         spanName = "MutliArvoEventHandler.source<".concat(this.source, ">.execute<").concat(event.type, ">");
                         spanKinds = {
@@ -175,8 +177,8 @@ var MultiArvoEventHandler = /** @class */ (function (_super) {
                                 _a),
                         };
                         span = opentelemetry.inheritFrom === 'event'
-                            ? (0, utils_2.createSpanFromEvent)(spanName, event, spanKinds)
-                            : OpenTelemetry_1.ArvoEventHandlerTracer.startSpan(spanName, spanOptions);
+                            ? (0, utils_2.createSpanFromEvent)(spanName, event, spanKinds, opentelemetry.tracer)
+                            : ((_b = opentelemetry.tracer) !== null && _b !== void 0 ? _b : OpenTelemetry_1.ArvoEventHandlerTracer).startSpan(spanName, spanOptions);
                         return [4 /*yield*/, api_1.context.with(api_1.trace.setSpan(api_1.context.active(), span), function () { return __awaiter(_this, void 0, void 0, function () {
                                 var otelSpanHeaders, _handlerOutput, outputs, error_1;
                                 return __generator(this, function (_a) {
@@ -232,7 +234,7 @@ var MultiArvoEventHandler = /** @class */ (function (_super) {
                                     }
                                 });
                             }); })];
-                    case 1: return [2 /*return*/, _b.sent()];
+                    case 1: return [2 /*return*/, _c.sent()];
                 }
             });
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arvo-event-handler",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "description": "This package contains class and function for event handlers in an Arvo Event Driven system",
   "main": "dist/index.js",
   "scripts": {