arvo-core 2.1.3 → 2.1.4

package/dist/ArvoEvent/helpers.d.ts

@@ -1,6 +1,5 @@
 import ArvoEvent from '.';
 import { ArvoEventData, CloudEventExtension, CreateArvoEvent } from './types';
-import { ExecutionOpenTelemetryConfiguration } from '../OpenTelemetry/types';
 /**
  * Creates a strongly-typed ArvoEvent with configurable telemetry options.
  *
@@ -8,7 +7,6 @@ import { ExecutionOpenTelemetryConfiguration } from '../OpenTelemetry/types';
  * @param [extensions] - Optional cloud event extensions
  * @param [opentelemetry] - OpenTelemetry configuration with options:
  *   - disable - Completely disables telemetry if true
- *   - tracer - Custom OpenTelemetry tracer instance
  *
  * @throw {Error} In case any validation in {@link ArvoEvent} fails.
  *
@@ -35,20 +33,8 @@ import { ExecutionOpenTelemetryConfiguration } from '../OpenTelemetry/types';
  *   undefined,
  *   { disable: true }
  * );
- *
- * // With custom tracer
- * const event = createArvoEvent(
- *   {
- *     type: 'order.created',
- *     source: '/orders',
- *     subject: 'order-123',
- *     data: orderData
- *   },
- *   undefined,
- *   { tracer: customTracer }
- * );
  * ```
  */
-export declare const createArvoEvent: <TData extends ArvoEventData, TExtension extends CloudEventExtension, TType extends string>(event: CreateArvoEvent<TData, TType>, extensions?: TExtension, opentelemetry?: Partial<ExecutionOpenTelemetryConfiguration & {
-    disable: boolean;
-}>) => ArvoEvent<TData, TExtension, TType>;
+export declare const createArvoEvent: <TData extends ArvoEventData, TExtension extends CloudEventExtension, TType extends string>(event: CreateArvoEvent<TData, TType>, extensions?: TExtension, opentelemetry?: {
+    disable?: boolean;
+}) => ArvoEvent<TData, TExtension, TType>;

package/dist/ArvoEvent/helpers.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createArvoEvent = void 0;
-var api_1 = require("@opentelemetry/api");
 var _1 = __importDefault(require("."));
 var OpenTelemetry_1 = require("../OpenTelemetry");
 var utils_1 = require("../utils");
