arvo-event-handler 1.1.25 → 2.0.1

package/CHANGELOG.md

@@ -23,3 +23,7 @@
 ## [1.1.0] - 2024-09-30
 
 - Added Abstract handler class and bound all handlers to it
+
+## [2.0.0] - 2024-11-26
+
+- Added support for versioned contracts in event handler for better versioning support

package/dist/ArvoEventHandler/helpers.d.ts

@@ -19,8 +19,10 @@ import ArvoEventHandler from '.';
  * const myHandler = createArvoEventHandler({
  *   contract: myContract,
  *   executionunits: 100,
- *   handler: async ({ event }) => {
- *     // Handler implementation
+ *   handler: {
+ *      '0.0.1': async ({ event }) => {
+ *          // Handler implementation
+ *      }
  *   }
  * });
  * ```

package/dist/ArvoEventHandler/helpers.js

@@ -23,8 +23,10 @@ var _1 = __importDefault(require("."));
  * const myHandler = createArvoEventHandler({
  *   contract: myContract,
  *   executionunits: 100,
- *   handler: async ({ event }) => {
- *     // Handler implementation
+ *   handler: {
+ *      '0.0.1': async ({ event }) => {
+ *          // Handler implementation
+ *      }
  *   }
  * });
  * ```

package/dist/ArvoEventHandler/index.d.ts

@@ -1,4 +1,4 @@
-import { ArvoContract, ArvoEvent, ArvoExecutionSpanKind, OpenInferenceSpanKind, ResolveArvoContractRecord } from 'arvo-core';
+import { ArvoContract, ArvoEvent, ArvoExecutionSpanKind, OpenInferenceSpanKind } from 'arvo-core';
 import { IArvoEventHandler } from './types';
 import { SpanKind } from '@opentelemetry/api';
 import AbstractArvoEventHandler from '../AbstractArvoEventHandler';
@@ -50,7 +50,6 @@ export default class ArvoEventHandler<TContract extends ArvoContract> extends Ab
      *                        and context inheritance settings. Default is inherit from event and internal tracer
      * @returns A promise that resolves to an array of resulting ArvoEvents.
      *
-     * @remarks
      * This method performs the following steps:
      * 1. Creates an OpenTelemetry span for the execution.
      * 2. Validates the input event against the contract.
@@ -91,7 +90,7 @@ export default class ArvoEventHandler<TContract extends ArvoContract> extends Ab
      * - Propagates trace context to output events
      * - Handles error cases and sets appropriate span status
      */
-    execute(event: ArvoEvent<ResolveArvoContractRecord<TContract['accepts']>, Record<string, any>, TContract['accepts']['type']>, opentelemetry?: OpenTelemetryConfig): Promise<ArvoEvent[]>;
+    execute(event: ArvoEvent, opentelemetry?: OpenTelemetryConfig): Promise<ArvoEvent[]>;
     /**
      * Provides the schema for system error events.
      *

package/dist/ArvoEventHandler/index.js

@@ -24,8 +24,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
@@ -101,13 +101,19 @@ var ArvoEventHandler = /** @class */ (function (_super) {
                 throw new Error("The provided 'source' is not a valid string. Error: ".concat(error.message));
             }
         }
-        _this.source = (_a = param.source) !== null && _a !== void 0 ? _a : _this.contract.accepts.type;
+        _this.source = (_a = param.source) !== null && _a !== void 0 ? _a : _this.contract.type;
         _this.arvoExecutionSpanKind =
             (_c = (_b = param.spanKind) === null || _b === void 0 ? void 0 : _b.arvoExecution) !== null && _c !== void 0 ? _c : _this.arvoExecutionSpanKind;
         _this.openInferenceSpanKind =
             (_e = (_d = param.spanKind) === null || _d === void 0 ? void 0 : _d.openInference) !== null && _e !== void 0 ? _e : _this.openInferenceSpanKind;
         _this.openTelemetrySpanKind =
             (_g = (_f = param.spanKind) === null || _f === void 0 ? void 0 : _f.openTelemetry) !== null && _g !== void 0 ? _g : _this.openTelemetrySpanKind;
+        for (var _i = 0, _h = Object.keys(_this.contract.versions); _i < _h.length; _i++) {
+            var contractVersions = _h[_i];
+            if (!_this._handler[contractVersions]) {
+                throw new Error("The event handler for contract (uri=".concat(_this.contract.uri, ") must contain a handler for version ").concat(contractVersions, "."));
+            }
+        }
         return _this;
     }
     /**
@@ -118,7 +124,6 @@ var ArvoEventHandler = /** @class */ (function (_super) {
      *                        and context inheritance settings. Default is inherit from event and internal tracer
      * @returns A promise that resolves to an array of resulting ArvoEvents.
      *
-     * @remarks
      * This method performs the following steps:
      * 1. Creates an OpenTelemetry span for the execution.
      * 2. Validates the input event against the contract.
@@ -161,7 +166,7 @@ var ArvoEventHandler = /** @class */ (function (_super) {
      */
     ArvoEventHandler.prototype.execute = function (event, opentelemetry) {
         return __awaiter(this, void 0, void 0, function () {
-            var span, eventFactory;
+            var span;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -174,34 +179,44 @@ var ArvoEventHandler = /** @class */ (function (_super) {
                                 arvoExecution: this.arvoExecutionSpanKind,
                             },
                             event: event,
-                            opentelemetryConfig: opentelemetry
+                            opentelemetryConfig: opentelemetry,
                         });
-                        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;
-                                var _a, _b, _c, _d;
-                                return __generator(this, function (_e) {
-                                    switch (_e.label) {
+                                var otelSpanHeaders, parsedDataSchema, handlerContract, inputEventValidation, _handleOutput, outputs, eventFactory_1, error_1, eventFactory, result;
+                                var _a, _b, _c, _d, _e;
+                                return __generator(this, function (_f) {
+                                    switch (_f.label) {
                                         case 0:
                                             otelSpanHeaders = (0, arvo_core_1.currentOpenTelemetryHeaders)();
-                                            _e.label = 1;
+                                            _f.label = 1;
                                         case 1:
-                                            _e.trys.push([1, 3, 4, 5]);
+                                            _f.trys.push([1, 3, 4, 5]);
                                             span.setStatus({ code: api_1.SpanStatusCode.OK });
+                                            if (this.contract.type !== event.type) {
+                                                throw new Error("Invalid event type='".concat(event.type, "' is provide to handler for type='").concat(this.contract.type, "'"));
+                                            }
+                                            parsedDataSchema = (0, arvo_core_1.parseEventDataSchema)(event);
+                                            if (!(parsedDataSchema === null || parsedDataSchema === void 0 ? void 0 : parsedDataSchema.version)) {
+                                                (0, arvo_core_1.logToSpan)({
+                                                    level: 'WARNING',
+                                                    message: "Unable to resolve the event version from dataschema \"".concat(event.dataschema, "\". Defaulting to the latest version."),
+                                                });
+                                            }
+                                            handlerContract = this.contract.version((_a = parsedDataSchema === null || parsedDataSchema === void 0 ? void 0 : parsedDataSchema.version) !== null && _a !== void 0 ? _a : 'latest');
                                             Object.entries(event.otelAttributes).forEach(function (_a) {
                                                 var key = _a[0], value = _a[1];
                                                 return span.setAttribute("to_process.0.".concat(key), value);
                                             });
-                                            inputEventValidation = this.contract.validateAccepts(event.type, event.data);
+                                            inputEventValidation = handlerContract.accepts.schema.safeParse(event.data);
                                             if (inputEventValidation.error) {
                                                 throw new Error("Invalid event payload: ".concat(inputEventValidation.error));
                                             }
-                                            return [4 /*yield*/, this._handler({
+                                            return [4 /*yield*/, this._handler[handlerContract.version]({
                                                     event: event,
                                                     source: this.source,
                                                 })];
                                         case 2:
-                                            _handleOutput = _e.sent();
+                                            _handleOutput = _f.sent();
                                             if (!_handleOutput)
                                                 return [2 /*return*/, []];
                                             outputs = [];
@@ -211,14 +226,16 @@ var ArvoEventHandler = /** @class */ (function (_super) {
                                             else {
                                                 outputs = [_handleOutput];
                                             }
+                                            eventFactory_1 = (0, arvo_core_1.createArvoEventFactory)(handlerContract);
                                             return [2 /*return*/, (0, utils_1.eventHandlerOutputEventCreator)(outputs, otelSpanHeaders, this.source, event, this.executionunits, function (param, extension) {
                                                     var _a;
-                                                    return eventFactory.emits(param, extension, {
+                                                    return eventFactory_1.emits(param, extension, {
                                                         tracer: (_a = opentelemetry === null || opentelemetry === void 0 ? void 0 : opentelemetry.tracer) !== null && _a !== void 0 ? _a : (0, OpenTelemetry_1.fetchOpenTelemetryTracer)(),
                                                     });
                                                 })];
                                         case 3:
-                                            error_1 = _e.sent();
+                                            error_1 = _f.sent();
+                                            eventFactory = (0, arvo_core_1.createArvoEventFactory)(this.contract.version('any'));
                                             (0, arvo_core_1.exceptionToSpan)(error_1);
                                             span.setStatus({
                                                 code: api_1.SpanStatusCode.ERROR,
@@ -232,10 +249,10 @@ var ArvoEventHandler = /** @class */ (function (_super) {
                                                 to: event.source,
                                                 error: error_1,
                                                 executionunits: this.executionunits,
-                                                traceparent: (_a = otelSpanHeaders.traceparent) !== null && _a !== void 0 ? _a : undefined,
-                                                tracestate: (_b = otelSpanHeaders.tracestate) !== null && _b !== void 0 ? _b : undefined,
-                                                accesscontrol: (_c = event.accesscontrol) !== null && _c !== void 0 ? _c : undefined,
-                                            }, {}, { tracer: (_d = opentelemetry === null || opentelemetry === void 0 ? void 0 : opentelemetry.tracer) !== null && _d !== void 0 ? _d : (0, OpenTelemetry_1.fetchOpenTelemetryTracer)() });
+                                                traceparent: (_b = otelSpanHeaders.traceparent) !== null && _b !== void 0 ? _b : undefined,
+                                                tracestate: (_c = otelSpanHeaders.tracestate) !== null && _c !== void 0 ? _c : undefined,
+                                                accesscontrol: (_d = event.accesscontrol) !== null && _d !== void 0 ? _d : undefined,
+                                            }, {}, { tracer: (_e = opentelemetry === null || opentelemetry === void 0 ? void 0 : opentelemetry.tracer) !== null && _e !== void 0 ? _e : (0, OpenTelemetry_1.fetchOpenTelemetryTracer)() });
                                             Object.entries(result.otelAttributes).forEach(function (_a) {
                                                 var key = _a[0], value = _a[1];
                                                 return span.setAttribute("to_emit.0.".concat(key), value);

package/dist/ArvoEventHandler/types.d.ts

@@ -1,13 +1,13 @@
 import { SpanKind } from '@opentelemetry/api';
-import { ArvoContract, ArvoEvent, ResolveArvoContractRecord, CreateArvoEvent, OpenInferenceSpanKind, ArvoExecutionSpanKind } from 'arvo-core';
+import { ArvoContract, ArvoEvent, CreateArvoEvent, OpenInferenceSpanKind, ArvoExecutionSpanKind, VersionedArvoContract, ArvoSemanticVersion } from 'arvo-core';
 import { z } from 'zod';
 /**
  * Represents the input for an ArvoEvent handler function.
  * @template TAccepts - The type of ArvoContractRecord that the handler accepts.
  */
-export type ArvoEventHandlerFunctionInput<TContract extends ArvoContract> = {
+export type ArvoEventHandlerFunctionInput<TContract extends VersionedArvoContract<ArvoContract, ArvoSemanticVersion>> = {
     /** The ArvoEvent object. */
-    event: ArvoEvent<ResolveArvoContractRecord<TContract['accepts']>, Record<string, any>, TContract['accepts']['type']>;
+    event: ArvoEvent<z.infer<TContract['accepts']['schema']>, Record<string, any>, TContract['accepts']['type']>;
     /** The source field data of the handler */
     source: string;
 };
@@ -15,7 +15,7 @@ export type ArvoEventHandlerFunctionInput<TContract extends ArvoContract> = {
  * Represents the output of an ArvoEvent handler function.
  * @template TContract - The type of ArvoContract that the handler is associated with.
  */
-export type ArvoEventHandlerFunctionOutput<TContract extends ArvoContract> = {
+export type ArvoEventHandlerFunctionOutput<TContract extends VersionedArvoContract<ArvoContract, ArvoSemanticVersion>> = {
     [K in keyof TContract['emits']]: Omit<CreateArvoEvent<z.infer<TContract['emits'][K]>, K & string>, 'subject' | 'source' | 'executionunits' | 'traceparent' | 'tracestate'> & {
         /**
          * An optional override for the execution units of this specific event.
@@ -33,7 +33,9 @@ export type ArvoEventHandlerFunctionOutput<TContract extends ArvoContract> = {
  * Defines the structure of an ArvoEvent handler function.
  * @template TContract - The type of ArvoContract that the handler is associated with.
  */
-export type ArvoEventHandlerFunction<TContract extends ArvoContract> = (params: ArvoEventHandlerFunctionInput<TContract>) => Promise<Array<ArvoEventHandlerFunctionOutput<TContract>> | ArvoEventHandlerFunctionOutput<TContract> | void>;
+export type ArvoEventHandlerFunction<TContract extends ArvoContract> = {
+    [V in ArvoSemanticVersion & keyof TContract['versions']]: (params: ArvoEventHandlerFunctionInput<VersionedArvoContract<TContract, V>>) => Promise<Array<ArvoEventHandlerFunctionOutput<VersionedArvoContract<TContract, V>>> | ArvoEventHandlerFunctionOutput<VersionedArvoContract<TContract, V>> | void>;
+};
 /**
  * Interface for an ArvoEvent handler.
  * @template T - The type of the contract (defaults to string).

package/dist/ArvoEventRouter/index.d.ts

@@ -12,7 +12,6 @@ export declare class ArvoEventRouter extends AbstractArvoEventHandler {
     private readonly _source;
     /**
      * The source name of the router.
-     * @returns {string} The router's source name.
      *
      * @remarks
      * The router attempts to match the `event.to` field with this value.
@@ -23,7 +22,6 @@ export declare class ArvoEventRouter extends AbstractArvoEventHandler {
     get source(): string;
     /**
      * A list of all available event handlers to be used by the router.
-     * @property {ArvoEventHandler<ArvoContract>[]} handlers
      */
     readonly handlers: ArvoEventHandler<ArvoContract>[];
     /**
@@ -40,7 +38,7 @@ export declare class ArvoEventRouter extends AbstractArvoEventHandler {
     readonly openTelemetrySpanKind: SpanKind;
     /**
      * Creates an instance of ArvoEventRouter.
-     * @param {IArvoEventRouter} param - The parameters for initializing the router
+     * @param param - The parameters for initializing the router
      * @throws {Error} If there are duplicate handlers for the same event type or the
      *                 source in an invalid string
      */

package/dist/ArvoEventRouter/index.js

@@ -24,8 +24,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
@@ -69,7 +69,7 @@ var ArvoEventRouter = /** @class */ (function (_super) {
     __extends(ArvoEventRouter, _super);
     /**
      * Creates an instance of ArvoEventRouter.
-     * @param {IArvoEventRouter} param - The parameters for initializing the router
+     * @param param - The parameters for initializing the router
      * @throws {Error} If there are duplicate handlers for the same event type or the
      *                 source in an invalid string
      */
@@ -91,11 +91,11 @@ var ArvoEventRouter = /** @class */ (function (_super) {
         _this.executionunits = param.executionunits;
         for (var _i = 0, _a = _this.handlers; _i < _a.length; _i++) {
             var handler = _a[_i];
-            if (_this.handlersMap[handler.contract.accepts.type]) {
-                var existingHandler = _this.handlersMap[handler.contract.accepts.type];
-                throw new Error((0, arvo_core_1.cleanString)("\n          Duplicate handlers for event.type=".concat(handler.contract.accepts.type, " found. There are same 'contract.accept.types' in \n          contracts 'uri=").concat(existingHandler.contract.uri, "' and 'uri=").concat(handler.contract.uri, "'. This router does not support handlers\n          with the same 'contract.accept.type'.\n        ")));
+            if (_this.handlersMap[handler.contract.type]) {
+                var existingHandler = _this.handlersMap[handler.contract.type];
+                throw new Error((0, arvo_core_1.cleanString)("\n          Duplicate handlers for event.type=".concat(handler.contract.type, " found. There are same 'contract.accept.types' in \n          contracts 'uri=").concat(existingHandler.contract.uri, "' and 'uri=").concat(handler.contract.uri, "'. This router does not support handlers\n          with the same 'contract.accept.type'.\n        ")));
             }
-            _this.handlersMap[handler.contract.accepts.type] = handler;
+            _this.handlersMap[handler.contract.type] = handler;
         }
         Object.freeze(_this.handlers);
         Object.freeze(_this.handlersMap);
@@ -104,7 +104,6 @@ var ArvoEventRouter = /** @class */ (function (_super) {
     Object.defineProperty(ArvoEventRouter.prototype, "source", {
         /**
          * The source name of the router.
-         * @returns {string} The router's source name.
          *
          * @remarks
          * The router attempts to match the `event.to` field with this value.
@@ -182,7 +181,7 @@ var ArvoEventRouter = /** @class */ (function (_super) {
                                 arvoExecution: this.arvoExecutionSpanKind,
                             },
                             event: event,
-                            opentelemetryConfig: opentelemetry
+                            opentelemetryConfig: opentelemetry,
                         });
                         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;
@@ -202,9 +201,12 @@ var ArvoEventRouter = /** @class */ (function (_super) {
                                                 throw new Error((0, arvo_core_1.cleanString)("\n            Invalid event. The 'event.to' is ".concat(newEvent.to, " while this handler \n            listens to only 'event.to' equal to ").concat(this._source, ". If this is a mistake,\n            please update the 'source' field of the handler\n          ")));
                                             }
                                             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          ")));
+                                                throw new Error((0, arvo_core_1.cleanString)("\n            Invalid event (type=".concat(newEvent.type, "). No valid handler \n            <handler[*].contract.type> found in the router.\n          ")));
                                             }
-                                            return [4 /*yield*/, this.handlersMap[newEvent.type].execute(newEvent, { inheritFrom: 'execution', tracer: (_a = opentelemetry === null || opentelemetry === void 0 ? void 0 : opentelemetry.tracer) !== null && _a !== void 0 ? _a : (0, OpenTelemetry_1.fetchOpenTelemetryTracer)() })];
+                                            return [4 /*yield*/, this.handlersMap[newEvent.type].execute(newEvent, {
+                                                    inheritFrom: 'execution',
+                                                    tracer: (_a = opentelemetry === null || opentelemetry === void 0 ? void 0 : opentelemetry.tracer) !== null && _a !== void 0 ? _a : (0, OpenTelemetry_1.fetchOpenTelemetryTracer)(),
+                                                })];
                                         case 2:
                                             results = _b.sent();
                                             return [2 /*return*/, results.map(function (event) {

package/dist/ArvoEventRouter/types.d.ts

@@ -33,14 +33,12 @@ export interface IArvoEventRouter {
     /**
      * A list of all available event handlers to be used by the router.
      *
-     * @property {ArvoEventHandler<ArvoContract>[]} handlers
-     *
      * @remarks
      * This array contains instances of `ArvoEventHandler<ArvoContract>` which define
      * how different types of events should be processed. The router will use these
      * handlers to manage incoming events and generate appropriate responses or actions.
      */
-    handlers: ArvoEventHandler<ArvoContract<any, any, any, any>>[];
+    handlers: ArvoEventHandler<ArvoContract<any, any, any>>[];
     /**
      * The OpenTelemetry span kind attributes for the handler
      * executor.

package/dist/MultiArvoEventHandler/index.js

@@ -24,8 +24,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
@@ -167,7 +167,7 @@ var MultiArvoEventHandler = /** @class */ (function (_super) {
                                 arvoExecution: this.arvoExecutionSpanKind,
                             },
                             event: event,
-                            opentelemetryConfig: opentelemetry
+                            opentelemetryConfig: opentelemetry,
                         });
                         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;

package/dist/OpenTelemetry/index.js

@@ -2,12 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchOpenTelemetryTracer = void 0;
 var api_1 = require("@opentelemetry/api");
-var utils_1 = require("./utils");
 /**
  * Returns a tracer instance for the ArvoEventHandler package.
  */
 var fetchOpenTelemetryTracer = function () {
-    var pkg = (0, utils_1.getPackageInfo)("arvo-event-handler");
-    return api_1.trace.getTracer(pkg.name, pkg.version);
+    return api_1.trace.getTracer('arvo-instrumentation');
 };
 exports.fetchOpenTelemetryTracer = fetchOpenTelemetryTracer;

package/dist/OpenTelemetry/utils.d.ts

@@ -1,10 +1,6 @@
 import { Span, SpanKind, Tracer, Context } from '@opentelemetry/api';
 import { ArvoEvent, ArvoExecutionSpanKind, OpenInferenceSpanKind } from 'arvo-core';
 import { ICreateOtelSpan } from './types';
-export declare function getPackageInfo(defaultName: string): {
-    name: string;
-    version: string;
-};
 export declare const extractContext: (traceparent: string, tracestate: string | null) => Context;
 /**
  * Creates an OpenTelemetry span from an ArvoEvent, facilitating distributed tracing in the Arvo system.

package/dist/OpenTelemetry/utils.js

@@ -1,51 +1,9 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createOtelSpan = exports.createSpanFromEvent = exports.extractContext = void 0;
-exports.getPackageInfo = getPackageInfo;
 var api_1 = require("@opentelemetry/api");
 var arvo_core_1 = require("arvo-core");
-var fs = __importStar(require("fs"));
-var path = __importStar(require("path"));
 var _1 = require(".");
-function getPackageInfo(defaultName) {
-    try {
-        // Read the package.json file
-        var packageJsonPath = path.resolve(__dirname, '../../package.json');
-        var packageJsonContent = fs.readFileSync(packageJsonPath, 'utf-8');
-        // Parse the JSON content
-        var packageJson = JSON.parse(packageJsonContent);
-        // Extract name and version
-        var name_1 = packageJson.name, version = packageJson.version;
-        return { name: name_1, version: version };
-    }
-    catch (error) {
-        console.error('Error reading package.json:', error);
-        return { name: defaultName, version: 'Unknown' };
-    }
-}
 // Helper function to extract context from traceparent and tracestate
 var extractContext = function (traceparent, tracestate) {
     var extractedContext = api_1.propagation.extract(api_1.context.active(), {
@@ -158,7 +116,7 @@ var createOtelSpan = function (_a) {
     var spanName = _a.spanName, spanKinds = _a.spanKinds, event = _a.event, opentelemetryConfig = _a.opentelemetryConfig;
     opentelemetryConfig = opentelemetryConfig !== null && opentelemetryConfig !== void 0 ? opentelemetryConfig : {
         inheritFrom: 'event',
-        tracer: null
+        tracer: null,
     };
     var spanOptions = {
         kind: spanKinds.kind,
@@ -168,8 +126,8 @@ var createOtelSpan = function (_a) {
             _b),
     };
     var tracer = (_c = opentelemetryConfig.tracer) !== null && _c !== void 0 ? _c : (0, _1.fetchOpenTelemetryTracer)();
-    return opentelemetryConfig.inheritFrom === "event" ?
-        (0, exports.createSpanFromEvent)(spanName, event, spanKinds, tracer) :
-        tracer.startSpan(spanName, spanOptions);
+    return opentelemetryConfig.inheritFrom === 'event'
+        ? (0, exports.createSpanFromEvent)(spanName, event, spanKinds, tracer)
+        : tracer.startSpan(spanName, spanOptions);
 };
 exports.createOtelSpan = createOtelSpan;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arvo-event-handler",
-  "version": "1.1.25",
+  "version": "2.0.1",
   "description": "This package contains class and function for event handlers in an Arvo Event Driven system",
   "main": "dist/index.js",
   "scripts": {
@@ -50,7 +50,7 @@
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/core": "^1.27.0",
-    "arvo-core": "^1.2.3",
+    "arvo-core": "^2.0.9",
     "uuid": "^10.0.0",
     "zod": "^3.23.8"
   }