arvo-event-handler 1.0.4 → 1.0.5

package/dist/ArvoEventHandler/index.js

@@ -38,9 +38,9 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var arvo_core_1 = require("arvo-core");
 var schema_1 = require("arvo-core/dist/ArvoEvent/schema");
-var OpenTelemetry_1 = require("../OpenTelemetry");
 var api_1 = require("@opentelemetry/api");
 var utils_1 = require("../utils");
+var utils_2 = require("../OpenTelemetry/utils");
 /**
  * Represents an event handler for Arvo contracts.
  *
@@ -136,27 +136,16 @@ var ArvoEventHandler = /** @class */ (function () {
      */
     ArvoEventHandler.prototype.execute = function (event) {
         return __awaiter(this, void 0, void 0, function () {
-            var spanName, spanOptions, span, inheritedContext, eventFactory;
-            var _a;
+            var span, eventFactory;
             var _this = this;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
                     case 0:
-                        spanName = "ArvoEventHandler<".concat(this.contract.uri, ">.execute<").concat(event.type, ">");
-                        spanOptions = {
+                        span = (0, utils_2.createSpanFromEvent)("ArvoEventHandler<".concat(this.contract.uri, ">.execute<").concat(event.type, ">"), event, {
                             kind: this.openTelemetrySpanKind,
-                            attributes: (_a = {},
-                                _a[arvo_core_1.OpenInference.ATTR_SPAN_KIND] = this.openInferenceSpanKind,
-                                _a[arvo_core_1.ArvoExecution.ATTR_SPAN_KIND] = this.arvoExecutionSpanKind,
-                                _a),
-                        };
-                        if (event.traceparent) {
-                            inheritedContext = (0, OpenTelemetry_1.extractContext)(event.traceparent, event.tracestate);
-                            span = OpenTelemetry_1.ArvoEventHandlerTracer.startSpan(spanName, spanOptions, inheritedContext);
-                        }
-                        else {
-                            span = OpenTelemetry_1.ArvoEventHandlerTracer.startSpan(spanName, spanOptions);
-                        }
+                            openInference: this.openInferenceSpanKind,
+                            arvoExecution: this.arvoExecutionSpanKind
+                        });
                         eventFactory = (0, arvo_core_1.createArvoEventFactory)(this.contract);
                         return [4 /*yield*/, api_1.context.with(api_1.trace.setSpan(api_1.context.active(), span), function () { return __awaiter(_this, void 0, void 0, function () {
                                 var otelSpanHeaders, inputEventValidation, _handleOutput, outputs, error_1, result;
@@ -228,7 +217,7 @@ var ArvoEventHandler = /** @class */ (function () {
                                     }
                                 });
                             }); })];
-                    case 1: return [2 /*return*/, _b.sent()];
+                    case 1: return [2 /*return*/, _a.sent()];
                 }
             });
         });

package/package.json

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