@versori/run 0.2.1 → 0.2.2-alpha.0

package/script/src/interpreter/memory/MemoryInterpreter.js

@@ -4,11 +4,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MemoryInterpreter = void 0;
-const express_xml_bodyparser_1 = __importDefault(require("express-xml-bodyparser"));
+const api_1 = __importDefault(require("@opentelemetry/api"));
+const exporter_trace_otlp_proto_1 = require("@opentelemetry/exporter-trace-otlp-proto");
+const resources_1 = require("@opentelemetry/resources");
+const sdk_node_1 = require("@opentelemetry/sdk-node");
 const express_1 = __importDefault(require("express"));
+const express_xml_bodyparser_1 = __importDefault(require("express-xml-bodyparser"));
 const rxjs_1 = require("rxjs");
 const ContextProvider_js_1 = require("../../context/ContextProvider.js");
 const default_js_1 = require("../../dsl/http/default.js");
+const constants_js_1 = require("../../dsl/http/versori/constants.js");
+const cronapi_js_1 = require("../../dsl/http/versori/cronapi.js");
 const platformapi_js_1 = require("../../dsl/http/versori/platformapi.js");
 const roundtripper_js_1 = require("../../dsl/http/versori/roundtripper.js");
 const Workflow_js_1 = require("../../dsl/Workflow.js");
@@ -16,9 +22,8 @@ const MemoryKeyValueProvider_js_1 = require("../../kv/memory/MemoryKeyValueProvi
 const NatsKeyValueProvider_js_1 = require("../../kv/nats/NatsKeyValueProvider.js");
 const ConsoleLogger_js_1 = require("../../observability/logging/ConsoleLogger.js");
 const ObservableCompiler_js_1 = require("./ObservableCompiler.js");
-const cronapi_js_1 = require("../../dsl/http/versori/cronapi.js");
 class MemoryInterpreter {
-    constructor(log, compiler, contextProvider, roundTripperFactory, router, cronRegistry, connectionProvider, cronProvider) {
+    constructor(log, compiler, contextProvider, roundTripperFactory, router, cronRegistry, connectionProvider, cronProvider, tracer, otelSDK) {
         Object.defineProperty(this, "log", {
             enumerable: true,
             configurable: true,
@@ -67,6 +72,18 @@ class MemoryInterpreter {
             writable: true,
             value: cronProvider
         });
+        Object.defineProperty(this, "tracer", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: tracer
+        });
+        Object.defineProperty(this, "otelSDK", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: otelSDK
+        });
         Object.defineProperty(this, "registeredWorkflows", {
             enumerable: true,
             configurable: true,
@@ -92,7 +109,7 @@ class MemoryInterpreter {
             value: false
         });
         if (typeof this.log === 'undefined') {
-            // this captures the old way of instantiating the MemoryInterpreter and provides an 
+            // this captures the old way of instantiating the MemoryInterpreter and provides an
             // error message back to the user to let them know they should use the new way.
             throw new Error('MemoryInterpreter should not be instantiated directly. Use MemoryInterpreter.newInstance() instead.');
         }
@@ -100,18 +117,47 @@ class MemoryInterpreter {
     static async newInstance(options = {}) {
         const log = options.logger || new ConsoleLogger_js_1.ConsoleLogger('debug');
         const compiler = options.compiler || new ObservableCompiler_js_1.ObservableCompiler();
+        const serviceName = Deno.env.get(constants_js_1.envVarProjectId) || 'example-service';
+        const environmentID = Deno.env.get(constants_js_1.envVarEnvId) || 'development';
+        const version = Deno.env.get(constants_js_1.envVarVersion) || '1.0.0';
+        const environment = Deno.env.get(constants_js_1.envVarEnvironmentName) || 'development';
+        const orgId = Deno.env.get(constants_js_1.envVarOrgId) || 'development';
+        const orgSlug = Deno.env.get(constants_js_1.envVarOrgSlug) || 'development';
+        const otelTracesURL = Deno.env.get(constants_js_1.envVarOtelTracesURL);
+        let otelSDK;
+        // Do NOT change those attributes, they are used by the API to filter on
+        const resource = (0, resources_1.resourceFromAttributes)({
+            'service.id': serviceName,
+            'service.environment': environment,
+            'service.environment_id': environmentID,
+            'service.version': version,
+            'service.organisation_id': orgId,
+            'service.organisation_slug': orgSlug,
+        });
+        if (otelTracesURL && serviceName) {
+            otelSDK = new sdk_node_1.NodeSDK({
+                traceExporter: new exporter_trace_otlp_proto_1.OTLPTraceExporter({
+                    url: otelTracesURL,
+                }),
+                serviceName: serviceName,
+                resource: resource,
+            });
+            log.info('Starting OpenTelemetry SDK');
+            otelSDK.start();
+        }
+        const tracer = api_1.default.trace.getTracer(serviceName, version);
         const roundTripperFactory = options.skipVersoriCredentials
             ? new default_js_1.DefaultRoundTripperFactory()
-            : roundtripper_js_1.VersoriCredentialsFactory.fromEnv(log);
+            : roundtripper_js_1.VersoriCredentialsFactory.fromEnv(log, tracer);
         if (options.contextProvider) {
             // no need to set up a key-value provider if options.contextProvider is already
             // initialised.
-            return new MemoryInterpreter(log, compiler, options.contextProvider, roundTripperFactory, express_1.default.Router(), new Map(), platformapi_js_1.PlatformAPIClient.fromEnv(), cronapi_js_1.CronAPIClient.fromEnv());
+            return new MemoryInterpreter(log, compiler, options.contextProvider, roundTripperFactory, express_1.default.Router(), new Map(), platformapi_js_1.PlatformAPIClient.fromEnv(), cronapi_js_1.CronAPIClient.fromEnv(), tracer, otelSDK);
         }
         const kvp = await (options.skipVersoriCredentials
             ? new MemoryKeyValueProvider_js_1.MemoryKeyValueProvider()
             : NatsKeyValueProvider_js_1.NatsKeyValueProvider.fromEnv());
-        return new MemoryInterpreter(log, compiler, new ContextProvider_js_1.ContextProviderImpl(log, kvp, roundTripperFactory.credentials()), roundTripperFactory, express_1.default.Router(), new Map(), platformapi_js_1.PlatformAPIClient.fromEnv(), cronapi_js_1.CronAPIClient.fromEnv());
+        return new MemoryInterpreter(log, compiler, new ContextProvider_js_1.ContextProviderImpl(log, kvp, roundTripperFactory.credentials()), roundTripperFactory, express_1.default.Router(), new Map(), platformapi_js_1.PlatformAPIClient.fromEnv(), cronapi_js_1.CronAPIClient.fromEnv(), tracer, otelSDK);
     }
     register(workflow, options) {
         const localAbortController = new AbortController();
@@ -125,11 +171,12 @@ class MemoryInterpreter {
         const compilerContext = {
             compiler: this.compiler,
             log: this.log,
+            tracer: this.tracer,
             contextProvider: this.contextProvider,
             roundTripperFactory: this.roundTripperFactory,
             router: this.router,
             cronRegistry: this.cronRegistry,
-            connectionProvider: this.connectionProvider
+            connectionProvider: this.connectionProvider,
         };
         const trigger$ = this.compiler.compileTrigger(compilerContext, workflow.trigger, combinedSignal);
         const task$ = this.compiler.compileTask(compilerContext, workflow.task);
@@ -140,7 +187,7 @@ class MemoryInterpreter {
             sigintListener: () => {
                 this.log.info('Received SIGINT, shutting down workflow');
                 localAbortController.abort();
-            }
+            },
         };
         this.registeredWorkflows.push(registration);
         return registration;
@@ -157,8 +204,8 @@ class MemoryInterpreter {
         };
         app.use((0, express_xml_bodyparser_1.default)(xml2jsDefaults));
         // Add health check route
-        this.router.get("/health", (_req, res) => {
-            res.json({ status: "healthy" });
+        this.router.get('/health', (_req, res) => {
+            res.json({ status: 'healthy' });
         });
         // Add router to the application
         app.use(this.router);
@@ -169,7 +216,9 @@ class MemoryInterpreter {
                 .pipe((0, rxjs_1.tap)((ctx) => {
                 ctx.log.info('MemoryInterpreter.executionStarted', { data: ctx.data });
             }), (0, rxjs_1.mergeMap)((ctx) => (0, rxjs_1.of)(ctx).pipe(registration.task$, (0, rxjs_1.catchError)((err) => {
-                ctx.log.error('MemoryInterpreter.executionError', { error: err instanceof Error ? err.toString() : err });
+                ctx.log.error('MemoryInterpreter.executionError', {
+                    error: err instanceof Error ? err.toString() : err,
+                });
                 try {
                     ctx.options.onError?.(ctx.withData(err));
                 }
@@ -202,7 +251,9 @@ class MemoryInterpreter {
                     this.contextProvider.destroy(ctx);
                 },
                 error: (err) => {
-                    this.log.error('MemoryInterpreter.error', { error: err instanceof Error ? err.toString() : err });
+                    this.log.error('MemoryInterpreter.error', {
+                        error: err instanceof Error ? err.toString() : err,
+                    });
                     Deno.removeSignalListener('SIGINT', registration.sigintListener);
                 },
                 complete: () => {
@@ -218,7 +269,9 @@ class MemoryInterpreter {
             this.cronProvider.updateCrons(this.cronRegistry);
         }
         catch (err) {
-            this.log.error('MemoryInterpreter.updateCronsError', { error: err instanceof Error ? err.toString() : err });
+            this.log.error('MemoryInterpreter.updateCronsError', {
+                error: err instanceof Error ? err.toString() : err,
+            });
             throw new Error('Unable to register scheduler tasks with central cron provider');
         }
         this.server = app.listen(port, () => {
@@ -263,6 +316,7 @@ class MemoryInterpreter {
         });
     }
     async stop() {
+        this.otelSDK?.shutdown();
         if (this.shutdownServer) {
             this.shutdownServer();
         }

package/script/src/interpreter/memory/ObservableCompiler.d.ts

@@ -7,9 +7,11 @@ import { ContextProvider } from '../../context/ContextProvider.js';
 import { ContextImpl } from '../../context/Context.js';
 import { ConnectionProvider, RoundTripperFactory } from '../../dsl/http/types.js';
 import { Router } from 'express';
+import { Tracer } from '@opentelemetry/api';
 export type CompilerContext = {
     compiler: ObservableCompiler;
     log: Logger;
+    tracer: Tracer;
     contextProvider: ContextProvider;
     roundTripperFactory: RoundTripperFactory;
     connectionProvider: ConnectionProvider;

package/script/src/interpreter/memory/ObservableCompiler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ObservableCompiler.d.ts","sourceRoot":"","sources":["../../../../src/src/interpreter/memory/ObservableCompiler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,MAAM,CAAC;AACpD,OAAO,EAAE,IAAI,EAAY,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAO/D,OAAO,EAAE,uBAAuB,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE9F,OAAO,EAAE,OAAO,EAAe,MAAM,sBAAsB,CAAC;AAG5D,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAClF,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEjC,MAAM,MAAM,eAAe,GAAG;IAC1B,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,eAAe,EAAE,eAAe,CAAC;IACjC,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,YAAY,CAAC,EAAE,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,CAAC,SAAS,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,IAAI,CACrF,GAAG,EAAE,eAAe,EACpB,IAAI,EAAE,CAAC,KACN,gBAAgB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;AAE/B,qBAAa,kBAAkB;IAC3B,OAAO,CAAC,aAAa,CAAkD;IACvE,OAAO,CAAC,gBAAgB,CAAgD;;IAgBxE,WAAW,CAAC,EAAE,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,KAAK,GAAG,IAAI,EACzC,GAAG,EAAE,eAAe,EACpB,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,GACpB,uBAAuB,CAAC,EAAE,EAAE,GAAG,EAAE,KAAK,CAAC;IAe1C,cAAc,CAAC,GAAG,GAAG,GAAG,EAAE,CAAC,SAAS,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,EAC3D,GAAG,EAAE,eAAe,EACpB,OAAO,EAAE,CAAC,EACV,MAAM,EAAE,WAAW,GACpB,UAAU,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAerC,YAAY,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,SAAS,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,QAAQ,EAAE,YAAY,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;IAKjF,eAAe,CAAC,GAAG,EAAE,CAAC,SAAS,OAAO,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,eAAe,CAAC,GAAG,EAAE,CAAC,CAAC;CAIjF"}
+{"version":3,"file":"ObservableCompiler.d.ts","sourceRoot":"","sources":["../../../../src/src/interpreter/memory/ObservableCompiler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,MAAM,CAAC;AACpD,OAAO,EAAE,IAAI,EAAY,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAO/D,OAAO,EAAE,uBAAuB,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE9F,OAAO,EAAE,OAAO,EAAe,MAAM,sBAAsB,CAAC;AAG5D,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAClF,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,MAAM,MAAM,eAAe,GAAG;IAC1B,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,eAAe,CAAC;IACjC,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,YAAY,CAAC,EAAE,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,CAAC,SAAS,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,IAAI,CACrF,GAAG,EAAE,eAAe,EACpB,IAAI,EAAE,CAAC,KACN,gBAAgB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;AAE/B,qBAAa,kBAAkB;IAC3B,OAAO,CAAC,aAAa,CAAkD;IACvE,OAAO,CAAC,gBAAgB,CAAgD;;IAgBxE,WAAW,CAAC,EAAE,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,KAAK,GAAG,IAAI,EACzC,GAAG,EAAE,eAAe,EACpB,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,GACpB,uBAAuB,CAAC,EAAE,EAAE,GAAG,EAAE,KAAK,CAAC;IAe1C,cAAc,CAAC,GAAG,GAAG,GAAG,EAAE,CAAC,SAAS,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,EAC3D,GAAG,EAAE,eAAe,EACpB,OAAO,EAAE,CAAC,EACV,MAAM,EAAE,WAAW,GACpB,UAAU,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAerC,YAAY,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,SAAS,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,QAAQ,EAAE,YAAY,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;IAKjF,eAAe,CAAC,GAAG,EAAE,CAAC,SAAS,OAAO,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,eAAe,CAAC,GAAG,EAAE,CAAC,CAAC;CAIjF"}

package/script/src/interpreter/memory/compilers/catch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"catch.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/catch.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAG5D,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AAwBnE,eAAO,MAAM,aAAa,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAGrE,CAAC"}
+{"version":3,"file":"catch.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/catch.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAG5D,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AAmDnE,eAAO,MAAM,aAAa,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAGrE,CAAC"}

package/script/src/interpreter/memory/compilers/catch.js

@@ -4,15 +4,32 @@ exports.catchCompiler = void 0;
 const rxjs_1 = require("rxjs");
 const CatchTask_js_1 = require("../../../dsl/tasks/CatchTask.js");
 const ExecutionError_js_1 = require("../ExecutionError.js");
-function compileCatch(ctx, task) {
-    const baseOperator = ctx.compiler.compileTask(ctx, task._base);
-    const errorOperator = ctx.compiler.compileTask(ctx, task._errorHandler);
+function compileCatch(compilerCtx, task) {
+    const baseOperator = compilerCtx.compiler.compileTask(compilerCtx, task._base);
+    const errorOperator = compilerCtx.compiler.compileTask(compilerCtx, task._errorHandler);
     return (src) => src.pipe((0, rxjs_1.mergeMap)((ctx) => {
         return baseOperator((0, rxjs_1.of)(ctx)).pipe((0, rxjs_1.catchError)((error) => {
-            if (error instanceof Error) {
-                return errorOperator((0, rxjs_1.of)(ctx.withData(new ExecutionError_js_1.ExecutionError(ctx, error.message, { cause: error }))));
-            }
-            return errorOperator((0, rxjs_1.of)(ctx.withData(new ExecutionError_js_1.ExecutionError(ctx, `${error}`, { cause: error }))));
+            return compilerCtx.tracer.startActiveSpan(`catch`, (span) => {
+                span.setAttribute('execution.id', ctx.executionId);
+                span.setAttribute('task.type', 'catch');
+                if (error instanceof Error) {
+                    span.recordException(error);
+                    span.setAttribute('error.message', error.message);
+                    span.setAttribute('error.stack', error.stack ?? '');
+                    span.end();
+                    ctx.log.error('execution has encountered an error', {
+                        error: error.message,
+                        stack: error.stack,
+                    });
+                    return errorOperator((0, rxjs_1.of)(ctx.withData(new ExecutionError_js_1.ExecutionError(ctx, error.message, { cause: error }))));
+                }
+                ctx.log.error('execution has encountered an error', {
+                    error: error,
+                });
+                span.setAttribute('error', `${error}`);
+                span.end();
+                return errorOperator((0, rxjs_1.of)(ctx.withData(new ExecutionError_js_1.ExecutionError(ctx, `${error}`, { cause: error }))));
+            });
         }));
     }));
 }

package/script/src/interpreter/memory/compilers/fn.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fn.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/fn.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAEtD,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AAoBnE,eAAO,MAAM,UAAU,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAG/D,CAAC"}
+{"version":3,"file":"fn.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/fn.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAEtD,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AA4BnE,eAAO,MAAM,UAAU,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAG/D,CAAC"}

package/script/src/interpreter/memory/compilers/fn.js

@@ -3,14 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fnCompiler = void 0;
 const rxjs_1 = require("rxjs");
 const FnTask_js_1 = require("../../../dsl/tasks/FnTask.js");
-function compileFn(ctx, task) {
+function compileFn(compilerCtx, task) {
     return (src) => src.pipe((0, rxjs_1.tap)({
-        complete: () => ctx.log.debug('fn.complete')
+        complete: () => compilerCtx.log.debug('fn.complete')
     }), (0, rxjs_1.mergeMap)(async (ctx) => {
-        if (typeof ctx.idx === 'number') {
-            return ctx.withData(await task._fn(ctx, ctx.idx));
-        }
-        return ctx.withData(await task._fn(ctx));
+        return await compilerCtx.tracer.startActiveSpan(`fn-${task.id}`, async (span) => {
+            span.setAttribute('task.id', task.id);
+            span.setAttribute('execution.id', ctx.executionId);
+            if (typeof ctx.idx === 'number') {
+                span.end();
+                return ctx.withData(await task._fn(ctx, ctx.idx));
+            }
+            span.end();
+            return ctx.withData(await task._fn(ctx));
+        });
     }));
 }
 exports.fnCompiler = {

package/script/src/interpreter/memory/compilers/http.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/http.ts"],"names":[],"mappings":"AAGA,OAAO,EAAmB,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAE/E,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AAkCnE,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAG5E,CAAC"}
+{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/http.ts"],"names":[],"mappings":"AAIA,OAAO,EAAmB,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAE/E,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AAyDnE,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAG5E,CAAC"}

package/script/src/interpreter/memory/compilers/http.js

@@ -4,17 +4,41 @@ exports.httpCompiler = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const HttpTask_js_1 = require("../../../dsl/tasks/HttpTask.js");
-function compileHttp(ctx, task) {
-    const roundtripper = ctx.roundTripperFactory.create(task.opts.connection, globalThis.fetch);
-    const dynamicFetcher = ctx.roundTripperFactory.createDynamic(task.opts.connection, globalThis.fetch);
-    return (src) => src.pipe((0, operators_1.tap)({
-        complete: () => ctx.log.debug('http.complete'),
-    }), (0, rxjs_1.mergeMap)(async (ctx) => {
+function compileHttp(compilerCtx, task) {
+    const roundtripper = compilerCtx.roundTripperFactory.create(task.opts.connection);
+    const dynamicFetcher = compilerCtx.roundTripperFactory.createDynamic(task.opts.connection);
+    async function http(ctx) {
         const _fetch = await roundtripper;
         const _dynamicFetcher = await dynamicFetcher;
         const httpContext = new HttpTask_js_1.HttpContextImpl(ctx, {}, _fetch, _dynamicFetcher);
         const result = await task.fn(httpContext);
         return ctx.withData(result);
+    }
+    return (src) => src.pipe((0, operators_1.tap)({
+        complete: () => compilerCtx.log.debug('http.complete'),
+    }), (0, rxjs_1.mergeMap)(async (ctx) => {
+        return compilerCtx.tracer.startActiveSpan(`http-${task.id}`, async (span) => {
+            span.setAttribute('task.id', task.id);
+            span.setAttribute('task.type', 'http');
+            span.setAttribute('execution.id', ctx.executionId);
+            span.setAttribute('connection.name', task.opts.connection);
+            try {
+                let result = await http(ctx);
+                return result;
+            }
+            catch (error) {
+                if (error instanceof Error) {
+                    span.recordException(error);
+                }
+                else {
+                    span.recordException(new Error(String(error)));
+                }
+                throw error;
+            }
+            finally {
+                span.end();
+            }
+        });
     }));
 }
 exports.httpCompiler = {

package/script/src/interpreter/memory/compilers/parallel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parallel.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/parallel.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAElE,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AA+BnE,eAAO,MAAM,gBAAgB,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAGrF,CAAC"}
+{"version":3,"file":"parallel.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/parallel.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAElE,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AAqCnE,eAAO,MAAM,gBAAgB,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAGrF,CAAC"}

package/script/src/interpreter/memory/compilers/schedule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schedule.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/schedule.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAEzF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAsF7C,eAAO,MAAM,gBAAgB,EAAE,eAAe,CAAC,YAAY,EAAE,eAAe,CAG3E,CAAC"}
+{"version":3,"file":"schedule.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/schedule.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAEzF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AA0H7C,eAAO,MAAM,gBAAgB,EAAE,eAAe,CAAC,YAAY,EAAE,eAAe,CAG3E,CAAC"}

package/script/src/interpreter/memory/compilers/schedule.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.scheduleCompiler = void 0;
 const rxjs_1 = require("rxjs");
+const constants_js_1 = require("../../../dsl/http/versori/constants.js");
 const ScheduleTrigger_js_1 = require("../../../dsl/triggers/ScheduleTrigger.js");
 function compileSchedule(ctx, trigger, signal) {
     return new rxjs_1.Observable((subscriber) => {
@@ -9,24 +10,33 @@ function compileSchedule(ctx, trigger, signal) {
         if (!ctx.router) {
             throw new Error('Router not available in compiler context');
         }
+        const projectId = Deno.env.get(constants_js_1.envVarProjectId) || 'example-service';
+        const environmentId = Deno.env.get(constants_js_1.envVarEnvId) || 'example-environment';
+        const environmentName = Deno.env.get(constants_js_1.envVarEnvironmentName) || 'example-environment';
+        const orgId = Deno.env.get(constants_js_1.envVarOrgId) || 'example-org';
         const client = ctx.connectionProvider;
         ctx.cronRegistry.set(trigger.id, trigger.schedule);
-        ctx.router.post(`/cron/${trigger.id}`, async (req, res) => {
+        async function handleSchedule(req, res, span) {
             try {
                 if (trigger.activationPredicate === undefined) {
                     const executionCtx = ctx.contextProvider.create({}, undefined);
+                    span.setAttribute('execution.id', executionCtx.executionId);
                     try {
                         subscriber.next(executionCtx);
                     }
                     catch (error) {
                         executionCtx.log.error('execution error inside schedule', { error });
                     }
-                    res.status(200).json({ status: 'triggered', executionId: executionCtx.executionId });
+                    res.status(200).json({
+                        status: 'triggered',
+                        executionId: executionCtx.executionId,
+                    });
                     return;
                 }
                 const activations = await client.listActivations();
                 if (!activations || activations.length === 0) {
                     const executionCtx = ctx.contextProvider.create({}, undefined);
+                    span.setAttribute('execution.id', executionCtx.executionId);
                     executionCtx.log.info('no activations found, continuing');
                     try {
                         subscriber.next(executionCtx);
@@ -34,7 +44,10 @@ function compileSchedule(ctx, trigger, signal) {
                     catch (error) {
                         executionCtx.log.error('execution error inside schedule', { error });
                     }
-                    res.status(200).json({ status: 'triggered', executionId: executionCtx.executionId });
+                    res.status(200).json({
+                        status: 'triggered',
+                        executionId: executionCtx.executionId,
+                    });
                     return;
                 }
                 activations.forEach((activation) => {
@@ -53,6 +66,19 @@ function compileSchedule(ctx, trigger, signal) {
                 ctx.log.error('execution error inside schedule', { error });
                 res.status(500).json({ error: 'Failed to trigger schedule' });
             }
+        }
+        ctx.router.post(`/cron/${trigger.id}`, async (req, res) => {
+            await ctx.tracer.startActiveSpan(`schedule-${trigger.id}`, async (span) => {
+                span.setAttribute('task.id', trigger.id);
+                span.setAttribute('task.type', 'schedule');
+                span.setAttribute('schedule', trigger.schedule);
+                span.setAttribute('project.id', projectId);
+                span.setAttribute('environment.id', environmentId);
+                span.setAttribute('environment.name', environmentName);
+                span.setAttribute('org.id', orgId);
+                await handleSchedule(req, res, span);
+                span.end();
+            });
         });
         function cleanup() {
             ctx.log.debug('scheduler trigger stopped');

package/script/src/observability/logging/ConsoleLogger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ConsoleLogger.d.ts","sourceRoot":"","sources":["../../../../src/src/observability/logging/ConsoleLogger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,+CAA+C,CAAC;AACrE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAqM/C;;GAEG;AACH,qBAAa,aAAc,YAAW,MAAM;IACxC,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC;IAEhB,KAAK,EAAE,QAAQ,CAAC;IAEhB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;gBAEpB,KAAK,EAAE,QAAQ,EAAE,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM;IAOjE,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAO9D,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAO7D,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAC3E,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAsB9D,KAAK,CAAC,MAAM,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAAG,aAAa;IAOvD,QAAQ,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI;CAGlC"}
+{"version":3,"file":"ConsoleLogger.d.ts","sourceRoot":"","sources":["../../../../src/src/observability/logging/ConsoleLogger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,+CAA+C,CAAC;AACrE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAoM/C;;GAEG;AACH,qBAAa,aAAc,YAAW,MAAM;IACxC,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC;IAEhB,KAAK,EAAE,QAAQ,CAAC;IAEhB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;gBAEpB,KAAK,EAAE,QAAQ,EAAE,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM;IAOjE,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAO9D,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAO7D,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAC3E,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAsB9D,KAAK,CAAC,MAAM,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAAG,aAAa;IAOvD,QAAQ,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI;CAGlC"}