@versori/run 0.5.0-alpha.6 → 0.5.1

package/esm/src/interpreter/durable/compilers/durableworkflow.js

@@ -10,6 +10,7 @@
  * As of the Change Date, in accordance with the Business Source License,
  * use of this software will be governed by the Apache License, Version 2.0.
  */
+import { ulid } from '../../../../deps/jsr.io/@std/ulid/1.0.0/mod.js';
 import { Observable } from 'rxjs';
 import { DurableWorkflowTrigger, } from '../../../dsl/triggers/DurableTrigger.js';
 import { envVarEnvId } from '../../../internal/constants.js';
@@ -21,20 +22,12 @@ export function compileDurableWorkflow(ctx, trigger, signal) {
         }
         signal.addEventListener('abort', cleanup, { once: true });
         let consecutiveErrors = 0;
-        const maxConsecutiveErrors = 5;
         (async () => {
             while (true) {
                 if (signal.aborted) {
                     cleanup();
                     break;
                 }
-                if (consecutiveErrors >= maxConsecutiveErrors) {
-                    ctx.log.error('reached too many consecutive errors stopping trigger', {
-                        'triggerId': trigger.id,
-                    });
-                    cleanup();
-                    break;
-                }
                 try {
                     // Right now the API itself will hang for a period of time if no workflows are available.
                     // so we don't need to add a delay here.
@@ -47,37 +40,39 @@ export function compileDurableWorkflow(ctx, trigger, signal) {
                         continue;
                     }
                     for (const wf of wfs.workflows) {
-                        if (wf.id &&
-                            wf.attempt !== undefined &&
-                            trigger.options.maxAttempts &&
-                            wf.attempt > trigger.options.maxAttempts) {
-                            ctx.log.error('Workflow exceeded max attempts failing', {
-                                workflowId: wf.id,
-                                attempts: wf.attempt,
-                            });
-                            await ctx.queueProvider.complete({
-                                id: wf.id,
-                                output: wf.output,
-                                status: 'failed',
-                            });
-                            continue;
-                        }
-                        const data = JSON.parse(atob(wf.payload ?? '{}'));
+                        const payload = wf.payload ? atob(wf.payload) : '{}';
+                        const data = JSON.parse(payload);
                         let activation;
                         if (wf.metadata?.activationId) {
-                            const { data } = await ctx.platformApi.getActivation({
-                                path: {
-                                    activation_id: wf.metadata.activationId,
-                                    organisation_id: ctx.organisationId,
-                                    environment_id: Deno.env.get(envVarEnvId) || 'development',
-                                },
-                                throwOnError: true,
-                            });
-                            activation = data;
+                            try {
+                                const { data } = await ctx.platformApi.getActivation({
+                                    path: {
+                                        activation_id: wf.metadata.activationId,
+                                        organisation_id: ctx.organisationId,
+                                        environment_id: Deno.env.get(envVarEnvId) || 'development',
+                                    },
+                                    throwOnError: true,
+                                });
+                                activation = data;
+                            }
+                            catch (error) {
+                                ctx.log.error('Failed to get activation', { error });
+                                throw new Error('Failed to get activation');
+                            }
                         }
-                        const newContext = ctx.contextProvider.create(data, {
-                            activation: activation,
-                            workflowId: wf.id,
+                        const newContext = ctx.contextProvider.createWithExecutionId(activation, data, wf.metadata?.executionId ?? ulid().toString(), {
+                            workflow: wf,
+                            onSuccess: (completedContext) => {
+                                // locked status means we own the workflow and it's not completed yet
+                                if (wf.status !== 'locked') {
+                                    return;
+                                }
+                                ctx.queueProvider.complete({
+                                    id: wf.id,
+                                    output: btoa(JSON.stringify(completedContext.data)),
+                                    status: 'completed',
+                                });
+                            },
                         });
                         consecutiveErrors = 0;
                         subscriber.next(newContext);
@@ -86,6 +81,8 @@ export function compileDurableWorkflow(ctx, trigger, signal) {
                 catch (error) {
                     ctx.log.error('Error fetching workflows', { error });
                     consecutiveErrors++;
+                    // no workflows available, back-off a bit before retrying
+                    await new Promise((resolve) => setTimeout(resolve, Math.min(consecutiveErrors * 1000, 30000)));
                 }
             }
         })();

package/esm/src/interpreter/durable/compilers/fn.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fn.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/fn.ts"],"names":[],"mappings":"AA+BA,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAGtD,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AAoDnE,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/durable/compilers/fn.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAEtD,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AAiCnE,eAAO,MAAM,UAAU,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAG/D,CAAC"}

package/esm/src/interpreter/durable/compilers/fn.js

@@ -10,43 +10,20 @@
  * As of the Change Date, in accordance with the Business Source License,
  * use of this software will be governed by the Apache License, Version 2.0.
  */
-import { mergeMap } from 'rxjs';
+import { mergeMap, tap } from 'rxjs';
 import { FnTask } from '../../../dsl/tasks/FnTask.js';
-import { sendTaskStartEvent, enabled as supervisorEnabled } from '../../../internal/supervisor.js';
 function compileFn(compilerCtx, task) {
-    return (src) => src.pipe(mergeMap(async (ctx) => {
+    return (src) => src.pipe(tap({
+        complete: () => compilerCtx.log.debug('fn.complete'),
+    }), mergeMap(async (ctx) => {
         return await compilerCtx.tracer.startActiveSpan(`fn-${task.id}`, async (span) => {
-            await sendTaskStartEvent(task.id, ctx, span);
             span.setAttribute('task.id', task.id);
-            span.setAttribute('type', 'task');
-            span.setAttribute('task.type', 'fn');
             span.setAttribute('execution.id', ctx.executionId);
-            span.setAttribute('workflow.id', ctx.options.workflowId || 'unknown-workflow');
             try {
-                const spanContext = span.spanContext();
-                const ctxWithLogger = ctx.withLogger(ctx.log.child({ spanId: spanContext.spanId, traceId: spanContext.traceId }));
-                let result;
                 if (typeof ctx.idx === 'number') {
-                    result = ctx.withData(await task._fn(ctxWithLogger, ctx.idx));
+                    return ctx.withData(await task._fn(ctx, ctx.idx));
                 }
-                else {
-                    result = ctx.withData(await task._fn(ctxWithLogger));
-                }
-                if (supervisorEnabled) {
-                    span.setAttribute('response.body', JSON.stringify(result.data));
-                }
-                span.setAttribute('status', 'pass');
-                return result;
-            }
-            catch (error) {
-                if (error instanceof Error) {
-                    span.setAttribute('status', 'fail');
-                    span.recordException(error);
-                }
-                else {
-                    span.recordException(new Error(String(error)));
-                }
-                throw error;
+                return ctx.withData(await task._fn(ctx));
             }
             finally {
                 span.end();

package/esm/src/interpreter/durable/compilers/http.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/http.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAmB,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAG/E,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AAyHnE,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/durable/compilers/http.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAmB,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAE/E,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AAwFnE,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAG5E,CAAC"}

package/esm/src/interpreter/durable/compilers/http.js

@@ -11,32 +11,19 @@
  * use of this software will be governed by the Apache License, Version 2.0.
  */
 import { mergeMap } from 'rxjs';
+import { tap } from 'rxjs/operators';
+import { HttpContextImpl, HttpTaskImpl } from '../../../dsl/tasks/HttpTask.js';
 import { DynamicFetchFactory } from '../../../connection/DynamicFetchFactory.js';
-import { FetchBuilder } from '../../../connection/internal/FetchBuilder.js';
 import { StaticFetchFactory } from '../../../connection/StaticFetchFactory.js';
-import { HttpContextImpl, HttpTaskImpl } from '../../../dsl/tasks/HttpTask.js';
-import { sendTaskStartEvent, enabled as supervisorEnabled } from '../../../internal/supervisor.js';
 function compileHttp(compilerCtx, task) {
     const cnxMap = compilerCtx.configReader.getCnxMapping(task.opts.connection);
     let fetchFactory;
     if (!cnxMap) {
-        compilerCtx.log.warn(`Connection ${task.opts.connection} not found, using default fetch with no credentials`);
-        if (supervisorEnabled) {
-            // missing connection map and we are in supervised mode, so we use the fake fetcher
-            fetchFactory = Promise.resolve(new StaticFetchFactory(new FetchBuilder(globalThis.fetch, { name: task.opts.connection }).buildSupervisedFetch()));
-        }
-        else {
-            // missing connection map and not in supervised mode, so we use global fetch
-            fetchFactory = Promise.resolve(new StaticFetchFactory(globalThis.fetch));
-        }
+        compilerCtx.log.error(`Connection ${task.opts.connection} not found, using default fetch with no credentials`);
+        fetchFactory = Promise.resolve(new StaticFetchFactory(globalThis.fetch));
     }
     else if (cnxMap.dynamic) {
-        if (cnxMap.mockWithAI) {
-            fetchFactory = Promise.resolve(new StaticFetchFactory(new FetchBuilder(globalThis.fetch, { name: task.opts.connection }).buildSupervisedFetch()));
-        }
-        else {
-            fetchFactory = Promise.resolve(new DynamicFetchFactory(compilerCtx.cnxFactory, compilerCtx.platformApi, compilerCtx.organisationId, cnxMap.templateId));
-        }
+        fetchFactory = Promise.resolve(new DynamicFetchFactory(compilerCtx.cnxFactory, compilerCtx.platformApi, compilerCtx.organisationId, cnxMap.templateId));
     }
     else {
         fetchFactory = compilerCtx.platformApi.getConnection({
@@ -46,21 +33,8 @@ function compileHttp(compilerCtx, task) {
             },
             throwOnError: true,
         })
-            .then(({ data }) => {
-            if (cnxMap.mockWithAI) {
-                // use the fake fetcher that calls the supervisor to generate a mock reponse
-                return new StaticFetchFactory(new FetchBuilder(globalThis.fetch, data).buildSupervisedFetch());
-            }
-            return Promise.all([compilerCtx.cnxFactory.fetcher(data), data.baseUrl ?? ''])
-                .then(([fetcher, baseUrl]) => new StaticFetchFactory(fetcher, baseUrl));
-        })
-            .catch((err) => {
-            compilerCtx.log.error(`Failed to get connection ${task.opts.connection}`, err);
-            if (supervisorEnabled) {
-                return new StaticFetchFactory(new FetchBuilder(globalThis.fetch, { name: task.opts.connection }).build());
-            }
-            throw err;
-        });
+            .then(({ data }) => Promise.all([compilerCtx.cnxFactory.fetcher(data), data.baseUrl ?? '']))
+            .then(([fetcher, baseUrl]) => new StaticFetchFactory(fetcher, baseUrl));
     }
     async function http(ctx) {
         const [fetch, baseUrl] = await fetchFactory.then((ff) => Promise.all([ff.fetcher(ctx), ff.baseUrl(ctx)]));
@@ -68,27 +42,19 @@ function compileHttp(compilerCtx, task) {
         const result = await task.fn(httpContext);
         return ctx.withData(result);
     }
-    return (src) => src.pipe(mergeMap((ctx) => {
+    return (src) => src.pipe(tap({
+        complete: () => compilerCtx.log.debug('http.complete'),
+    }), mergeMap((ctx) => {
         return compilerCtx.tracer.startActiveSpan(`http-${task.id}`, async (span) => {
-            await sendTaskStartEvent(task.id, ctx, span);
             span.setAttribute('task.id', task.id);
             span.setAttribute('task.type', 'http');
-            span.setAttribute('type', 'task');
             span.setAttribute('execution.id', ctx.executionId);
             span.setAttribute('connection.name', task.opts.connection);
-            span.setAttribute('workflow.id', ctx.options.workflowId || 'unknown-workflow');
-            const spanContext = span.spanContext();
             try {
-                const result = await http(ctx.withLogger(ctx.log.child({ spanId: spanContext.spanId, traceId: spanContext.traceId })));
-                if (supervisorEnabled) {
-                    span.setAttribute('response.body', JSON.stringify(result.data));
-                }
-                span.setAttribute('status', 'pass');
-                return result;
+                return await http(ctx);
             }
             catch (error) {
                 if (error instanceof Error) {
-                    span.setAttribute('status', 'fail');
                     span.recordException(error);
                 }
                 else {

package/esm/src/interpreter/durable/compilers/schedule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schedule.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/schedule.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAQzF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAqJ7C,eAAO,MAAM,gBAAgB,EAAE,eAAe,CAAC,YAAY,EAAE,eAAe,CAG3E,CAAC"}
+{"version":3,"file":"schedule.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/schedule.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAEzF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAkJ7C,eAAO,MAAM,gBAAgB,EAAE,eAAe,CAAC,YAAY,EAAE,eAAe,CAG3E,CAAC"}

package/esm/src/interpreter/durable/compilers/schedule.js

@@ -11,8 +11,8 @@
  * use of this software will be governed by the Apache License, Version 2.0.
  */
 import { Observable } from 'rxjs';
+import { envVarEnvId, envVarEnvironmentName, envVarOrgId, envVarProjectId, } from '../../../dsl/http/versori/constants.js';
 import { ScheduleTrigger } from '../../../dsl/triggers/ScheduleTrigger.js';
-import { envVarEnvId, envVarEnvironmentName, envVarOrgId, envVarProjectId, } from '../../../internal/constants.js';
 function compileSchedule(ctx, trigger, signal) {
     return new Observable((subscriber) => {
         // Add HTTP endpoint for manual triggering
@@ -52,7 +52,7 @@ function compileSchedule(ctx, trigger, signal) {
                         });
                         return;
                     }
-                    const executionCtx = ctx.contextProvider.create(activation[0], {}, { workflowId: trigger.id });
+                    const executionCtx = ctx.contextProvider.create(activation[0], {});
                     span.setAttribute('execution.id', executionCtx.executionId);
                     try {
                         subscriber.next(executionCtx);
@@ -84,7 +84,7 @@ function compileSchedule(ctx, trigger, signal) {
                     return;
                 }
                 activations.forEach((activation) => {
-                    const executionCtx = ctx.contextProvider.create(activation, {}, { workflowId: trigger.id });
+                    const executionCtx = ctx.contextProvider.create(activation, {});
                     try {
                         subscriber.next(executionCtx);
                     }
@@ -103,7 +103,6 @@ function compileSchedule(ctx, trigger, signal) {
             await ctx.tracer.startActiveSpan(`schedule-${trigger.id}`, async (span) => {
                 span.setAttribute('task.id', trigger.id);
                 span.setAttribute('task.type', 'schedule');
-                span.setAttribute('type', 'task');
                 span.setAttribute('schedule', trigger.schedule);
                 span.setAttribute('project.id', projectId);
                 span.setAttribute('environment.id', environmentId);

package/esm/src/interpreter/durable/compilers/webhook.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/webhook.ts"],"names":[],"mappings":"AA2BA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAGtF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAuD7C,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,WAAW,EAAE,cAAc,CA2TxE,CAAC"}
+{"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/webhook.ts"],"names":[],"mappings":"AA2BA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAGtF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAuD7C,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,WAAW,EAAE,cAAc,CAySxE,CAAC"}

package/esm/src/interpreter/durable/compilers/webhook.js

@@ -68,7 +68,7 @@ export const webhookCompiler = {
             throw new Error('Invalid response mode, must be either "sync" or "async"');
         }
         const method = trigger.options.method || 'post';
-        const validMethods = ['get', 'post', 'put', 'delete', 'patch', 'options', 'head'];
+        const validMethods = ['get', 'post', 'put', 'delete', 'patch', 'options', 'head', 'all'];
         if (method !== method.toLowerCase()) {
             throw new Error(`HTTP method must be in lowercase: ${method} on webhook ${trigger.id}`);
         }
@@ -84,7 +84,6 @@ export const webhookCompiler = {
             onError = trigger.options.response.onError;
         }
         const ctxOptionsFn = (req, res) => ({
-            workflowId: trigger.id,
             onSuccess: (ctx) => {
                 if (isSync) {
                     sendResponse(res, onSuccess(ctx));
@@ -97,22 +96,20 @@ export const webhookCompiler = {
             },
             request: req,
         });
+        const routeMiddleware = [];
         if (!trigger.options.request?.rawBody) {
-            ctx.webhookRouter.use(express.json({ limit: '50mb' }));
-            ctx.webhookRouter.use(xmlparser(xml2jsDefaults));
+            routeMiddleware.push(express.json({ limit: '50mb', type: ['application/json', '*/*+json'] }));
+            routeMiddleware.push(xmlparser(xml2jsDefaults));
         }
         else {
-            ctx.webhookRouter.use(express.raw({ type: '*/*', limit: '50mb' }));
+            routeMiddleware.push(express.raw({ type: '*/*', limit: '50mb' }));
         }
-        ctx.webhookRegistry.set(trigger.id, { method, path: `/${trigger.id}`, options: trigger.options });
         return new Observable((subscriber) => {
             if (!ctx.webhookRouter) {
                 throw new Error('Router not available in compiler context');
             }
-            ctx.log.info('webhook endpoint added', {
-                id: trigger.id,
-                method,
-            });
+            // add the webhook endpoint to the router
+            ctx.log.info('webhook endpoint added:', { trigger });
             if (corsOptions) {
                 if (typeof corsOptions === 'boolean') {
                     ctx.webhookRouter.use(cors());
@@ -122,7 +119,7 @@ export const webhookCompiler = {
                 }
             }
             // endpoint for sans user because I'm not quite sure how the dynamic routing works
-            ctx.webhookRouter[method](`/${trigger.id}`, createStaticWebhookMiddleware({
+            ctx.webhookRouter[method](`/${trigger.id}`, ...routeMiddleware, createStaticWebhookMiddleware({
                 id: trigger.id,
                 connName: trigger.options.connection,
                 organisationId: ctx.organisationId,
@@ -135,11 +132,8 @@ export const webhookCompiler = {
                 await ctx.tracer.startActiveSpan(`webhook-${trigger.id}`, (span) => {
                     span.setAttribute('task.id', trigger.id);
                     span.setAttribute('task.type', 'webhook');
-                    span.setAttribute('type', 'task');
                     const staticActivation = res.locals.activation;
-                    let executionCtx = ctx.contextProvider.create(staticActivation, req.body, ctxOptionsFn(req, res));
-                    const spanContext = span.spanContext();
-                    executionCtx = executionCtx.withLogger(executionCtx.log.child({ spanId: spanContext.spanId, traceId: spanContext.traceId }));
+                    const executionCtx = ctx.contextProvider.create(staticActivation, req.body, ctxOptionsFn(req, res));
                     span.setAttribute('execution.id', executionCtx.executionId);
                     try {
                         subscriber.next(executionCtx);
@@ -161,7 +155,7 @@ export const webhookCompiler = {
                 });
             });
             // this endpoint will trigger the workflow for each activation given by the external user ID
-            ctx.webhookRouter[method](`/${trigger.id}/users/:userId`, createUserIdDynamicWebhookMiddleware({
+            ctx.webhookRouter[method](`/${trigger.id}/users/:userId`, ...routeMiddleware, createUserIdDynamicWebhookMiddleware({
                 id: trigger.id,
                 connName: trigger.options.connection,
                 organisationId: ctx.organisationId,
@@ -174,7 +168,6 @@ export const webhookCompiler = {
                 await ctx.tracer.startActiveSpan(`webhook-${trigger.id}`, (span) => {
                     span.setAttribute('task.id', trigger.id);
                     span.setAttribute('task.type', 'webhook');
-                    span.setAttribute('type', 'task');
                     span.setAttribute('user.id', req.params.userId);
                     const userId = req.params.userId;
                     const activation = res.locals.activation;
@@ -191,9 +184,7 @@ export const webhookCompiler = {
                         span.end();
                         return;
                     }
-                    let executionCtx = ctx.contextProvider.create(activation, req.body, ctxOptionsFn(req, res));
-                    const spanContext = span.spanContext();
-                    executionCtx = executionCtx.withLogger(executionCtx.log.child({ spanId: spanContext.spanId, traceId: spanContext.traceId }));
+                    const executionCtx = ctx.contextProvider.create(activation, req.body, ctxOptionsFn(req, res));
                     span.setAttribute('execution.id', executionCtx.executionId);
                     const errors = [];
                     try {
@@ -220,7 +211,7 @@ export const webhookCompiler = {
                 });
             });
             // this endpoint will trigger the workflow only for the activation given by its ID
-            ctx.webhookRouter[method](`/${trigger.id}/activations/:activationId`, createActIdDynamicWebhookMiddleware({
+            ctx.webhookRouter[method](`/${trigger.id}/activations/:activationId`, ...routeMiddleware, createActIdDynamicWebhookMiddleware({
                 id: trigger.id,
                 organisationId: ctx.organisationId,
                 environmentId: Deno.env.get(envVarEnvId) ?? '',
@@ -232,7 +223,6 @@ export const webhookCompiler = {
             }), async (req, res) => {
                 await ctx.tracer.startActiveSpan(`webhook-${trigger.id}`, (span) => {
                     span.setAttribute('task.id', trigger.id);
-                    span.setAttribute('type', 'task');
                     span.setAttribute('task.type', 'webhook');
                     span.setAttribute('activation.id', req.params.activationId);
                     const activation = res.locals.activation;
@@ -248,9 +238,7 @@ export const webhookCompiler = {
                         span.end();
                         return;
                     }
-                    let activationCtx = ctx.contextProvider.create(activation, req.body, ctxOptionsFn(req, res));
-                    const spanContext = span.spanContext();
-                    activationCtx = activationCtx.withLogger(activationCtx.log.child({ spanId: spanContext.spanId, traceId: spanContext.traceId }));
+                    const activationCtx = ctx.contextProvider.create(activation, req.body, ctxOptionsFn(req, res));
                     span.setAttribute('execution.id', activationCtx.executionId);
                     try {
                         subscriber.next(activationCtx);

package/esm/src/interpreter/memory/MemoryInterpreter.d.ts

@@ -4,7 +4,7 @@ import { Router } from 'express';
 import { Observable, Subscription } from 'rxjs';
 import { DirectConnectionFactory } from '../../connection/DirectConnectionFactory.js';
 import { ContextImpl } from '../../context/Context.js';
-import { ContextProvider } from '../../context/ContextProvider.js';
+import { ContextProvider, ContextProviderImpl } from '../../context/ContextProvider.js';
 import { ConfigReader, CronProvider } from '../../dsl/http/types.js';
 import { Workflow } from '../../dsl/Workflow.js';
 import { IssueAPI } from '../../issues/Issues.js';
@@ -26,7 +26,7 @@ export type MemoryInterpreterOptions = {
     /**
      * Custom context provider. Advanced use only.
      */
-    contextProvider?: ContextProvider;
+    contextProvider?: ContextProviderImpl;
     /**
      * Abort signal to cancel workflow execution.
      */
@@ -37,17 +37,13 @@ export type MemoryInterpreterOptions = {
     skipVersoriCredentials?: boolean;
 };
 type Registration = {
+    triggerName: string;
     trigger$: Observable<ContextImpl<any, void>>;
     task$: ContextOperatorFunction<any, any, any>;
     localAbortController: AbortController;
     sigintListener: () => void;
     subscription?: Subscription;
 };
-type WebhookRegistry = Map<string, {
-    method: string;
-    path: string;
-    options: any;
-}>;
 /**
  * MemoryInterpreter is the default interpreter for executing Versori workflows. It handles registration and execution
  * of workflows triggered by schedules and webhooks.
@@ -76,7 +72,6 @@ export declare class MemoryInterpreter {
     private readonly webhookRouter;
     private readonly cronRouter;
     private cronRegistry;
-    private webhookRegistry;
     private readonly cnxFactory;
     private readonly cronProvider;
     private readonly tracer;
@@ -88,8 +83,7 @@ export declare class MemoryInterpreter {
     private cronServer?;
     private shutdownServer?;
     private isShuttingDown;
-    private wfRegistration;
-    constructor(log: Logger, compiler: ObservableCompiler, contextProvider: ContextProvider, webhookRouter: Router, cronRouter: Router, cronRegistry: Map<string, string>, webhookRegistry: WebhookRegistry, cnxFactory: DirectConnectionFactory, cronProvider: CronProvider, tracer: Tracer, issuesProvider: IssueAPI, cfgReader: ConfigReader, otelSDK?: NodeSDK | undefined);
+    constructor(log: Logger, compiler: ObservableCompiler, contextProvider: ContextProvider, webhookRouter: Router, cronRouter: Router, cronRegistry: Map<string, string>, cnxFactory: DirectConnectionFactory, cronProvider: CronProvider, tracer: Tracer, issuesProvider: IssueAPI, cfgReader: ConfigReader, otelSDK?: NodeSDK | undefined);
     static newInstance(options?: MemoryInterpreterOptions): Promise<MemoryInterpreter>;
     register<O>(workflow: Workflow<O>, options?: MemoryInterpreterOptions): Registration;
     start(): Promise<void>;

package/esm/src/interpreter/memory/MemoryInterpreter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MemoryInterpreter.d.ts","sourceRoot":"","sources":["../../../../src/src/interpreter/memory/MemoryInterpreter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"MemoryInterpreter.d.ts","sourceRoot":"","sources":["../../../../src/src/interpreter/memory/MemoryInterpreter.ts"],"names":[],"mappings":"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"}