@@ -46,7 +45,6 @@ var generator = function (event, extensions, otelHeaders) {
  * @param [extensions] - Optional cloud event extensions
  * @param [opentelemetry] - OpenTelemetry configuration with options:
  *   - disable - Completely disables telemetry if true
- *   - tracer - Custom OpenTelemetry tracer instance
  *
  * @throw {Error} In case any validation in {@link ArvoEvent} fails.
  *
@@ -73,46 +71,22 @@ var generator = function (event, extensions, otelHeaders) {
  *   undefined,
  *   { disable: true }
  * );
- *
- * // With custom tracer
- * const event = createArvoEvent(
- *   {
- *     type: 'order.created',
- *     source: '/orders',
- *     subject: 'order-123',
- *     data: orderData
- *   },
- *   undefined,
- *   { tracer: customTracer }
- * );
  * ```
  */
 var createArvoEvent = function (event, extensions, opentelemetry) {
-    var _a;
     if (opentelemetry === null || opentelemetry === void 0 ? void 0 : opentelemetry.disable) {
         return generator(event, extensions, {
             traceparent: null,
             tracestate: null,
         });
     }
-    var tracer = (_a = opentelemetry === null || opentelemetry === void 0 ? void 0 : opentelemetry.tracer) !== null && _a !== void 0 ? _a : (0, OpenTelemetry_1.fetchOpenTelemetryTracer)();
-    var span = tracer.startSpan("createArvoEvent<".concat(event.type, ">"), {});
-    return api_1.context.with(api_1.trace.setSpan(api_1.context.active(), span), function () {
-        span.setStatus({ code: api_1.SpanStatusCode.OK });
-        try {
-            return generator(event, extensions, (0, OpenTelemetry_1.currentOpenTelemetryHeaders)());
-        }
-        catch (error) {
-            (0, OpenTelemetry_1.exceptionToSpan)(error);
-            span.setStatus({
-                code: api_1.SpanStatusCode.ERROR,
-                message: error.message,
-            });
-            throw error;
-        }
-        finally {
-            span.end();
-        }
+    return OpenTelemetry_1.ArvoOpenTelemetry.getInstance().startActiveSpan({
+        name: "createArvoEvent<".concat(event.type, ">"),
+        fn: function (span) {
+            var generatedEvent = generator(event, extensions, (0, OpenTelemetry_1.currentOpenTelemetryHeaders)());
+            span.setAttributes(generatedEvent.otelAttributes);
+            return generatedEvent;
+        },
     });
 };
 exports.createArvoEvent = createArvoEvent;

package/dist/ArvoEventFactory/Orchestrator.d.ts

@@ -1,7 +1,6 @@
 import ArvoEventFactory from '.';
 import { z } from 'zod';
 import { CreateArvoEvent } from '../ArvoEvent/types';
-import { ExecutionOpenTelemetryConfiguration } from '../OpenTelemetry/types';
 import { VersionedArvoContract } from '../ArvoContract/VersionedArvoContract';
 /**
  * Factory class for creating and validating orchestrator-specific events with managed subject hierarchies.
@@ -24,22 +23,20 @@ export declare class ArvoOrchestratorEventFactory<TContract extends VersionedArv
      *
      * @param event - Event configuration without type/schema/subject
      * @param [extensions] - Optional additional properties
-     * @param [opentelemetry] - Optional telemetry configuration
      * @returns Validated orchestration event with proper subject hierarchy
      *
      * @throws Error if event validation fails
      */
-    init<TExtension extends Record<string, any>>(event: Omit<CreateArvoEvent<z.input<TContract['accepts']['schema']>, TContract['accepts']['type']>, 'type' | 'datacontenttype' | 'dataschema' | 'subject'>, extensions?: TExtension, opentelemetry?: ExecutionOpenTelemetryConfiguration): import("..").ArvoEvent<z.TypeOf<TContract["accepts"]["schema"]>, TExtension, TContract["accepts"]["type"]>;
+    init<TExtension extends Record<string, any>>(event: Omit<CreateArvoEvent<z.input<TContract['accepts']['schema']>, TContract['accepts']['type']>, 'type' | 'datacontenttype' | 'dataschema' | 'subject'>, extensions?: TExtension): import("..").ArvoEvent<z.TypeOf<TContract["accepts"]["schema"]>, TExtension, TContract["accepts"]["type"]>;
     /**
      * Creates a completion event for the orchestration flow.
      * Uses the contract's configured complete event type from metadata.
      *
      * @param event - Completion event configuration
      * @param [extensions] - Optional additional properties
-     * @param [opentelemetry] - Optional telemetry configuration
      * @returns Validated completion event
      *
      * @throws Error if event validation fails or complete event type not configured
      */
-    complete<TExtension extends Record<string, any>>(event: Omit<CreateArvoEvent<z.input<TContract['emits'][TContract['metadata']['completeEventType']]>, TContract['metadata']['completeEventType']>, 'datacontenttype' | 'dataschema' | 'type'>, extensions?: TExtension, opentelemetry?: ExecutionOpenTelemetryConfiguration): import("..").ArvoEvent<z.TypeOf<TContract["emits"][TContract["metadata"]["completeEventType"]]>, TExtension, TContract["metadata"]["completeEventType"]>;
+    complete<TExtension extends Record<string, any>>(event: Omit<CreateArvoEvent<z.input<TContract['emits'][TContract['metadata']['completeEventType']]>, TContract['metadata']['completeEventType']>, 'datacontenttype' | 'dataschema' | 'type'>, extensions?: TExtension): import("..").ArvoEvent<z.TypeOf<TContract["emits"][TContract["metadata"]["completeEventType"]]>, TExtension, TContract["metadata"]["completeEventType"]>;
 }

package/dist/ArvoEventFactory/Orchestrator.js

@@ -34,7 +34,6 @@ var _1 = __importDefault(require("."));
 var helpers_1 = require("../ArvoEvent/helpers");
 var schema_1 = require("../ArvoEvent/schema");
 var OpenTelemetry_1 = require("../OpenTelemetry");
-var api_1 = require("@opentelemetry/api");
 var utils_1 = require("../utils");
 var ArvoOrchestrationSubject_1 = __importDefault(require("../ArvoOrchestrationSubject"));
 /**
@@ -67,22 +66,17 @@ var ArvoOrchestratorEventFactory = /** @class */ (function (_super) {
      *
      * @param event - Event configuration without type/schema/subject
      * @param [extensions] - Optional additional properties
-     * @param [opentelemetry] - Optional telemetry configuration
      * @returns Validated orchestration event with proper subject hierarchy
      *
      * @throws Error if event validation fails
      */
-    ArvoOrchestratorEventFactory.prototype.init = function (event, extensions, opentelemetry) {
+    ArvoOrchestratorEventFactory.prototype.init = function (event, extensions) {
         var _this = this;
-        opentelemetry = opentelemetry !== null && opentelemetry !== void 0 ? opentelemetry : {
-            tracer: (0, OpenTelemetry_1.fetchOpenTelemetryTracer)(),
-        };
-        var span = opentelemetry.tracer.startSpan("".concat(this._name, "<").concat(this.contract.uri, "/").concat(this.contract.version, ">.init"));
-        return api_1.context.with(api_1.trace.setSpan(api_1.context.active(), span), function () {
-            var _a, _b, _c, _d;
-            span.setStatus({ code: api_1.SpanStatusCode.OK });
-            var otelHeaders = (0, OpenTelemetry_1.currentOpenTelemetryHeaders)();
-            try {
+        return OpenTelemetry_1.ArvoOpenTelemetry.getInstance().startActiveSpan({
+            name: "".concat(this._name, "<").concat(utils_1.EventDataschemaUtil.create(this.contract), ">.init"),
+            fn: function (span) {
+                var _a, _b, _c, _d;
+                var otelHeaders = (0, OpenTelemetry_1.currentOpenTelemetryHeaders)();
                 var validationResult = _this.contract.accepts.schema.safeParse(event.data);
                 if (!validationResult.success) {
                     throw new Error("Accept Event data validation failed: ".concat(validationResult.error.message));
@@ -99,19 +93,10 @@ var ArvoOrchestratorEventFactory = /** @class */ (function (_super) {
                         initiator: event.source,
                         version: _this.contract.version,
                     });
-                return (0, helpers_1.createArvoEvent)(__assign(__assign({}, event), { subject: newSubject, traceparent: (_b = (_a = event.traceparent) !== null && _a !== void 0 ? _a : otelHeaders.traceparent) !== null && _b !== void 0 ? _b : undefined, tracestate: (_d = (_c = event.tracestate) !== null && _c !== void 0 ? _c : otelHeaders.tracestate) !== null && _d !== void 0 ? _d : undefined, type: _this.contract.accepts.type, datacontenttype: schema_1.ArvoDataContentType, dataschema: utils_1.EventDataschemaUtil.create(_this.contract), data: validationResult.data }), extensions, { disable: true });
-            }
-            catch (error) {
-                (0, OpenTelemetry_1.exceptionToSpan)(error);
-                span.setStatus({
-                    code: api_1.SpanStatusCode.ERROR,
-                    message: error.message,
-                });
-                throw error;
-            }
-            finally {
-                span.end();
-            }
+                var generatedEvent = (0, helpers_1.createArvoEvent)(__assign(__assign({}, event), { subject: newSubject, traceparent: (_b = (_a = event.traceparent) !== null && _a !== void 0 ? _a : otelHeaders.traceparent) !== null && _b !== void 0 ? _b : undefined, tracestate: (_d = (_c = event.tracestate) !== null && _c !== void 0 ? _c : otelHeaders.tracestate) !== null && _d !== void 0 ? _d : undefined, type: _this.contract.accepts.type, datacontenttype: schema_1.ArvoDataContentType, dataschema: utils_1.EventDataschemaUtil.create(_this.contract), data: validationResult.data }), extensions, { disable: true });
+                span.setAttributes(generatedEvent.otelAttributes);
+                return generatedEvent;
+            },
         });
     };
     /**
@@ -120,40 +105,26 @@ var ArvoOrchestratorEventFactory = /** @class */ (function (_super) {
      *
      * @param event - Completion event configuration
      * @param [extensions] - Optional additional properties
-     * @param [opentelemetry] - Optional telemetry configuration
      * @returns Validated completion event
      *
      * @throws Error if event validation fails or complete event type not configured
      */
-    ArvoOrchestratorEventFactory.prototype.complete = function (event, extensions, opentelemetry) {
+    ArvoOrchestratorEventFactory.prototype.complete = function (event, extensions) {
         var _this = this;
-        opentelemetry = opentelemetry !== null && opentelemetry !== void 0 ? opentelemetry : {
-            tracer: (0, OpenTelemetry_1.fetchOpenTelemetryTracer)(),
-        };
-        var span = opentelemetry.tracer.startSpan("".concat(this._name, "<").concat(this.contract.uri, "/").concat(this.contract.version, ">.complete"));
-        return api_1.context.with(api_1.trace.setSpan(api_1.context.active(), span), function () {
-            var _a, _b, _c, _d, _e, _f, _g, _h;
-            span.setStatus({ code: api_1.SpanStatusCode.OK });
-            var otelHeaders = (0, OpenTelemetry_1.currentOpenTelemetryHeaders)();
-            try {
+        return OpenTelemetry_1.ArvoOpenTelemetry.getInstance().startActiveSpan({
+            name: "".concat(this._name, "<").concat(utils_1.EventDataschemaUtil.create(this.contract), ">.complete"),
+            fn: function (span) {
+                var _a, _b, _c, _d, _e, _f, _g, _h;
+                var otelHeaders = (0, OpenTelemetry_1.currentOpenTelemetryHeaders)();
                 var validationResult = (_b = (_a = _this.contract.emits) === null || _a === void 0 ? void 0 : _a[_this.contract.metadata.completeEventType]) === null || _b === void 0 ? void 0 : _b.safeParse(event.data);
                 if (!(validationResult === null || validationResult === void 0 ? void 0 : validationResult.success)) {
                     var msg = (_d = (_c = validationResult === null || validationResult === void 0 ? void 0 : validationResult.error) === null || _c === void 0 ? void 0 : _c.message) !== null && _d !== void 0 ? _d : "No contract available for ".concat(_this.contract.metadata.completeEventType);
                     throw new Error("Emit Event data validation failed: ".concat(msg));
                 }
-                return (0, helpers_1.createArvoEvent)(__assign(__assign({}, event), { type: _this.contract.metadata.completeEventType, traceparent: (_f = (_e = event.traceparent) !== null && _e !== void 0 ? _e : otelHeaders.traceparent) !== null && _f !== void 0 ? _f : undefined, tracestate: (_h = (_g = event.tracestate) !== null && _g !== void 0 ? _g : otelHeaders.tracestate) !== null && _h !== void 0 ? _h : undefined, datacontenttype: schema_1.ArvoDataContentType, dataschema: utils_1.EventDataschemaUtil.create(_this.contract), data: validationResult.data }), extensions, { disable: true });
-            }
-            catch (error) {
-                (0, OpenTelemetry_1.exceptionToSpan)(error);
-                span.setStatus({
-                    code: api_1.SpanStatusCode.ERROR,
-                    message: error.message,
-                });
-                throw error;
-            }
-            finally {
-                span.end();
-            }
+                var generatedEvent = (0, helpers_1.createArvoEvent)(__assign(__assign({}, event), { type: _this.contract.metadata.completeEventType, traceparent: (_f = (_e = event.traceparent) !== null && _e !== void 0 ? _e : otelHeaders.traceparent) !== null && _f !== void 0 ? _f : undefined, tracestate: (_h = (_g = event.tracestate) !== null && _g !== void 0 ? _g : otelHeaders.tracestate) !== null && _h !== void 0 ? _h : undefined, datacontenttype: schema_1.ArvoDataContentType, dataschema: utils_1.EventDataschemaUtil.create(_this.contract), data: validationResult.data }), extensions, { disable: true });
+                span.setAttributes(generatedEvent.otelAttributes);
+                return generatedEvent;
+            },
         });
     };
     return ArvoOrchestratorEventFactory;

package/dist/ArvoEventFactory/index.d.ts

@@ -1,6 +1,5 @@
 import { z } from 'zod';
 import { CreateArvoEvent } from '../ArvoEvent/types';
-import { ExecutionOpenTelemetryConfiguration } from '../OpenTelemetry/types';
 import { VersionedArvoContract } from '../ArvoContract/VersionedArvoContract';
 /**
  * Factory class for creating and validating events based on a versioned Arvo contract.
@@ -32,7 +31,6 @@ export default class ArvoEventFactory<TContract extends VersionedArvoContract<an
      *
      * @param event - The event configuration object
      * @param [extensions] - Optional additional properties for the event
-     * @param [opentelemetry] - Optional OpenTelemetry configuration
      *
      * @returns A validated ArvoEvent matching the contract's accept specification
      *
@@ -46,13 +44,12 @@ export default class ArvoEventFactory<TContract extends VersionedArvoContract<an
      * });
      * ```
      */
-    accepts<TExtension extends Record<string, any>>(event: Omit<CreateArvoEvent<z.input<TContract['accepts']['schema']>, TContract['accepts']['type']>, 'type' | 'datacontenttype' | 'dataschema'>, extensions?: TExtension, opentelemetry?: ExecutionOpenTelemetryConfiguration): import("..").ArvoEvent<z.TypeOf<TContract["accepts"]["schema"]>, TExtension, TContract["accepts"]["type"]>;
+    accepts<TExtension extends Record<string, any>>(event: Omit<CreateArvoEvent<z.input<TContract['accepts']['schema']>, TContract['accepts']['type']>, 'type' | 'datacontenttype' | 'dataschema'>, extensions?: TExtension): import("..").ArvoEvent<z.TypeOf<TContract["accepts"]["schema"]>, TExtension, TContract["accepts"]["type"]>;
     /**
      * Creates and validates an event matching one of the contract's emit specifications.
      *
      * @param event - The event configuration object
      * @param [extensions] - Optional additional properties for the event
-     * @param [opentelemetry] - Optional OpenTelemetry configuration
      *
      * @returns A validated ArvoEvent matching the specified emit type
      *
@@ -67,14 +64,13 @@ export default class ArvoEventFactory<TContract extends VersionedArvoContract<an
      * });
      * ```
      */
-    emits<U extends string & keyof TContract['emits'], TExtension extends Record<string, any>>(event: Omit<CreateArvoEvent<z.input<TContract['emits'][U]>, U>, 'datacontenttype' | 'dataschema'>, extensions?: TExtension, opentelemetry?: ExecutionOpenTelemetryConfiguration): import("..").ArvoEvent<z.TypeOf<TContract["emits"][U]>, TExtension, U>;
+    emits<U extends string & keyof TContract['emits'], TExtension extends Record<string, any>>(event: Omit<CreateArvoEvent<z.input<TContract['emits'][U]>, U>, 'datacontenttype' | 'dataschema'>, extensions?: TExtension): import("..").ArvoEvent<z.TypeOf<TContract["emits"][U]>, TExtension, U>;
     /**
      * Creates a system error event for error reporting and handling.
      *
      * @param event - The error event configuration
      * @param event.error - The Error instance to convert to an event
      * @param [extensions] - Optional additional properties for the event
-     * @param [opentelemetry] - Optional OpenTelemetry configuration
      *
      * @returns A system error ArvoEvent
      *
@@ -90,7 +86,7 @@ export default class ArvoEventFactory<TContract extends VersionedArvoContract<an
      */
     systemError<TExtension extends Record<string, any>>(event: Omit<CreateArvoEvent<any, any>, 'data' | 'type' | 'datacontenttype' | 'dataschema'> & {
         error: Error;
-    }, extensions?: TExtension, opentelemetry?: ExecutionOpenTelemetryConfiguration): import("..").ArvoEvent<{
+    }, extensions?: TExtension): import("..").ArvoEvent<{
         errorName: string;
         errorMessage: string;
         errorStack: string | null;

package/dist/ArvoEventFactory/index.js

@@ -25,7 +25,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var helpers_1 = require("../ArvoEvent/helpers");
 var schema_1 = require("../ArvoEvent/schema");
 var OpenTelemetry_1 = require("../OpenTelemetry");
-var api_1 = require("@opentelemetry/api");
 var utils_1 = require("../utils");
 /**
  * Factory class for creating and validating events based on a versioned Arvo contract.
@@ -58,7 +57,6 @@ var ArvoEventFactory = /** @class */ (function () {
      *
      * @param event - The event configuration object
      * @param [extensions] - Optional additional properties for the event
-     * @param [opentelemetry] - Optional OpenTelemetry configuration
      *
      * @returns A validated ArvoEvent matching the contract's accept specification
      *
@@ -72,34 +70,21 @@ var ArvoEventFactory = /** @class */ (function () {
      * });
      * ```
      */
-    ArvoEventFactory.prototype.accepts = function (event, extensions, opentelemetry) {
+    ArvoEventFactory.prototype.accepts = function (event, extensions) {
         var _this = this;
-        opentelemetry = opentelemetry !== null && opentelemetry !== void 0 ? opentelemetry : {
-            tracer: (0, OpenTelemetry_1.fetchOpenTelemetryTracer)(),
-        };
-        var span = opentelemetry.tracer.startSpan("".concat(this._name, "<").concat(this.contract.uri, "/").concat(this.contract.version, ">.accepts"));
-        return api_1.context.with(api_1.trace.setSpan(api_1.context.active(), span), function () {
-            var _a, _b, _c, _d;
-            span.setStatus({ code: api_1.SpanStatusCode.OK });
-            var otelHeaders = (0, OpenTelemetry_1.currentOpenTelemetryHeaders)();
-            try {
+        return OpenTelemetry_1.ArvoOpenTelemetry.getInstance().startActiveSpan({
+            name: "".concat(this._name, "<").concat(utils_1.EventDataschemaUtil.create(this.contract), ">.accepts"),
+            fn: function (span) {
+                var _a, _b, _c, _d;
+                var otelHeaders = (0, OpenTelemetry_1.currentOpenTelemetryHeaders)();
                 var validationResult = _this.contract.accepts.schema.safeParse(event.data);
                 if (!validationResult.success) {
                     throw new Error("Accept Event data validation failed: ".concat(validationResult.error.message));
                 }
-                return (0, helpers_1.createArvoEvent)(__assign(__assign({}, event), { traceparent: (_b = (_a = event.traceparent) !== null && _a !== void 0 ? _a : otelHeaders.traceparent) !== null && _b !== void 0 ? _b : undefined, tracestate: (_d = (_c = event.tracestate) !== null && _c !== void 0 ? _c : otelHeaders.tracestate) !== null && _d !== void 0 ? _d : undefined, type: _this.contract.accepts.type, datacontenttype: schema_1.ArvoDataContentType, dataschema: utils_1.EventDataschemaUtil.create(_this.contract), data: validationResult.data }), extensions, { disable: true });
-            }
-            catch (error) {
-                (0, OpenTelemetry_1.exceptionToSpan)(error);
-                span.setStatus({
-                    code: api_1.SpanStatusCode.ERROR,
-                    message: error.message,
-                });
-                throw error;
-            }
-            finally {
-                span.end();
-            }
+                var generatedEvent = (0, helpers_1.createArvoEvent)(__assign(__assign({}, event), { traceparent: (_b = (_a = event.traceparent) !== null && _a !== void 0 ? _a : otelHeaders.traceparent) !== null && _b !== void 0 ? _b : undefined, tracestate: (_d = (_c = event.tracestate) !== null && _c !== void 0 ? _c : otelHeaders.tracestate) !== null && _d !== void 0 ? _d : undefined, type: _this.contract.accepts.type, datacontenttype: schema_1.ArvoDataContentType, dataschema: utils_1.EventDataschemaUtil.create(_this.contract), data: validationResult.data }), extensions, { disable: true });
+                span.setAttributes(generatedEvent.otelAttributes);
+                return generatedEvent;
+            },
         });
     };
     /**
@@ -107,7 +92,6 @@ var ArvoEventFactory = /** @class */ (function () {
      *
      * @param event - The event configuration object
      * @param [extensions] - Optional additional properties for the event
-     * @param [opentelemetry] - Optional OpenTelemetry configuration
      *
      * @returns A validated ArvoEvent matching the specified emit type
      *
@@ -122,35 +106,22 @@ var ArvoEventFactory = /** @class */ (function () {
      * });
      * ```
      */
-    ArvoEventFactory.prototype.emits = function (event, extensions, opentelemetry) {
+    ArvoEventFactory.prototype.emits = function (event, extensions) {
         var _this = this;
-        opentelemetry = opentelemetry !== null && opentelemetry !== void 0 ? opentelemetry : {
-            tracer: (0, OpenTelemetry_1.fetchOpenTelemetryTracer)(),
-        };
-        var span = opentelemetry.tracer.startSpan("".concat(this._name, "<").concat(this.contract.uri, "/").concat(this.contract.version, ">.emits<").concat(event.type, ">"));
-        return api_1.context.with(api_1.trace.setSpan(api_1.context.active(), span), function () {
-            var _a, _b, _c, _d, _e, _f, _g, _h;
-            span.setStatus({ code: api_1.SpanStatusCode.OK });
-            var otelHeaders = (0, OpenTelemetry_1.currentOpenTelemetryHeaders)();
-            try {
+        return OpenTelemetry_1.ArvoOpenTelemetry.getInstance().startActiveSpan({
+            name: "".concat(this._name, "<").concat(utils_1.EventDataschemaUtil.create(this.contract), ">.emits<").concat(event.type, ">"),
+            fn: function (span) {
+                var _a, _b, _c, _d, _e, _f, _g, _h;
+                var otelHeaders = (0, OpenTelemetry_1.currentOpenTelemetryHeaders)();
                 var validationResult = (_b = (_a = _this.contract.emits) === null || _a === void 0 ? void 0 : _a[event.type]) === null || _b === void 0 ? void 0 : _b.safeParse(event.data);
                 if (!(validationResult === null || validationResult === void 0 ? void 0 : validationResult.success)) {
                     var msg = (_d = (_c = validationResult === null || validationResult === void 0 ? void 0 : validationResult.error) === null || _c === void 0 ? void 0 : _c.message) !== null && _d !== void 0 ? _d : "No contract available for ".concat(event.type);
                     throw new Error("Emit Event data validation failed: ".concat(msg));
                 }
-                return (0, helpers_1.createArvoEvent)(__assign(__assign({}, event), { traceparent: (_f = (_e = event.traceparent) !== null && _e !== void 0 ? _e : otelHeaders.traceparent) !== null && _f !== void 0 ? _f : undefined, tracestate: (_h = (_g = event.tracestate) !== null && _g !== void 0 ? _g : otelHeaders.tracestate) !== null && _h !== void 0 ? _h : undefined, datacontenttype: schema_1.ArvoDataContentType, dataschema: utils_1.EventDataschemaUtil.create(_this.contract), data: validationResult.data }), extensions, { disable: true });
-            }
-            catch (error) {
-                (0, OpenTelemetry_1.exceptionToSpan)(error);
-                span.setStatus({
-                    code: api_1.SpanStatusCode.ERROR,
-                    message: error.message,
-                });
-                throw error;
-            }
-            finally {
-                span.end();
-            }
+                var generatedEvent = (0, helpers_1.createArvoEvent)(__assign(__assign({}, event), { traceparent: (_f = (_e = event.traceparent) !== null && _e !== void 0 ? _e : otelHeaders.traceparent) !== null && _f !== void 0 ? _f : undefined, tracestate: (_h = (_g = event.tracestate) !== null && _g !== void 0 ? _g : otelHeaders.tracestate) !== null && _h !== void 0 ? _h : undefined, datacontenttype: schema_1.ArvoDataContentType, dataschema: utils_1.EventDataschemaUtil.create(_this.contract), data: validationResult.data }), extensions, { disable: true });
+                span.setAttributes(generatedEvent.otelAttributes);
+                return generatedEvent;
+            },
         });
     };
     /**
@@ -159,7 +130,6 @@ var ArvoEventFactory = /** @class */ (function () {
      * @param event - The error event configuration
      * @param event.error - The Error instance to convert to an event
      * @param [extensions] - Optional additional properties for the event
-     * @param [opentelemetry] - Optional OpenTelemetry configuration
      *
      * @returns A system error ArvoEvent
      *
@@ -173,35 +143,22 @@ var ArvoEventFactory = /** @class */ (function () {
      * });
      * ```
      */
-    ArvoEventFactory.prototype.systemError = function (event, extensions, opentelemetry) {
+    ArvoEventFactory.prototype.systemError = function (event, extensions) {
         var _this = this;
-        opentelemetry = opentelemetry !== null && opentelemetry !== void 0 ? opentelemetry : {
-            tracer: (0, OpenTelemetry_1.fetchOpenTelemetryTracer)(),
-        };
-        var span = opentelemetry.tracer.startSpan("".concat(this._name, "<").concat(this.contract.uri, ">.systemError"));
-        return api_1.context.with(api_1.trace.setSpan(api_1.context.active(), span), function () {
-            var _a, _b, _c, _d, _e;
-            span.setStatus({ code: api_1.SpanStatusCode.OK });
-            var otelHeaders = (0, OpenTelemetry_1.currentOpenTelemetryHeaders)();
-            try {
+        return OpenTelemetry_1.ArvoOpenTelemetry.getInstance().startActiveSpan({
+            name: "".concat(this._name, "<").concat(utils_1.EventDataschemaUtil.createWithWildCardVersion(this.contract), ">.systemError"),
+            fn: function (span) {
+                var _a, _b, _c, _d, _e;
+                var otelHeaders = (0, OpenTelemetry_1.currentOpenTelemetryHeaders)();
                 var error = event.error, _event = __rest(event, ["error"]);
-                return (0, helpers_1.createArvoEvent)(__assign(__assign({}, _event), { traceparent: (_b = (_a = event.traceparent) !== null && _a !== void 0 ? _a : otelHeaders.traceparent) !== null && _b !== void 0 ? _b : undefined, tracestate: (_d = (_c = event.tracestate) !== null && _c !== void 0 ? _c : otelHeaders.tracestate) !== null && _d !== void 0 ? _d : undefined, type: _this.contract.systemError.type, data: {
+                var generatedEvent = (0, helpers_1.createArvoEvent)(__assign(__assign({}, _event), { traceparent: (_b = (_a = event.traceparent) !== null && _a !== void 0 ? _a : otelHeaders.traceparent) !== null && _b !== void 0 ? _b : undefined, tracestate: (_d = (_c = event.tracestate) !== null && _c !== void 0 ? _c : otelHeaders.tracestate) !== null && _d !== void 0 ? _d : undefined, type: _this.contract.systemError.type, data: {
                         errorName: error.name,
                         errorMessage: error.message,
                         errorStack: (_e = error.stack) !== null && _e !== void 0 ? _e : null,
                     }, datacontenttype: schema_1.ArvoDataContentType, dataschema: utils_1.EventDataschemaUtil.createWithWildCardVersion(_this.contract) }), extensions, { disable: true });
-            }
-            catch (error) {
-                (0, OpenTelemetry_1.exceptionToSpan)(error);
-                span.setStatus({
-                    code: api_1.SpanStatusCode.ERROR,
-                    message: error.message,
-                });
-                throw error;
-            }
-            finally {
-                span.end();
-            }
+                span.setAttributes(generatedEvent.otelAttributes);
+                return generatedEvent;
+            },
         });
     };
     return ArvoEventFactory;

package/dist/OpenTelemetry/ArvoExecution/types.d.ts

@@ -1,4 +1,5 @@
 export declare enum ArvoExecutionSpanKind {
     EVENT_HANDLER = "EVENT_HANDLER",
-    COMMANDER = "COMMANDER"
+    ORCHESTRATOR = "ORCHESTRATOR",
+    INTERNAL = "INTERNAL"
 }

package/dist/OpenTelemetry/ArvoExecution/types.js

@@ -4,5 +4,6 @@ exports.ArvoExecutionSpanKind = void 0;
 var ArvoExecutionSpanKind;
 (function (ArvoExecutionSpanKind) {
     ArvoExecutionSpanKind["EVENT_HANDLER"] = "EVENT_HANDLER";
-    ArvoExecutionSpanKind["COMMANDER"] = "COMMANDER";
+    ArvoExecutionSpanKind["ORCHESTRATOR"] = "ORCHESTRATOR";
+    ArvoExecutionSpanKind["INTERNAL"] = "INTERNAL";
 })(ArvoExecutionSpanKind || (exports.ArvoExecutionSpanKind = ArvoExecutionSpanKind = {}));

package/dist/OpenTelemetry/index.d.ts

@@ -1,9 +1,49 @@
-import { Span } from '@opentelemetry/api';
+import { Span, Tracer, Context, SpanOptions } from '@opentelemetry/api';
 import { TelemetryLogLevel, OpenTelemetryHeaders } from './types';
 /**
- * A tracer instance for the ArvoCore package.
+ * Singleton class for managing OpenTelemetry instrumentation across libraries
  */
-export declare const fetchOpenTelemetryTracer: () => import("@opentelemetry/api").Tracer;
+export declare class ArvoOpenTelemetry {
+    /** OpenTelemetry tracer instance for creating spans */
+    readonly tracer: Tracer;
+    private static instance;
+    private constructor();
+    /**
+     * Gets the instance of ArvoOpenTelemetry
+     * @returns {ArvoOpenTelemetry} The singleton instance
+     */
+    static getInstance(): ArvoOpenTelemetry;
+    /**
+     * Creates and manages an active span for a given operation. This function provides two modes of operation:
+     * 1. Automatic span management (default): Handles span lifecycle, status, and error recording
+     * 2. Manual span management: Gives full control to the user when disableSpanManagement is true
+     *
+     * @template F - Function type that accepts a Span parameter and returns a value
+     * @param {Object} param - Configuration object for the span
+     * @param {string} param.name - Name of the span to be created
+     * @param {F} param.fn - Function to execute within the span context. Receives the span as a parameter
+     * @param {SpanOptions} [param.spanOptions] - Optional configuration for the span creation
+     * @param {boolean} [param.disableSpanManagement] - When true, disables automatic span lifecycle management
+     * @param {Object} [param.context] - Optional context configuration for span inheritance
+     * @param {string} param.context.inheritFrom - Specifies the type of context inheritance ('TRACE_HEADERS' | 'CONTEXT')
+     * @param {OpenTelemetryHeaders} param.context.traceHeaders - Required when inheritFrom is 'TRACE_HEADERS'
+     * @param {Context} param.context.context - Required when inheritFrom is 'CONTEXT'
+     * @returns {ReturnType<F>} The return value of the executed function
+     */
+    startActiveSpan<F extends (span: Span) => unknown>(param: {
+        name: string;
+        fn: F;
+        spanOptions?: SpanOptions;
+        context?: {
+            inheritFrom: 'TRACE_HEADERS';
+            traceHeaders: OpenTelemetryHeaders;
+        } | {
+            inheritFrom: 'CONTEXT';
+            context: Context;
+        };
+        disableSpanManagement?: boolean;
+    }): ReturnType<F>;
+}
 /**
  * Logs a message to a span with additional parameters.
  * @param params - The parameters for the log message.
@@ -11,11 +51,8 @@ export declare const fetchOpenTelemetryTracer: () => import("@opentelemetry/api"
  *               If no active span is available, the message is logged to the console.
  */
 export declare const logToSpan: (params: {
-    /** The log level */
     level: TelemetryLogLevel;
-    /** The log message */
     message: string;
-    /** Other log parameters */
     [key: string]: string;
 }, span?: Span | undefined) => void;
 /**
@@ -34,3 +71,4 @@ export declare const OTelNull = "N/A";
  * @returns An object containing the traceparent and tracestate headers.
  */
 export declare function currentOpenTelemetryHeaders(): OpenTelemetryHeaders;
+export declare const makeOpenTelemetryContextContext: (traceparent: string, tracestate: string | null) => Context;

package/dist/OpenTelemetry/index.js

@@ -10,18 +10,89 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OTelNull = exports.exceptionToSpan = exports.logToSpan = exports.fetchOpenTelemetryTracer = void 0;
+exports.makeOpenTelemetryContextContext = exports.OTelNull = exports.exceptionToSpan = exports.logToSpan = exports.ArvoOpenTelemetry = void 0;
 exports.currentOpenTelemetryHeaders = currentOpenTelemetryHeaders;
 var api_1 = require("@opentelemetry/api");
 var core_1 = require("@opentelemetry/core");
+var ArvoExecution_1 = __importDefault(require("./ArvoExecution"));
+var types_1 = require("./ArvoExecution/types");
 /**
- * A tracer instance for the ArvoCore package.
+ * Singleton class for managing OpenTelemetry instrumentation across libraries
  */
-var fetchOpenTelemetryTracer = function () {
-    return api_1.trace.getTracer('arvo-instrumentation');
-};
-exports.fetchOpenTelemetryTracer = fetchOpenTelemetryTracer;
+var ArvoOpenTelemetry = /** @class */ (function () {
+    function ArvoOpenTelemetry() {
+        this.tracer = api_1.trace.getTracer('arvo-instrumentation', '1.0.0');
+    }
+    /**
+     * Gets the instance of ArvoOpenTelemetry
+     * @returns {ArvoOpenTelemetry} The singleton instance
+     */
+    ArvoOpenTelemetry.getInstance = function () {
+        if (ArvoOpenTelemetry.instance === null) {
+            ArvoOpenTelemetry.instance = new ArvoOpenTelemetry();
+        }
+        return ArvoOpenTelemetry.instance;
+    };
+    /**
+     * Creates and manages an active span for a given operation. This function provides two modes of operation:
+     * 1. Automatic span management (default): Handles span lifecycle, status, and error recording
+     * 2. Manual span management: Gives full control to the user when disableSpanManagement is true
+     *
+     * @template F - Function type that accepts a Span parameter and returns a value
+     * @param {Object} param - Configuration object for the span
+     * @param {string} param.name - Name of the span to be created
+     * @param {F} param.fn - Function to execute within the span context. Receives the span as a parameter
+     * @param {SpanOptions} [param.spanOptions] - Optional configuration for the span creation
+     * @param {boolean} [param.disableSpanManagement] - When true, disables automatic span lifecycle management
+     * @param {Object} [param.context] - Optional context configuration for span inheritance
+     * @param {string} param.context.inheritFrom - Specifies the type of context inheritance ('TRACE_HEADERS' | 'CONTEXT')
+     * @param {OpenTelemetryHeaders} param.context.traceHeaders - Required when inheritFrom is 'TRACE_HEADERS'
+     * @param {Context} param.context.context - Required when inheritFrom is 'CONTEXT'
+     * @returns {ReturnType<F>} The return value of the executed function
+     */
+    ArvoOpenTelemetry.prototype.startActiveSpan = function (param) {
+        var _a;
+        var _b, _c, _d;
+        var parentContext;
+        if (param.context) {
+            if (param.context.inheritFrom === 'TRACE_HEADERS' &&
+                param.context.traceHeaders.traceparent) {
+                parentContext = (0, exports.makeOpenTelemetryContextContext)(param.context.traceHeaders.traceparent, param.context.traceHeaders.tracestate);
+            }
+            else if (param.context.inheritFrom === 'CONTEXT') {
+                parentContext = param.context.context;
+            }
+        }
+        var span = this.tracer.startSpan(param.name, __assign(__assign({}, ((_b = param.spanOptions) !== null && _b !== void 0 ? _b : {})), { attributes: __assign((_a = {}, _a[ArvoExecution_1.default.ATTR_SPAN_KIND] = types_1.ArvoExecutionSpanKind.INTERNAL, _a), ((_d = (_c = param.spanOptions) === null || _c === void 0 ? void 0 : _c.attributes) !== null && _d !== void 0 ? _d : {})) }), parentContext);
+        return api_1.context.with(api_1.trace.setSpan(api_1.context.active(), span), function () {
+            if (param.disableSpanManagement) {
+                return param.fn(span);
+            }
+            span.setStatus({ code: api_1.SpanStatusCode.OK });
+            try {
+                return param.fn(span);
+            }
+            catch (e) {
+                (0, exports.exceptionToSpan)(e);
+                span.setStatus({
+                    code: api_1.SpanStatusCode.ERROR,
+                    message: e.message,
+                });
+                throw e;
+            }
+            finally {
+                span.end();
+            }
+        });
+    };
+    ArvoOpenTelemetry.instance = null;
+    return ArvoOpenTelemetry;
+}());
+exports.ArvoOpenTelemetry = ArvoOpenTelemetry;
 /**
  * Logs a message to a span with additional parameters.
  * @param params - The parameters for the log message.
@@ -86,3 +157,12 @@ function currentOpenTelemetryHeaders() {
         tracestate: carrier.tracestate,
     };
 }
+// Helper function to extract context from traceparent and tracestate
+var makeOpenTelemetryContextContext = function (traceparent, tracestate) {
+    var extractedContext = api_1.propagation.extract(api_1.context.active(), {
+        traceparent: traceparent,
+        tracestate: tracestate !== null && tracestate !== void 0 ? tracestate : undefined,
+    });
+    return extractedContext;
+};
+exports.makeOpenTelemetryContextContext = makeOpenTelemetryContextContext;

package/dist/OpenTelemetry/types.d.ts

@@ -1,4 +1,3 @@
-import { Tracer } from '@opentelemetry/api';
 /**
  * Represents the available log levels for telemetry.
  * - DEBUG: Used for detailed information, typically of interest only when diagnosing problems.
@@ -13,21 +12,6 @@ export type TelemetryLogLevel = 'DEBUG' | 'INFO' | 'WARNING' | 'ERROR' | 'CRITIC
  * See reference standard documentation [here](https://www.w3.org/TR/trace-context/#design-overview)
  */
 export type OpenTelemetryHeaders = {
-    /** The traceparent header value */
     traceparent: string | null;
-    /** The tracestate header value */
     tracestate: string | null;
 };
-/**
- * Configuration options for OpenTelemetry integration in execution context.
- *
- * This type defines how tracing should be configured and inherited within
- * the execution pipeline.
- */
-export type ExecutionOpenTelemetryConfiguration = {
-    /**
-     * OpenTelemetry tracer instance to use for creating spans.
-     * If not provided, a default tracer may be used depending on the implementation.
-     */
-    tracer: Tracer;
-};

package/dist/index.d.ts

@@ -2,8 +2,8 @@ import ArvoEvent from './ArvoEvent';
 import { ArvoDataContentType } from './ArvoEvent/schema';
 import { createArvoEvent } from './ArvoEvent/helpers';
 import { CloudEventContext, CloudEventExtension, ArvoEventData, ArvoExtension, OpenTelemetryExtension, CreateArvoEvent } from './ArvoEvent/types';
-import { exceptionToSpan, logToSpan, OTelNull, currentOpenTelemetryHeaders } from './OpenTelemetry';
-import { OpenTelemetryHeaders, TelemetryLogLevel, ExecutionOpenTelemetryConfiguration } from './OpenTelemetry/types';
+import { exceptionToSpan, logToSpan, OTelNull, currentOpenTelemetryHeaders, ArvoOpenTelemetry } from './OpenTelemetry';
+import { OpenTelemetryHeaders, TelemetryLogLevel } from './OpenTelemetry/types';
 import { validateURI, cleanString, compareSemanticVersions, parseSemanticVersion, EventDataschemaUtil } from './utils';
 import ArvoContract from './ArvoContract';
 import { createArvoContract } from './ArvoContract/helpers';
@@ -19,8 +19,6 @@ import { OpenInferenceSpanKind } from './OpenTelemetry/OpenInference/types';
 import ArvoOrchestrationSubject from './ArvoOrchestrationSubject';
 import { ArvoOrchestrationSubjectContentSchema } from './ArvoOrchestrationSubject/schema';
 import { ArvoOrchestrationSubjectContent } from './ArvoOrchestrationSubject/type';
-import ArvoEventHttp from './ArvoEventHttp';
-import { ArvoEventHttpConfig } from './ArvoEventHttp/types';
 import { InferArvoEvent, ArvoSemanticVersion, ArvoErrorType, InferVersionedArvoContract } from './types';
 import { createArvoOrchestratorContract } from './ArvoOrchestratorContract';
 import { ICreateArvoOrchestratorContract, ArvoOrchestratorContract } from './ArvoOrchestratorContract/types';
@@ -104,4 +102,4 @@ declare const ArvoEventSchema: {
         parentSubject$$: string | null;
     }>;
 };
-export { ArvoEventHttpConfig, ArvoEventHttp, ArvoEvent, createArvoEvent, ArvoDataContentType, ArvoEventData, CloudEventExtension, ArvoEventSchema, CloudEventContext, ArvoExtension, OpenTelemetryExtension, CreateArvoEvent, exceptionToSpan, logToSpan, OpenTelemetryHeaders, TelemetryLogLevel, OTelNull, validateURI, cleanString, ArvoContract, createArvoContract, ArvoContractValidators, ArvoContractRecord, IArvoContract, ResolveArvoContractRecord, ArvoEventFactory, createArvoEventFactory, currentOpenTelemetryHeaders, OpenInference, OpenInferenceSpanKind, ArvoExecution, ArvoExecutionSpanKind, ArvoContractJSONSchema, ArvoOrchestrationSubject, ArvoOrchestrationSubjectContent, ArvoSemanticVersion, InferArvoEvent, createArvoOrchestratorContract, ICreateArvoOrchestratorContract, ArvoOrchestratorEventTypeGen, ExecutionOpenTelemetryConfiguration, EventDataschemaUtil, ArvoOrchestrationSubjectContentSchema, ArvoSemanticVersionSchema, ArvoErrorSchema, ArvoErrorType, compareSemanticVersions, parseSemanticVersion, createSimpleArvoContract, ArvoOrchestratorContract, VersionedArvoContract, InferVersionedArvoContract, isWildCardArvoSematicVersion, WildCardArvoSemanticVersion, isValidArvoSemanticVersion, SimpleArvoContract, ArvoOrchestratorEventFactory, createArvoOrchestratorEventFactory, };
+export { ArvoEvent, createArvoEvent, ArvoDataContentType, ArvoEventData, CloudEventExtension, ArvoEventSchema, CloudEventContext, ArvoExtension, OpenTelemetryExtension, CreateArvoEvent, exceptionToSpan, logToSpan, OpenTelemetryHeaders, TelemetryLogLevel, OTelNull, validateURI, cleanString, ArvoContract, createArvoContract, ArvoContractValidators, ArvoContractRecord, IArvoContract, ResolveArvoContractRecord, ArvoEventFactory, createArvoEventFactory, currentOpenTelemetryHeaders, OpenInference, OpenInferenceSpanKind, ArvoExecution, ArvoExecutionSpanKind, ArvoContractJSONSchema, ArvoOrchestrationSubject, ArvoOrchestrationSubjectContent, ArvoSemanticVersion, InferArvoEvent, createArvoOrchestratorContract, ICreateArvoOrchestratorContract, ArvoOrchestratorEventTypeGen, EventDataschemaUtil, ArvoOrchestrationSubjectContentSchema, ArvoSemanticVersionSchema, ArvoErrorSchema, ArvoErrorType, compareSemanticVersions, parseSemanticVersion, createSimpleArvoContract, ArvoOrchestratorContract, VersionedArvoContract, InferVersionedArvoContract, isWildCardArvoSematicVersion, WildCardArvoSemanticVersion, isValidArvoSemanticVersion, SimpleArvoContract, ArvoOrchestratorEventFactory, createArvoOrchestratorEventFactory, ArvoOpenTelemetry, };

package/dist/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createArvoOrchestratorEventFactory = exports.ArvoOrchestratorEventFactory = exports.isValidArvoSemanticVersion = exports.WildCardArvoSemanticVersion = exports.isWildCardArvoSematicVersion = exports.VersionedArvoContract = exports.createSimpleArvoContract = exports.parseSemanticVersion = exports.compareSemanticVersions = exports.ArvoErrorSchema = exports.ArvoSemanticVersionSchema = exports.ArvoOrchestrationSubjectContentSchema = exports.EventDataschemaUtil = exports.ArvoOrchestratorEventTypeGen = exports.createArvoOrchestratorContract = exports.ArvoOrchestrationSubject = exports.ArvoExecutionSpanKind = exports.ArvoExecution = exports.OpenInferenceSpanKind = exports.OpenInference = exports.currentOpenTelemetryHeaders = exports.createArvoEventFactory = exports.ArvoEventFactory = exports.ArvoContractValidators = exports.createArvoContract = exports.ArvoContract = exports.cleanString = exports.validateURI = exports.OTelNull = exports.logToSpan = exports.exceptionToSpan = exports.ArvoEventSchema = exports.ArvoDataContentType = exports.createArvoEvent = exports.ArvoEvent = exports.ArvoEventHttp = void 0;
+exports.ArvoOpenTelemetry = exports.createArvoOrchestratorEventFactory = exports.ArvoOrchestratorEventFactory = exports.isValidArvoSemanticVersion = exports.WildCardArvoSemanticVersion = exports.isWildCardArvoSematicVersion = exports.VersionedArvoContract = exports.createSimpleArvoContract = exports.parseSemanticVersion = exports.compareSemanticVersions = exports.ArvoErrorSchema = exports.ArvoSemanticVersionSchema = exports.ArvoOrchestrationSubjectContentSchema = exports.EventDataschemaUtil = exports.ArvoOrchestratorEventTypeGen = exports.createArvoOrchestratorContract = exports.ArvoOrchestrationSubject = exports.ArvoExecutionSpanKind = exports.ArvoExecution = exports.OpenInferenceSpanKind = exports.OpenInference = exports.currentOpenTelemetryHeaders = exports.createArvoEventFactory = exports.ArvoEventFactory = exports.ArvoContractValidators = exports.createArvoContract = exports.ArvoContract = exports.cleanString = exports.validateURI = exports.OTelNull = exports.logToSpan = exports.exceptionToSpan = exports.ArvoEventSchema = exports.ArvoDataContentType = exports.createArvoEvent = exports.ArvoEvent = void 0;
 var ArvoEvent_1 = __importDefault(require("./ArvoEvent"));
 exports.ArvoEvent = ArvoEvent_1.default;
 var schema_1 = require("./ArvoEvent/schema");
@@ -15,6 +15,7 @@ Object.defineProperty(exports, "exceptionToSpan", { enumerable: true, get: funct
 Object.defineProperty(exports, "logToSpan", { enumerable: true, get: function () { return OpenTelemetry_1.logToSpan; } });
 Object.defineProperty(exports, "OTelNull", { enumerable: true, get: function () { return OpenTelemetry_1.OTelNull; } });
 Object.defineProperty(exports, "currentOpenTelemetryHeaders", { enumerable: true, get: function () { return OpenTelemetry_1.currentOpenTelemetryHeaders; } });
+Object.defineProperty(exports, "ArvoOpenTelemetry", { enumerable: true, get: function () { return OpenTelemetry_1.ArvoOpenTelemetry; } });
 var utils_1 = require("./utils");
 Object.defineProperty(exports, "validateURI", { enumerable: true, get: function () { return utils_1.validateURI; } });
 Object.defineProperty(exports, "cleanString", { enumerable: true, get: function () { return utils_1.cleanString; } });
@@ -48,8 +49,6 @@ var ArvoOrchestrationSubject_1 = __importDefault(require("./ArvoOrchestrationSub
 exports.ArvoOrchestrationSubject = ArvoOrchestrationSubject_1.default;
 var schema_3 = require("./ArvoOrchestrationSubject/schema");
 Object.defineProperty(exports, "ArvoOrchestrationSubjectContentSchema", { enumerable: true, get: function () { return schema_3.ArvoOrchestrationSubjectContentSchema; } });
-var ArvoEventHttp_1 = __importDefault(require("./ArvoEventHttp"));
-exports.ArvoEventHttp = ArvoEventHttp_1.default;
 var ArvoOrchestratorContract_1 = require("./ArvoOrchestratorContract");
 Object.defineProperty(exports, "createArvoOrchestratorContract", { enumerable: true, get: function () { return ArvoOrchestratorContract_1.createArvoOrchestratorContract; } });
 var typegen_1 = require("./ArvoOrchestratorContract/typegen");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arvo-core",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "description": "This core package contains all the core classes and components of the Arvo Event Driven System",
   "main": "dist/index.js",
   "scripts": {

package/dist/ArvoEventHttp/index.d.ts

@@ -1,80 +0,0 @@
-import ArvoEvent from '../ArvoEvent';
-import { ArvoEventHttpConfig } from './types';
-/**
- * A utility class for converting ArvoEvents to and from HTTP configurations.
- */
-export default class ArvoEventHttp {
-    /**
-     * Exports an ArvoEvent to a cloudevent binary-mode HTTP configuration.
-     * @param event - The ArvoEvent to export.
-     * @returns An ArvoEventHttpConfig object with headers and data.
-     */
-    static exportToBinary(event: ArvoEvent): ArvoEventHttpConfig;
-    /**
-     * Exports an ArvoEvent to a cloudevent structured-mode HTTP representation.
-     * @param event - The ArvoEvent to export.
-     * @returns An ArvoEventHttpConfig object with headers and data.
-     */
-    static exportToStructured(event: ArvoEvent): ArvoEventHttpConfig;
-    /**
-     * Imports an ArvoEvent from a binary-mode HTTP representation.
-     * @param config - The ArvoEventHttpConfig object to import from.
-     * @returns A new ArvoEvent instance.
-     * @throws {Error} If required fields are missing or if there's an error parsing the input.
-     */
-    static importFromBinary(config: ArvoEventHttpConfig): ArvoEvent;
-    /**
-     * Imports an ArvoEvent from a structured-mode HTTP representation.
-     * @param config - The ArvoEventHttpConfig object to import from.
-     * @returns A new ArvoEvent instance.
-     * @throws {Error} If required fields are missing or if there's an error parsing the input.
-     */
-    static importFromStructured(config: ArvoEventHttpConfig): ArvoEvent;
-    /**
-     * Validates the content type of the HTTP request.
-     * @param actual - The actual content type from the request.
-     * @param expected - The expected content type.
-     * @throws {Error} If the actual content type doesn't match the expected one.
-     */
-    private static validateContentType;
-    /**
-     * Extracts event fields from the HTTP headers.
-     * @param headers - The HTTP headers containing event information.
-     * @returns An object with extracted event fields.
-     */
-    private static extractEventFieldsFromHeaders;
-    /**
-     * Creates an error message for a missing required field.
-     * @param type - The type of the missing field.
-     * @param isHeader - A flag to distinguish between headers and structured payload
-     * @returns A formatted error message string.
-     */
-    private static createErrorMessageForMissingField;
-    /**
-     * Validates that all required fields are present in the event data.
-     * @param event - The event data to validate.
-     * @param isHeader - A flag to distinguish between headers and structured payload
-     * @throws {Error} If any required field is missing.
-     */
-    private static validateRequiredFields;
-    /**
-     * Extracts extension fields from the HTTP headers.
-     * @param headers - The HTTP headers containing event information.
-     * @returns An object with extracted extension fields.
-     */
-    private static extractExtensions;
-    /**
-     * Creates an ArvoEvent instance from extracted event data, payload, and extensions.
-     * @param event - The extracted event data.
-     * @param data - The event payload.
-     * @param extensions - The extracted extension fields.
-     * @returns A new ArvoEvent instance.
-     */
-    private static createArvoEvent;
-    /**
-     * Creates an ArvoEvent instance from structured event data.
-     * @param eventData - The structured event data.
-     * @returns A new ArvoEvent instance.
-     */
-    private static createArvoEventFromStructured;
-}

package/dist/ArvoEventHttp/index.js

@@ -1,265 +0,0 @@
-"use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-var ArvoEvent_1 = __importDefault(require("../ArvoEvent"));
-var schema_1 = require("../ArvoEvent/schema");
-var utils_1 = require("../utils");
-var uuid_1 = require("uuid");
-/**
- * A utility class for converting ArvoEvents to and from HTTP configurations.
- */
-var ArvoEventHttp = /** @class */ (function () {
-    function ArvoEventHttp() {
-    }
-    /**
-     * Exports an ArvoEvent to a cloudevent binary-mode HTTP configuration.
-     * @param event - The ArvoEvent to export.
-     * @returns An ArvoEventHttpConfig object with headers and data.
-     */
-    ArvoEventHttp.exportToBinary = function (event) {
-        var headers = Object.assign.apply(Object, __spreadArray([{}], Object.entries(event.toJSON())
-            .filter(function (_a) {
-            var key = _a[0];
-            return key !== 'data';
-        })
-            .map(function (_a) {
-            var _b;
-            var key = _a[0], value = _a[1];
-            return (_b = {},
-                _b["ce-".concat(key)] = value,
-                _b);
-        }), false));
-        return {
-            headers: __assign(__assign({}, headers), { 'content-type': 'application/json' }),
-            data: __assign({}, event.data),
-        };
-    };
-    /**
-     * Exports an ArvoEvent to a cloudevent structured-mode HTTP representation.
-     * @param event - The ArvoEvent to export.
-     * @returns An ArvoEventHttpConfig object with headers and data.
-     */
-    ArvoEventHttp.exportToStructured = function (event) {
-        return {
-            headers: {
-                'content-type': event.datacontenttype,
-            },
-            data: event.toJSON(),
-        };
-    };
-    /**
-     * Imports an ArvoEvent from a binary-mode HTTP representation.
-     * @param config - The ArvoEventHttpConfig object to import from.
-     * @returns A new ArvoEvent instance.
-     * @throws {Error} If required fields are missing or if there's an error parsing the input.
-     */
-    ArvoEventHttp.importFromBinary = function (config) {
-        var _a, _b;
-        this.validateContentType((_b = (_a = config.headers['content-type']) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : '', 'application/json');
-        var event = this.extractEventFieldsFromHeaders(config.headers);
-        this.validateRequiredFields(event, true);
-        var extensions = this.extractExtensions(config.headers);
-        return this.createArvoEvent(event, config.data, extensions);
-    };
-    /**
-     * Imports an ArvoEvent from a structured-mode HTTP representation.
-     * @param config - The ArvoEventHttpConfig object to import from.
-     * @returns A new ArvoEvent instance.
-     * @throws {Error} If required fields are missing or if there's an error parsing the input.
-     */
-    ArvoEventHttp.importFromStructured = function (config) {
-        var _a, _b;
-        this.validateContentType((_b = (_a = config.headers['content-type']) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : '', schema_1.ArvoDataContentType);
-        var eventData = config.data;
-        this.validateRequiredFields(eventData, false);
-        return this.createArvoEventFromStructured(eventData);
-    };
-    /**
-     * Validates the content type of the HTTP request.
-     * @param actual - The actual content type from the request.
-     * @param expected - The expected content type.
-     * @throws {Error} If the actual content type doesn't match the expected one.
-     */
-    ArvoEventHttp.validateContentType = function (actual, expected) {
-        if (actual !== expected) {
-            throw new Error("Invalid content-type: ".concat(actual, ". Expected: ").concat(expected));
-        }
-    };
-    /**
-     * Extracts event fields from the HTTP headers.
-     * @param headers - The HTTP headers containing event information.
-     * @returns An object with extracted event fields.
-     */
-    ArvoEventHttp.extractEventFieldsFromHeaders = function (headers) {
-        var eventFields = [
-            'id',
-            'type',
-            'accesscontrol',
-            'executionunits',
-            'traceparent',
-            'tracestate',
-            'datacontenttype',
-            'specversion',
-            'time',
-            'source',
-            'subject',
-            'to',
-            'redirectto',
-            'dataschema',
-        ];
-        return Object.fromEntries(eventFields
-            .map(function (field) { return ["ce-".concat(field), headers["ce-".concat(field)]]; })
-            .filter(function (_a) {
-            var value = _a[1];
-            return value !== undefined;
-        })
-            .map(function (_a) {
-            var key = _a[0], value = _a[1];
-            return [key.slice(3), value];
-        }));
-    };
-    /**
-     * Creates an error message for a missing required field.
-     * @param type - The type of the missing field.
-     * @param isHeader - A flag to distinguish between headers and structured payload
-     * @returns A formatted error message string.
-     */
-    ArvoEventHttp.createErrorMessageForMissingField = function (type, isHeader) {
-        if (isHeader) {
-            return "Missing required header field(s): ".concat(type);
-        }
-        return "Missing required field(s): ".concat(type);
-    };
-    /**
-     * Validates that all required fields are present in the event data.
-     * @param event - The event data to validate.
-     * @param isHeader - A flag to distinguish between headers and structured payload
-     * @throws {Error} If any required field is missing.
-     */
-    ArvoEventHttp.validateRequiredFields = function (event, isHeader) {
-        ['type', 'source', 'subject'].forEach(function (field) {
-            if (!event[field]) {
-                throw new Error(ArvoEventHttp.createErrorMessageForMissingField(isHeader ? "ce-".concat(field) : field, isHeader));
-            }
-        });
-    };
-    /**
-     * Extracts extension fields from the HTTP headers.
-     * @param headers - The HTTP headers containing event information.
-     * @returns An object with extracted extension fields.
-     */
-    ArvoEventHttp.extractExtensions = function (headers) {
-        var eventFields = [
-            'id',
-            'type',
-            'accesscontrol',
-            'executionunits',
-            'traceparent',
-            'tracestate',
-            'datacontenttype',
-            'specversion',
-            'time',
-            'source',
-            'subject',
-            'to',
-            'redirectto',
-            'dataschema',
-        ];
-        return Object.fromEntries(Object.entries(headers)
-            .filter(function (_a) {
-            var key = _a[0];
-            return key.startsWith('ce-') && !eventFields.includes(key.slice(3));
-        })
-            .map(function (_a) {
-            var key = _a[0], value = _a[1];
-            return [key.slice(3), value];
-        }));
-    };
-    /**
-     * Creates an ArvoEvent instance from extracted event data, payload, and extensions.
-     * @param event - The extracted event data.
-     * @param data - The event payload.
-     * @param extensions - The extracted extension fields.
-     * @returns A new ArvoEvent instance.
-     */
-    ArvoEventHttp.createArvoEvent = function (event, data, extensions) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-        return new ArvoEvent_1.default({
-            id: (_a = event.id) !== null && _a !== void 0 ? _a : (0, uuid_1.v4)(),
-            type: event.type,
-            accesscontrol: (_b = event.accesscontrol) !== null && _b !== void 0 ? _b : null,
-            executionunits: event.executionunits
-                ? Number(event.executionunits)
-                : null,
-            traceparent: (_c = event.traceparent) !== null && _c !== void 0 ? _c : null,
-            tracestate: (_d = event.tracestate) !== null && _d !== void 0 ? _d : null,
-            datacontenttype: (_e = event.datacontenttype) !== null && _e !== void 0 ? _e : schema_1.ArvoDataContentType,
-            specversion: (_f = event.specversion) !== null && _f !== void 0 ? _f : '1.0',
-            time: (_g = event.time) !== null && _g !== void 0 ? _g : (0, utils_1.createTimestamp)(),
-            source: event.source,
-            subject: event.subject,
-            to: (_h = event.to) !== null && _h !== void 0 ? _h : null,
-            redirectto: (_j = event.redirectto) !== null && _j !== void 0 ? _j : null,
-            dataschema: (_k = event.dataschema) !== null && _k !== void 0 ? _k : null,
-        }, data, extensions);
-    };
-    /**
-     * Creates an ArvoEvent instance from structured event data.
-     * @param eventData - The structured event data.
-     * @returns A new ArvoEvent instance.
-     */
-    ArvoEventHttp.createArvoEventFromStructured = function (eventData) {
-        var id = eventData.id, type = eventData.type, source = eventData.source, subject = eventData.subject, time = eventData.time, datacontenttype = eventData.datacontenttype, specversion = eventData.specversion, dataschema = eventData.dataschema, data = eventData.data, to = eventData.to, accesscontrol = eventData.accesscontrol, redirectto = eventData.redirectto, executionunits = eventData.executionunits, traceparent = eventData.traceparent, tracestate = eventData.tracestate, extensions = __rest(eventData, ["id", "type", "source", "subject", "time", "datacontenttype", "specversion", "dataschema", "data", "to", "accesscontrol", "redirectto", "executionunits", "traceparent", "tracestate"]);
-        return ArvoEventHttp.createArvoEvent({
-            id: id !== null && id !== void 0 ? id : (0, uuid_1.v4)(),
-            type: type,
-            source: source,
-            subject: subject,
-            time: time !== null && time !== void 0 ? time : (0, utils_1.createTimestamp)(),
-            datacontenttype: datacontenttype !== null && datacontenttype !== void 0 ? datacontenttype : schema_1.ArvoDataContentType,
-            specversion: specversion !== null && specversion !== void 0 ? specversion : '1.0',
-            dataschema: dataschema !== null && dataschema !== void 0 ? dataschema : null,
-            to: to !== null && to !== void 0 ? to : null,
-            accesscontrol: accesscontrol !== null && accesscontrol !== void 0 ? accesscontrol : null,
-            redirectto: redirectto !== null && redirectto !== void 0 ? redirectto : null,
-            executionunits: executionunits ? Number(executionunits) : null,
-            traceparent: traceparent !== null && traceparent !== void 0 ? traceparent : null,
-            tracestate: tracestate !== null && tracestate !== void 0 ? tracestate : null,
-        }, data !== null && data !== void 0 ? data : {}, extensions);
-    };
-    return ArvoEventHttp;
-}());
-exports.default = ArvoEventHttp;

package/dist/ArvoEventHttp/types.d.ts

@@ -1,9 +0,0 @@
-/**
- * Configuration object for ArvoEventHttp operations.
- */
-export type ArvoEventHttpConfig = {
-    /** HTTP headers */
-    headers: Record<string, string | number | boolean | null>;
-    /** Event data */
-    data: Record<string, any>;
-};

package/dist/ArvoEventHttp/types.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });