arvo-core 1.0.21 → 1.0.23

package/CHANGELOG.md

@@ -40,7 +40,7 @@
 
 - Fix a type bug in ArvoEvent creation
 
-## [1.0.21] - 2024-09-07
+## [1.0.23] - 2024-09-07
 
 - Updated OpenTelemetry propagation and fixed propagation in the event factory
 

package/dist/ArvoEvent/helpers.d.ts

@@ -1,11 +1,9 @@
 import ArvoEvent from '.';
-import { TelemetryContext } from '../OpenTelemetry/types';
 import { ArvoEventData, CloudEventExtension, CreateArvoEvent } from './types';
 /**
  * Creates an ArvoEvent with the provided data and extensions.
  *
  * This function creates a new ArvoEvent instance using the provided event data and optional extensions.
- * It also supports OpenTelemetry tracing if a telemetry context is provided.
  *
  * @template TData - The type of the event data, extending ArvoEventData.
  * @template TExtension - The type of the cloud event extension, extending CloudEventExtension.
@@ -13,7 +11,6 @@ import { ArvoEventData, CloudEventExtension, CreateArvoEvent } from './types';
  *
  * @param {CreateArvoEvent<TData>} event - The event data and metadata to create the ArvoEvent.
  * @param {TExtension} [extensions] - Optional cloud event extensions.
- * @param {TelemetryContext} [telemetry] - Optional telemetry context for tracing.
  *
  * @returns {ArvoEvent<TData, TExtension>} The created ArvoEvent instance.
  *
@@ -35,7 +32,6 @@ import { ArvoEventData, CloudEventExtension, CreateArvoEvent } from './types';
  *     data: { key: 'value' }
  *   },
  *   { customExtension: 'value' },
- *   telemetryContext
  * );
  */
-export declare const createArvoEvent: <TData extends ArvoEventData, TExtension extends CloudEventExtension, TType extends string>(event: CreateArvoEvent<TData, TType>, extensions?: TExtension, telemetry?: TelemetryContext) => ArvoEvent<TData, TExtension, TType>;
+export declare const createArvoEvent: <TData extends ArvoEventData, TExtension extends CloudEventExtension, TType extends string>(event: CreateArvoEvent<TData, TType>, extensions?: TExtension) => ArvoEvent<TData, TExtension, TType>;

package/dist/ArvoEvent/helpers.js

@@ -4,6 +4,7 @@ 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");
@@ -13,7 +14,6 @@ var uuid_1 = require("uuid");
  * Creates an ArvoEvent with the provided data and extensions.
  *
  * This function creates a new ArvoEvent instance using the provided event data and optional extensions.
- * It also supports OpenTelemetry tracing if a telemetry context is provided.
  *
  * @template TData - The type of the event data, extending ArvoEventData.
  * @template TExtension - The type of the cloud event extension, extending CloudEventExtension.
@@ -21,7 +21,6 @@ var uuid_1 = require("uuid");
  *
  * @param {CreateArvoEvent<TData>} event - The event data and metadata to create the ArvoEvent.
  * @param {TExtension} [extensions] - Optional cloud event extensions.
- * @param {TelemetryContext} [telemetry] - Optional telemetry context for tracing.
  *
  * @returns {ArvoEvent<TData, TExtension>} The created ArvoEvent instance.
  *
@@ -43,35 +42,49 @@ var uuid_1 = require("uuid");
  *     data: { key: 'value' }
  *   },
  *   { customExtension: 'value' },
- *   telemetryContext
  * );
  */
-var createArvoEvent = function (event, extensions, telemetry) {
-    return (0, OpenTelemetry_1.createOtelSpan)(telemetry || 'ArvoEvent Creation Tracer', "createArvoEvent<".concat(event.type, ">"), {}, function (telemetryContext) {
-        if (event.datacontenttype &&
-            event.datacontenttype !== schema_1.ArvoDataContentType) {
-            var warning = (0, utils_1.cleanString)("\n        Warning! The provided datacontenttype(=".concat(event.datacontenttype, ")\n        is not ArvoEvent compatible (=").concat(schema_1.ArvoDataContentType, "). There may \n        be some limited functionality.\n      "));
-            (0, OpenTelemetry_1.logToSpan)(telemetryContext.span, {
-                level: 'WARNING',
-                message: warning,
+var createArvoEvent = function (event, extensions) {
+    var span = OpenTelemetry_1.ArvoCoreTracer.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 {
+            if (event.datacontenttype &&
+                event.datacontenttype !== schema_1.ArvoDataContentType) {
+                var warning = (0, utils_1.cleanString)("\n        Warning! The provided datacontenttype(=".concat(event.datacontenttype, ")\n        is not ArvoEvent compatible (=").concat(schema_1.ArvoDataContentType, "). There may \n        be some limited functionality.\n      "));
+                (0, OpenTelemetry_1.logToSpan)(span, {
+                    level: 'WARNING',
+                    message: warning,
+                });
+            }
+            return new _1.default({
+                id: event.id || (0, uuid_1.v4)(),
+                type: event.type,
+                accesscontrol: event.accesscontrol || null,
+                executionunits: event.executionunits || null,
+                traceparent: event.traceparent || null,
+                tracestate: event.tracestate || null,
+                datacontenttype: event.datacontenttype || schema_1.ArvoDataContentType,
+                specversion: event.specversion || '1.0',
+                time: event.time || (0, utils_1.createTimestamp)(),
+                source: encodeURI(event.source),
+                subject: encodeURI(event.subject),
+                to: event.to ? encodeURI(event.to) : null,
+                redirectto: event.redirectto ? encodeURI(event.redirectto) : null,
+                dataschema: event.dataschema ? encodeURI(event.dataschema) : null,
+            }, event.data, extensions);
+        }
+        catch (error) {
+            (0, OpenTelemetry_1.exceptionToSpan)(span, error);
+            span.setStatus({
+                code: api_1.SpanStatusCode.ERROR,
+                message: error.message,
             });
+            throw error;
+        }
+        finally {
+            span.end();
         }
-        return new _1.default({
-            id: event.id || (0, uuid_1.v4)(),
-            type: event.type,
-            accesscontrol: event.accesscontrol || null,
-            executionunits: event.executionunits || null,
-            traceparent: event.traceparent || null,
-            tracestate: event.tracestate || null,
-            datacontenttype: event.datacontenttype || schema_1.ArvoDataContentType,
-            specversion: event.specversion || '1.0',
-            time: event.time || (0, utils_1.createTimestamp)(),
-            source: encodeURI(event.source),
-            subject: encodeURI(event.subject),
-            to: event.to ? encodeURI(event.to) : null,
-            redirectto: event.redirectto ? encodeURI(event.redirectto) : null,
-            dataschema: event.dataschema ? encodeURI(event.dataschema) : null,
-        }, event.data, extensions);
     });
 };
 exports.createArvoEvent = createArvoEvent;

package/dist/ArvoEventFactory/helpers.d.ts

@@ -1,5 +1,5 @@
-import ArvoEventFactory from ".";
-import ArvoContract from "../ArvoContract";
+import ArvoEventFactory from '.';
+import ArvoContract from '../ArvoContract';
 import { z } from 'zod';
 /**
  * Creates a ArvoEventFactory instance based on the provided contract.

package/dist/ArvoEventFactory/index.d.ts

@@ -1,7 +1,6 @@
-import ArvoContract from "../ArvoContract";
+import ArvoContract from '../ArvoContract';
 import { z } from 'zod';
-import { CreateArvoEvent } from "../ArvoEvent/types";
-import { TelemetryContext } from "../OpenTelemetry/types";
+import { CreateArvoEvent } from '../ArvoEvent/types';
 /**
  * A factory class for creating contractual ArvoEvents based on a given ArvoContract.
  *
@@ -13,7 +12,7 @@ import { TelemetryContext } from "../OpenTelemetry/types";
 export default class ArvoEventFactory<TUri extends string = string, TType extends string = string, TAcceptSchema extends z.ZodTypeAny = z.ZodTypeAny, TEmits extends Record<string, z.ZodTypeAny> = Record<string, z.ZodTypeAny>> {
     private contract;
     /**
-     * Creates an instance of ContractualArvoEventFactory.
+     * Creates an instance of ArvoEventFactory.
      *
      * @param contract - The ArvoContract to base the events on.
      */
@@ -24,13 +23,12 @@ export default class ArvoEventFactory<TUri extends string = string, TType extend
      * @template TExtension - The type of extensions to add to the event.
      * @param event - The event to create. The field 'type' is automatically infered
      * @param [extensions] - Optional extensions to add to the event.
-     * @param [telemetry] - Optional telemetry context for tracing.
      * @returns The created ArvoEvent as per the accept record of the contract.
      * @throws If the event data fails validation against the contract.
      */
     accepts<TExtension extends Record<string, any>>(event: Omit<CreateArvoEvent<z.infer<TAcceptSchema>, TType>, 'type'> & {
         to: string;
-    }, extensions?: TExtension, telemetry?: TelemetryContext): import("..").ArvoEvent<z.TypeOf<TAcceptSchema>, TExtension, TType>;
+    }, extensions?: TExtension): import("..").ArvoEvent<z.TypeOf<TAcceptSchema>, TExtension, TType>;
     /**
      * Creates an ArvoEvent as per one of the emits record in the contract.
      *
@@ -38,26 +36,24 @@ export default class ArvoEventFactory<TUri extends string = string, TType extend
      * @template TExtension - The type of extensions to add to the event.
      * @param event - The event to create.
      * @param [extensions] - Optional extensions to add to the event.
-     * @param [telemetry] - Optional telemetry context for tracing.
      * @returns The created ArvoEvent as per one of the emits records of the contract.
      * @throws If the event data fails validation against the contract.
      */
     emits<U extends keyof TEmits & string, TExtension extends Record<string, any>>(event: CreateArvoEvent<z.infer<TEmits[U]>, U> & {
         to: string;
-    }, extensions?: TExtension, telemetry?: TelemetryContext): import("..").ArvoEvent<z.TypeOf<TEmits[U]>, TExtension, U>;
+    }, extensions?: TExtension): import("..").ArvoEvent<z.TypeOf<TEmits[U]>, TExtension, U>;
     /**
      * Creates a system error ArvoEvent.
      *
      * @template TExtension - The type of extensions to add to the event.
      * @param event - The event to create, including the error.
      * @param [extensions] - Optional extensions to add to the event.
-     * @param [telemetry] - Optional telemetry context for tracing.
      * @returns The created system error ArvoEvent.
      */
     systemError<TExtension extends Record<string, any>>(event: Omit<CreateArvoEvent<any, any>, 'data' | 'type'> & {
         error: Error;
         to: string;
-    }, extensions?: TExtension, telemetry?: TelemetryContext): import("..").ArvoEvent<{
+    }, extensions?: TExtension): import("..").ArvoEvent<{
         errorName: string;
         errorMessage: string;
         errorStack: string | null;

package/dist/ArvoEventFactory/index.js

@@ -25,6 +25,7 @@ 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");
 /**
  * A factory class for creating contractual ArvoEvents based on a given ArvoContract.
  *
@@ -35,7 +36,7 @@ var OpenTelemetry_1 = require("../OpenTelemetry");
  */
 var ArvoEventFactory = /** @class */ (function () {
     /**
-     * Creates an instance of ContractualArvoEventFactory.
+     * Creates an instance of ArvoEventFactory.
      *
      * @param contract - The ArvoContract to base the events on.
      */
@@ -48,18 +49,32 @@ var ArvoEventFactory = /** @class */ (function () {
      * @template TExtension - The type of extensions to add to the event.
      * @param event - The event to create. The field 'type' is automatically infered
      * @param [extensions] - Optional extensions to add to the event.
-     * @param [telemetry] - Optional telemetry context for tracing.
      * @returns The created ArvoEvent as per the accept record of the contract.
      * @throws If the event data fails validation against the contract.
      */
-    ArvoEventFactory.prototype.accepts = function (event, extensions, telemetry) {
+    ArvoEventFactory.prototype.accepts = function (event, extensions) {
         var _this = this;
-        return (0, OpenTelemetry_1.createOtelSpan)(telemetry || 'ArvoEvent Creation Tracer', "ContractualArvoEventFactory<".concat(this.contract.uri, ">.accepts<").concat(this.contract.accepts.type, ">.create"), {}, function (telemetryContext) {
-            var validationResult = _this.contract.validateInput(_this.contract.accepts.type, event.data);
-            if (!validationResult.success) {
-                throw new Error("Accept Event data validation failed: ".concat(validationResult.error.message));
+        var span = OpenTelemetry_1.ArvoCoreTracer.startSpan("ArvoEventFactory<".concat(this.contract.uri, ">.accepts<").concat(this.contract.accepts.type, ">.create"));
+        return api_1.context.with(api_1.trace.setSpan(api_1.context.active(), span), function () {
+            span.setStatus({ code: api_1.SpanStatusCode.OK });
+            try {
+                var validationResult = _this.contract.validateInput(_this.contract.accepts.type, 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), { type: _this.contract.accepts.type, datacontenttype: schema_1.ArvoDataContentType, dataschema: _this.contract.uri, data: validationResult.data }), extensions);
+            }
+            catch (error) {
+                (0, OpenTelemetry_1.exceptionToSpan)(span, error);
+                span.setStatus({
+                    code: api_1.SpanStatusCode.ERROR,
+                    message: error.message,
+                });
+                throw error;
+            }
+            finally {
+                span.end();
             }
-            return (0, helpers_1.createArvoEvent)(__assign(__assign({}, event), { type: _this.contract.accepts.type, datacontenttype: schema_1.ArvoDataContentType, dataschema: _this.contract.uri, data: validationResult.data }), extensions, telemetryContext);
         });
     };
     /**
@@ -69,18 +84,32 @@ var ArvoEventFactory = /** @class */ (function () {
      * @template TExtension - The type of extensions to add to the event.
      * @param event - The event to create.
      * @param [extensions] - Optional extensions to add to the event.
-     * @param [telemetry] - Optional telemetry context for tracing.
      * @returns The created ArvoEvent as per one of the emits records of the contract.
      * @throws If the event data fails validation against the contract.
      */
-    ArvoEventFactory.prototype.emits = function (event, extensions, telemetry) {
+    ArvoEventFactory.prototype.emits = function (event, extensions) {
         var _this = this;
-        return (0, OpenTelemetry_1.createOtelSpan)(telemetry || 'ArvoEvent Creation Tracer', "ContractualArvoEventFactory<".concat(this.contract.uri, ">.emits<").concat(event.type, ">.create"), {}, function (telemetryContext) {
-            var validationResult = _this.contract.validateOutput(event.type, event.data);
-            if (!validationResult.success) {
-                throw new Error("Emit Event data validation failed: ".concat(validationResult.error.message));
+        var span = OpenTelemetry_1.ArvoCoreTracer.startSpan("ArvoEventFactory<".concat(this.contract.uri, ">.emits<").concat(event.type, ">.create"));
+        return api_1.context.with(api_1.trace.setSpan(api_1.context.active(), span), function () {
+            span.setStatus({ code: api_1.SpanStatusCode.OK });
+            try {
+                var validationResult = _this.contract.validateOutput(event.type, event.data);
+                if (!validationResult.success) {
+                    throw new Error("Emit Event data validation failed: ".concat(validationResult.error.message));
+                }
+                return (0, helpers_1.createArvoEvent)(__assign(__assign({}, event), { datacontenttype: schema_1.ArvoDataContentType, dataschema: _this.contract.uri, data: validationResult.data }), extensions);
+            }
+            catch (error) {
+                (0, OpenTelemetry_1.exceptionToSpan)(span, error);
+                span.setStatus({
+                    code: api_1.SpanStatusCode.ERROR,
+                    message: error.message,
+                });
+                throw error;
+            }
+            finally {
+                span.end();
             }
-            return (0, helpers_1.createArvoEvent)(__assign(__assign({}, event), { datacontenttype: schema_1.ArvoDataContentType, dataschema: _this.contract.uri, data: validationResult.data }), extensions, telemetryContext);
         });
     };
     /**
@@ -89,18 +118,32 @@ var ArvoEventFactory = /** @class */ (function () {
      * @template TExtension - The type of extensions to add to the event.
      * @param event - The event to create, including the error.
      * @param [extensions] - Optional extensions to add to the event.
-     * @param [telemetry] - Optional telemetry context for tracing.
      * @returns The created system error ArvoEvent.
      */
-    ArvoEventFactory.prototype.systemError = function (event, extensions, telemetry) {
+    ArvoEventFactory.prototype.systemError = function (event, extensions) {
         var _this = this;
-        return (0, OpenTelemetry_1.createOtelSpan)(telemetry || 'ArvoEvent Creation Tracer', "ContractualArvoEventFactory<".concat(this.contract.uri, ">.systemError<sys.").concat(this.contract.accepts.type, ".error>.create"), {}, function (telemetryContext) {
-            var error = event.error, _events = __rest(event, ["error"]);
-            return (0, helpers_1.createArvoEvent)(__assign(__assign({}, event), { type: "sys.".concat(_this.contract.accepts.type, ".error"), data: {
-                    errorName: error.name,
-                    errorMessage: error.message,
-                    errorStack: error.stack || null,
-                }, datacontenttype: schema_1.ArvoDataContentType, dataschema: _this.contract.uri }), extensions, telemetryContext);
+        var span = OpenTelemetry_1.ArvoCoreTracer.startSpan("ArvoEventFactory<".concat(this.contract.uri, ">.systemError<sys.").concat(this.contract.accepts.type, ".error>.create"));
+        return api_1.context.with(api_1.trace.setSpan(api_1.context.active(), span), function () {
+            span.setStatus({ code: api_1.SpanStatusCode.OK });
+            try {
+                var error = event.error, _events = __rest(event, ["error"]);
+                return (0, helpers_1.createArvoEvent)(__assign(__assign({}, event), { type: "sys.".concat(_this.contract.accepts.type, ".error"), data: {
+                        errorName: error.name,
+                        errorMessage: error.message,
+                        errorStack: error.stack || null,
+                    }, datacontenttype: schema_1.ArvoDataContentType, dataschema: _this.contract.uri }), extensions);
+            }
+            catch (error) {
+                (0, OpenTelemetry_1.exceptionToSpan)(span, error);
+                span.setStatus({
+                    code: api_1.SpanStatusCode.ERROR,
+                    message: error.message,
+                });
+                throw error;
+            }
+            finally {
+                span.end();
+            }
         });
     };
     return ArvoEventFactory;

package/dist/OpenTelemetry/index.d.ts

@@ -1,18 +1,9 @@
-import { Context, Span, SpanOptions } from '@opentelemetry/api';
-import { TelemetryCarrier, TelemetryLogLevel, TelemetryContext } from './types';
+import { Span } from '@opentelemetry/api';
+import { TelemetryLogLevel, OpenTelemetryHeaders } from './types';
 /**
- * Retrieves the active context based on the provided trace header.
- * @param traceparent - The trace header string.
- * @returns The active context.
+ * A tracer instance for the ArvoCore package.
  */
-export declare const getTelemetryContext: (carrier?: TelemetryCarrier) => Context;
-/**
- * Parses the context from a span and active context.
- * @param span - The span to parse the context from.
- * @param activeContext - The active context (optional, defaults to the current active context).
- * @returns The parsed telemetry context.
- */
-export declare const getTelemetryCarrier: (span: Span, activeContext?: Context) => TelemetryCarrier;
+export declare const ArvoCoreTracer: import("@opentelemetry/api").Tracer;
 /**
  * Logs a message to a span with additional parameters.
  * @param span - The span to log the message to.
@@ -30,67 +21,13 @@ export declare const logToSpan: (span: Span, params: {
  * @param level - The log level for the exception.
  * @param error - The error object to be logged.
  */
-export declare const exceptionToSpan: (span: Span, level: TelemetryLogLevel, error: Error) => void;
-/**
- * Creates a new OpenTelemetry span and executes the provided function within its context.
- *
- * This function enhances tracing by creating a new span, executing the given function within
- * that span's context, and properly handling any errors that may occur. It also ensures that
- * the wrapped function has access to the current span.
- *
- * @template TArgs - The type of the arguments array for the wrapped function.
- * @template TReturn - The return type of the wrapped function.
- *
- * @param {TelemetryContext | string} telemetryContext - The OpenTelemetry context object or a tracer name.
- *   If a string is provided, it will be used as the tracer name to retrieve the tracer.
- *   If a `TelemetryContext` object is provided, it should contain the span, tracer, and carrier information.
- * @param {string} spanName - The name of the span to be created.
- * @param {SpanOptions} [spanOptions] - Optional configuration for the span, such as attributes, links, and sampling.
- * @param {(telemetryContext: TelemetryContext, ...args: TArgs) => TReturn} wrappedFunction - The function to be executed within the new span.
- *   This function will receive the `TelemetryContext` object as its first argument, containing the current span, tracer, and carrier.
- *   The rest of the arguments will be passed as additional parameters to the wrapped function.
- * @param {ThisParameterType<TFunction>} [thisArg] - The 'this' context to be used when calling the wrapped function.
- * @param {...TArgs} args - The arguments to be passed to the wrapped function.
- *
- * @returns {TReturn} The result of the wrapped function execution.
- *
- * @throws {Error} Rethrows any error that occurs during the execution of the wrapped function.
- *   The error will be logged to the span with an 'ERROR' level, and the span status will be set to `SpanStatusCode.ERROR`.
- *
- * @example
- * // Using with TelemetryContext
- * const telemetryContext: TelemetryContext = {
- *   span: currentSpan,
- *   tracer: currentTracer,
- *   carrier: { traceparent: 'traceparent-value', tracestate: 'tracestate-value' }
- * };
- * const result = createOtelSpan(
- *   telemetryContext,
- *   'ProcessOrder',
- *   { attributes: { orderId: '12345' } },
- *   (telemetryContext, orderId) => {
- *     telemetryContext.span.addEvent('Processing order');
- *     return processOrder(orderId);
- *   },
- *   null,
- *   '12345'
- * );
- *
- * @example
- * // Using with tracer name
- * const result = createOtelSpan(
- *   'OrderService',
- *   'FetchOrderDetails',
- *   undefined,
- *   (telemetryContext, orderId) => {
- *     telemetryContext.span.setAttribute('orderId', orderId);
- *     return fetchOrderDetails(orderId);
- *   },
- *   null,
- *   '12345'
- * );
- */ export declare const createOtelSpan: <TArgs extends unknown[], TReturn>(telemetryContext: TelemetryContext | string, spanName: string, spanOptions: SpanOptions | undefined, wrappedFunction: (telemetryContext: TelemetryContext, ...args: TArgs) => TReturn, thisArg?: ThisParameterType<typeof wrappedFunction>, ...args: TArgs) => TReturn;
+export declare const exceptionToSpan: (span: Span, error: Error) => void;
 /**
  * A constant representing a null or not applicable value in OpenTelemetry context.
  */
 export declare const OTelNull = "N/A";
+/**
+ * Retrieves the current OpenTelemetry headers from the active context.
+ * @returns An object containing the traceparent and tracestate headers.
+ */
+export declare function currentOpenTelemetryHeaders(): OpenTelemetryHeaders;

package/dist/OpenTelemetry/index.js

@@ -10,49 +10,17 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-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));
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OTelNull = exports.createOtelSpan = exports.exceptionToSpan = exports.logToSpan = exports.getTelemetryCarrier = exports.getTelemetryContext = void 0;
+exports.OTelNull = exports.exceptionToSpan = exports.logToSpan = exports.ArvoCoreTracer = void 0;
+exports.currentOpenTelemetryHeaders = currentOpenTelemetryHeaders;
 var api_1 = require("@opentelemetry/api");
+var utils_1 = require("./utils");
+var core_1 = require("@opentelemetry/core");
+var pkg = (0, utils_1.getPackageInfo)();
 /**
- * Retrieves the active context based on the provided trace header.
- * @param traceparent - The trace header string.
- * @returns The active context.
- */
-var getTelemetryContext = function (carrier) {
-    if (carrier && (carrier.traceparent || carrier.tracestate)) {
-        return api_1.propagation.extract(api_1.ROOT_CONTEXT, carrier);
-    }
-    return api_1.context.active();
-};
-exports.getTelemetryContext = getTelemetryContext;
-/**
- * Parses the context from a span and active context.
- * @param span - The span to parse the context from.
- * @param activeContext - The active context (optional, defaults to the current active context).
- * @returns The parsed telemetry context.
+ * A tracer instance for the ArvoCore package.
  */
-var getTelemetryCarrier = function (span, activeContext) {
-    if (activeContext === void 0) { activeContext = api_1.context.active(); }
-    var carrier = {
-        traceparent: null,
-        tracestate: null,
-    };
-    api_1.propagation.inject(activeContext, carrier);
-    if (!carrier.traceparent) {
-        carrier.traceparent = "00-".concat(span.spanContext().traceId, "-").concat(span.spanContext().spanId, "-0").concat(span.spanContext().traceFlags);
-    }
-    return carrier;
-};
-exports.getTelemetryCarrier = getTelemetryCarrier;
+exports.ArvoCoreTracer = api_1.trace.getTracer(pkg.name, pkg.version);
 /**
  * Logs a message to a span with additional parameters.
  * @param span - The span to log the message to.
@@ -70,118 +38,38 @@ exports.logToSpan = logToSpan;
  * @param level - The log level for the exception.
  * @param error - The error object to be logged.
  */
-var exceptionToSpan = function (span, level, error) {
-    (0, exports.logToSpan)(span, {
-        level: level,
-        message: error.message,
-    });
+var exceptionToSpan = function (span, error) {
     span.setAttributes({
-        'exception.type': "[".concat(level, "] ").concat(error.name),
+        'exception.type': error.name,
         'exception.message': error.message,
-        'exception.stacktrace': error.stack || exports.OTelNull,
     });
+    span.recordException(error);
 };
 exports.exceptionToSpan = exceptionToSpan;
-/**
- * Creates a new OpenTelemetry span and executes the provided function within its context.
- *
- * This function enhances tracing by creating a new span, executing the given function within
- * that span's context, and properly handling any errors that may occur. It also ensures that
- * the wrapped function has access to the current span.
- *
- * @template TArgs - The type of the arguments array for the wrapped function.
- * @template TReturn - The return type of the wrapped function.
- *
- * @param {TelemetryContext | string} telemetryContext - The OpenTelemetry context object or a tracer name.
- *   If a string is provided, it will be used as the tracer name to retrieve the tracer.
- *   If a `TelemetryContext` object is provided, it should contain the span, tracer, and carrier information.
- * @param {string} spanName - The name of the span to be created.
- * @param {SpanOptions} [spanOptions] - Optional configuration for the span, such as attributes, links, and sampling.
- * @param {(telemetryContext: TelemetryContext, ...args: TArgs) => TReturn} wrappedFunction - The function to be executed within the new span.
- *   This function will receive the `TelemetryContext` object as its first argument, containing the current span, tracer, and carrier.
- *   The rest of the arguments will be passed as additional parameters to the wrapped function.
- * @param {ThisParameterType<TFunction>} [thisArg] - The 'this' context to be used when calling the wrapped function.
- * @param {...TArgs} args - The arguments to be passed to the wrapped function.
- *
- * @returns {TReturn} The result of the wrapped function execution.
- *
- * @throws {Error} Rethrows any error that occurs during the execution of the wrapped function.
- *   The error will be logged to the span with an 'ERROR' level, and the span status will be set to `SpanStatusCode.ERROR`.
- *
- * @example
- * // Using with TelemetryContext
- * const telemetryContext: TelemetryContext = {
- *   span: currentSpan,
- *   tracer: currentTracer,
- *   carrier: { traceparent: 'traceparent-value', tracestate: 'tracestate-value' }
- * };
- * const result = createOtelSpan(
- *   telemetryContext,
- *   'ProcessOrder',
- *   { attributes: { orderId: '12345' } },
- *   (telemetryContext, orderId) => {
- *     telemetryContext.span.addEvent('Processing order');
- *     return processOrder(orderId);
- *   },
- *   null,
- *   '12345'
- * );
- *
- * @example
- * // Using with tracer name
- * const result = createOtelSpan(
- *   'OrderService',
- *   'FetchOrderDetails',
- *   undefined,
- *   (telemetryContext, orderId) => {
- *     telemetryContext.span.setAttribute('orderId', orderId);
- *     return fetchOrderDetails(orderId);
- *   },
- *   null,
- *   '12345'
- * );
- */ var createOtelSpan = function (telemetryContext, spanName, spanOptions, wrappedFunction, thisArg) {
-    var args = [];
-    for (var _i = 5; _i < arguments.length; _i++) {
-        args[_i - 5] = arguments[_i];
-    }
-    var activeContext = api_1.ROOT_CONTEXT;
-    var activeTracer;
-    if (typeof telemetryContext === 'string') {
-        activeTracer = api_1.trace.getTracer(telemetryContext);
-    }
-    else {
-        activeContext = (0, exports.getTelemetryContext)(telemetryContext.carrier);
-        activeTracer = telemetryContext.tracer;
-    }
-    var newSpan = activeTracer.startSpan(spanName, spanOptions, activeContext);
-    newSpan.setStatus({
-        code: api_1.SpanStatusCode.OK,
-    });
-    try {
-        var result = api_1.context.with(api_1.trace.setSpan(activeContext, newSpan), function () {
-            return wrappedFunction.call.apply(wrappedFunction, __spreadArray([thisArg,
-                {
-                    span: newSpan,
-                    tracer: activeTracer,
-                    carrier: (0, exports.getTelemetryCarrier)(newSpan, activeContext),
-                }], args, false));
-        });
-        newSpan.end();
-        return result;
-    }
-    catch (error) {
-        (0, exports.exceptionToSpan)(newSpan, 'ERROR', error);
-        newSpan.setStatus({
-            code: api_1.SpanStatusCode.ERROR,
-            message: error.message,
-        });
-        newSpan.end();
-        throw error;
-    }
-};
-exports.createOtelSpan = createOtelSpan;
 /**
  * A constant representing a null or not applicable value in OpenTelemetry context.
  */
 exports.OTelNull = 'N/A';
+/**
+ * Retrieves the current OpenTelemetry headers from the active context.
+ * @returns An object containing the traceparent and tracestate headers.
+ */
+function currentOpenTelemetryHeaders() {
+    var propagator = new core_1.W3CTraceContextPropagator();
+    var carrier = {
+        traceparent: null,
+        tracestate: null
+    };
+    var setter = {
+        set: function (carrier, key, value) {
+            if (carrier && typeof carrier === 'object') {
+                carrier[key] = value;
+            }
+        },
+    };
+    propagator.inject(api_1.context.active(), carrier, setter);
+    return {
+        traceparent: carrier.traceparent,
+        tracestate: carrier.tracestate
+    };
+}

package/dist/OpenTelemetry/types.d.ts

@@ -1,4 +1,3 @@
-import { Span, Tracer } from '@opentelemetry/api';
 /**
  * Represents the available log levels for telemetry.
  * - DEBUG: Used for detailed information, typically of interest only when diagnosing problems.
@@ -12,29 +11,9 @@ export type TelemetryLogLevel = 'DEBUG' | 'INFO' | 'WARNING' | 'ERROR' | 'CRITIC
  * Represents the context for telemetry.
  * See reference standard documentation [here](https://www.w3.org/TR/trace-context/#design-overview)
  */
-export type TelemetryCarrier = {
+export type OpenTelemetryHeaders = {
     /** The traceparent header value */
     traceparent: string | null;
     /** The tracestate header value */
     tracestate: string | null;
 };
-/**
- * Represents the OpenTelemetry context for a handler.
- * See reference documentation [here](https://opentelemetry.io/docs/languages/js/instrumentation/#traces)
- */
-export type TelemetryContext = {
-    /**
-     * The current OpenTelemetry Span. If passed to a function,
-     * then for that function, this is the parent span object
-     */
-    span: Span;
-    /**
-     * The current OpenTelemetry tracer object being
-     * used.
-     */
-    tracer: Tracer;
-    /**
-     * The telemetry headers
-     */
-    carrier: TelemetryCarrier;
-};

package/dist/OpenTelemetry/utils.d.ts

@@ -0,0 +1,4 @@
+export declare function getPackageInfo(): {
+    name: string;
+    version: string;
+};

package/dist/OpenTelemetry/utils.js

@@ -0,0 +1,44 @@
+"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.getPackageInfo = getPackageInfo;
+var fs = __importStar(require("fs"));
+var path = __importStar(require("path"));
+function getPackageInfo() {
+    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: 'Unknown', version: 'Unknown' };
+    }
+}

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, getTelemetryContext, getTelemetryCarrier, createOtelSpan, OTelNull } from './OpenTelemetry';
-import { TelemetryCarrier, TelemetryContext, TelemetryLogLevel } from './OpenTelemetry/types';
+import { exceptionToSpan, logToSpan, OTelNull } from './OpenTelemetry';
+import { OpenTelemetryHeaders, TelemetryLogLevel } from './OpenTelemetry/types';
 import { validateURI, cleanString } from './utils';
 import ArvoContract from './ArvoContract';
 import { createArvoContract, InferArvoContract } from './ArvoContract/helpers';
@@ -80,4 +80,4 @@ declare const ArvoEventSchemas: {
         tracestate: string | null;
     }>;
 };
-export { ArvoEvent, createArvoEvent, ArvoDataContentType, ArvoEventData, CloudEventExtension, ArvoEventSchemas, CloudEventContext, ArvoExtension, OpenTelemetryExtension, CreateArvoEvent, exceptionToSpan, logToSpan, getTelemetryCarrier, getTelemetryContext, createOtelSpan, TelemetryCarrier, TelemetryContext, TelemetryLogLevel, OTelNull, validateURI, cleanString, ArvoContract, createArvoContract, ArvoContractValidators, ArvoContractRecord, InferArvoContract, IArvoContract, ResolveArvoContractRecord, ArvoContractLibrary, createArvoContractLibrary, ArvoEventFactory, createArvoEventFactory, ArvoErrorSchema };
+export { ArvoEvent, createArvoEvent, ArvoDataContentType, ArvoEventData, CloudEventExtension, ArvoEventSchemas, CloudEventContext, ArvoExtension, OpenTelemetryExtension, CreateArvoEvent, exceptionToSpan, logToSpan, OpenTelemetryHeaders, TelemetryLogLevel, OTelNull, validateURI, cleanString, ArvoContract, createArvoContract, ArvoContractValidators, ArvoContractRecord, InferArvoContract, IArvoContract, ResolveArvoContractRecord, ArvoContractLibrary, createArvoContractLibrary, ArvoEventFactory, createArvoEventFactory, ArvoErrorSchema, };

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.ArvoErrorSchema = exports.createArvoEventFactory = exports.ArvoEventFactory = exports.createArvoContractLibrary = exports.ArvoContractLibrary = exports.ArvoContractValidators = exports.createArvoContract = exports.ArvoContract = exports.cleanString = exports.validateURI = exports.OTelNull = exports.createOtelSpan = exports.getTelemetryContext = exports.getTelemetryCarrier = exports.logToSpan = exports.exceptionToSpan = exports.ArvoEventSchemas = exports.ArvoDataContentType = exports.createArvoEvent = exports.ArvoEvent = void 0;
+exports.ArvoErrorSchema = exports.createArvoEventFactory = exports.ArvoEventFactory = exports.createArvoContractLibrary = exports.ArvoContractLibrary = exports.ArvoContractValidators = exports.createArvoContract = exports.ArvoContract = exports.cleanString = exports.validateURI = exports.OTelNull = exports.logToSpan = exports.exceptionToSpan = exports.ArvoEventSchemas = 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");
@@ -13,9 +13,6 @@ Object.defineProperty(exports, "createArvoEvent", { enumerable: true, get: funct
 var OpenTelemetry_1 = require("./OpenTelemetry");
 Object.defineProperty(exports, "exceptionToSpan", { enumerable: true, get: function () { return OpenTelemetry_1.exceptionToSpan; } });
 Object.defineProperty(exports, "logToSpan", { enumerable: true, get: function () { return OpenTelemetry_1.logToSpan; } });
-Object.defineProperty(exports, "getTelemetryContext", { enumerable: true, get: function () { return OpenTelemetry_1.getTelemetryContext; } });
-Object.defineProperty(exports, "getTelemetryCarrier", { enumerable: true, get: function () { return OpenTelemetry_1.getTelemetryCarrier; } });
-Object.defineProperty(exports, "createOtelSpan", { enumerable: true, get: function () { return OpenTelemetry_1.createOtelSpan; } });
 Object.defineProperty(exports, "OTelNull", { enumerable: true, get: function () { return OpenTelemetry_1.OTelNull; } });
 var utils_1 = require("./utils");
 Object.defineProperty(exports, "validateURI", { enumerable: true, get: function () { return utils_1.validateURI; } });

package/package.json

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