@versori/run 0.4.5 → 0.5.0-alpha.1

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

@@ -10,6 +10,8 @@
  * 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 { create } from '@bufbuild/protobuf';
+import { timestampMs } from '@bufbuild/protobuf/wkt';
 import opentelemetry from '@opentelemetry/api';
 import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-proto';
 import { resourceFromAttributes } from '@opentelemetry/resources';
@@ -21,19 +23,51 @@ import { ContextProviderImpl } from '../../context/ContextProvider.js';
 import { VersoriConfigReader } from '../../dsl/http/versori/configloader.js';
 import { CronAPIClient } from '../../dsl/http/versori/cronapi.js';
 import { WorkflowImpl } from '../../dsl/Workflow.js';
-import { envVarEnvId, envVarEnvironmentName, envVarLocalRun, envVarOrgId, envVarOrgSlug, envVarOtelTracesURL, envVarProjectId, envVarVersion } from '../../internal/constants.js';
+import { envCronPort, envPort, envReadyCheckURL, envVarEnvId, envVarEnvironmentName, envVarOrgId, envVarOrgSlug, envVarOtelTracesURL, envVarProjectId, envVarVersion, } from '../../internal/constants.js';
+import { Fake, registerCrons, registerWebhooks, enabled as supervisorEnabled } from '../../internal/supervisor.js';
 import { IssueImpl } from '../../issues/Issues.js';
 import { MemoryKeyValueProvider } from '../../kv/memory/MemoryKeyValueProvider.js';
 import { NatsKeyValueProvider } from '../../kv/nats/NatsKeyValueProvider.js';
 import { ConsoleLogger } from '../../observability/logging/ConsoleLogger.js';
+import { credentialv1alpha1 } from '../../services/credentials/mod.js';
 import { PlatformApiImpl } from '../../services/platform/PlatformApi.js';
 import { ObservableCompiler } from './ObservableCompiler.js';
-function getKVProvider(runLocal) {
-    if (runLocal) {
+function getKVProvider() {
+    if (supervisorEnabled) {
         return Promise.resolve(new MemoryKeyValueProvider());
     }
     return NatsKeyValueProvider.fromEnv();
 }
+function getCredentialsProvider(d) {
+    return {
+        async getRaw(name, _activationId) {
+            const response = await d['credentials'].get({ id: name, organisationId: '' });
+            if (!response.credential) {
+                throw new Error(`Failed to get credential: ${name}`);
+            }
+            const rawData = create(credentialv1alpha1.CredentialDataRawSchema, response.credential.data);
+            return rawData.raw;
+        },
+        async getAccessToken(name, forceRefresh, _activationId) {
+            const response = await d['tokens'].getToken({ credentialId: name, forceRefresh: forceRefresh || false });
+            if (!response.token) {
+                throw new Error(`Failed to get token for credential: ${name}`);
+            }
+            return {
+                accessToken: response.token.accessToken,
+                tokenType: response.token.tokenType,
+                expiry: response.token.expiry ? new Date(timestampMs(response.token.expiry)) : undefined,
+            };
+        },
+        async getOAuth1Metadata(name, _activationId) {
+            const response = await d['oauth1'].getAuthorizationMetadata({ credentialId: name });
+            if (!response) {
+                throw new Error(`Failed to get OAuth1 metadata for credential: ${name}`);
+            }
+            return response;
+        },
+    };
+}
 /**
  * MemoryInterpreter is the default interpreter for executing Versori workflows. It handles registration and execution
  * of workflows triggered by schedules and webhooks.
@@ -56,7 +90,7 @@ function getKVProvider(runLocal) {
  * ```
  */
 export class MemoryInterpreter {
-    constructor(log, compiler, contextProvider, webhookRouter, cronRouter, cronRegistry, cnxFactory, cronProvider, tracer, issuesProvider, cfgReader, otelSDK) {
+    constructor(log, compiler, contextProvider, webhookRouter, cronRouter, cronRegistry, webhookRegistry, cnxFactory, cronProvider, tracer, issuesProvider, cfgReader, otelSDK) {
         Object.defineProperty(this, "log", {
             enumerable: true,
             configurable: true,
@@ -93,6 +127,12 @@ export class MemoryInterpreter {
             writable: true,
             value: cronRegistry
         });
+        Object.defineProperty(this, "webhookRegistry", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: webhookRegistry
+        });
         Object.defineProperty(this, "cnxFactory", {
             enumerable: true,
             configurable: true,
@@ -177,7 +217,6 @@ export class MemoryInterpreter {
         const otelTracesURL = Deno.env.get(envVarOtelTracesURL);
         let otelSDK;
         const configReader = VersoriConfigReader.fromEnv(log);
-        const runLocal = Deno.env.get(envVarLocalRun) === 'true';
         await waitForReady(log);
         // Do NOT change those attributes, they are used by the API to filter on
         const resource = resourceFromAttributes({
@@ -199,20 +238,30 @@ export class MemoryInterpreter {
             log.info('Starting OpenTelemetry SDK');
             otelSDK.start();
         }
+        else if (supervisorEnabled) {
+            otelSDK = new NodeSDK({
+                traceExporter: new Fake(),
+                serviceName: serviceName,
+                resource: resource,
+            });
+            log.info('Starting Testing OpenTelemetry SDK');
+            otelSDK.start();
+        }
         const tracer = opentelemetry.trace.getTracer(serviceName, version);
-        const connectionFactory = DirectConnectionFactory.fromEnv(log);
+        const cnxFactory = DirectConnectionFactory.fromEnv(log);
+        const credentialsProvider = getCredentialsProvider(cnxFactory);
         const issuesProvider = new IssueImpl(log);
         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, express.Router(), express.Router(), new Map(), DirectConnectionFactory.fromEnv(log), CronAPIClient.fromEnv(), tracer, issuesProvider, configReader, otelSDK);
+            return new MemoryInterpreter(log, compiler, options.contextProvider, express.Router(), express.Router(), new Map(), new Map(), cnxFactory, CronAPIClient.fromEnv(), tracer, issuesProvider, configReader, otelSDK);
         }
-        const kvp = await getKVProvider(runLocal);
+        const kvp = await getKVProvider();
         const platformApi = PlatformApiImpl.fromEnv();
         const organisationId = Deno.env.get(envVarOrgId) || 'development';
         const environmentId = Deno.env.get(envVarEnvId) || 'development';
-        const ctxProvider = new ContextProviderImpl(log, kvp, connectionFactory.getCredentialsProvider(), platformApi, organisationId, environmentId, issuesProvider);
-        return new MemoryInterpreter(log, compiler, ctxProvider, express.Router(), express.Router(), new Map(), connectionFactory, CronAPIClient.fromEnv(), tracer, issuesProvider, configReader, otelSDK);
+        const ctxProvider = new ContextProviderImpl(log, kvp, credentialsProvider, platformApi, organisationId, environmentId, issuesProvider);
+        return new MemoryInterpreter(log, compiler, ctxProvider, express.Router(), express.Router(), new Map(), new Map(), cnxFactory, CronAPIClient.fromEnv(), tracer, issuesProvider, configReader, otelSDK);
     }
     register(workflow, options) {
         const localAbortController = new AbortController();
@@ -231,6 +280,7 @@ export class MemoryInterpreter {
             cnxFactory: this.cnxFactory,
             platformApi: PlatformApiImpl.fromEnv(),
             webhookRouter: this.webhookRouter,
+            webhookRegistry: this.webhookRegistry,
             cronRouter: this.cronRouter,
             cronRegistry: this.cronRegistry,
             configReader: this.cfgReader,
@@ -251,9 +301,9 @@ export class MemoryInterpreter {
         this.registeredWorkflows.push(registration);
         return registration;
     }
-    start() {
-        const port = Deno.env.get('PORT') || 3000;
-        const cronPort = Deno.env.get('CRON_PORT') || 3001;
+    async start() {
+        const port = Deno.env.get(envPort) || 3000;
+        const cronPort = Deno.env.get(envCronPort) || 3001;
         const webhookApp = express();
         const cronApp = express();
         cronApp.use(express.json());
@@ -277,6 +327,12 @@ export class MemoryInterpreter {
                 ctx.log.error('MemoryInterpreter.executionError', {
                     error: err instanceof Error ? err.toString() : err,
                 });
+                this.tracer.startActiveSpan('done', (span) => {
+                    span.setAttribute('error.message', err instanceof Error ? err.toString() : err);
+                    span.setAttribute('execution.id', ctx.executionId);
+                    span.setAttribute('result', 'fail');
+                    span.end();
+                });
                 try {
                     ctx.options.onError?.(ctx.withData(err));
                 }
@@ -296,6 +352,11 @@ export class MemoryInterpreter {
                         durationMs,
                         data: ctx.data,
                     });
+                    this.tracer.startActiveSpan('done', (span) => {
+                        span.setAttribute('execution.id', ctx.executionId);
+                        span.setAttribute('result', 'pass');
+                        span.end();
+                    });
                     try {
                         ctx.options.onSuccess?.(ctx);
                     }
@@ -332,6 +393,9 @@ export class MemoryInterpreter {
             });
             throw new Error('Unable to register scheduler tasks with central cron provider');
         }
+        // register with suopervisor
+        await registerCrons(this.cronRegistry);
+        await registerWebhooks(this.webhookRegistry);
         this.webhookServer = webhookApp.listen(port, () => {
             this.log.info(`Express server listening on port ${port}`);
         });
@@ -351,6 +415,7 @@ export class MemoryInterpreter {
             if (this.cronServer) {
                 this.cronServer.close();
             }
+            this.otelSDK?.shutdown();
             // Remove all signal listeners
             for (const registration of this.registeredWorkflows) {
                 Deno.removeSignalListener('SIGINT', registration.sigintListener);
@@ -403,7 +468,7 @@ export class MemoryInterpreter {
     }
 }
 async function waitForReady(log) {
-    const readyCheckUrl = Deno.env.get('READY_CHECK_URL');
+    const readyCheckUrl = Deno.env.get(envReadyCheckURL);
     if (!readyCheckUrl) {
         return Promise.resolve();
     }

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

@@ -1,6 +1,7 @@
 import { Tracer } from '@opentelemetry/api';
 import { Router } from 'express';
 import { Observable, OperatorFunction } from 'rxjs';
+import { ConnectionFactory } from '../../connection/types.js';
 import { ContextImpl } from '../../context/Context.js';
 import { ContextProvider } from '../../context/ContextProvider.js';
 import { ConfigReader } from '../../dsl/http/types.js';
@@ -10,7 +11,6 @@ import { IssueAPI } from '../../issues/Issues.js';
 import { Logger } from '../../observability/logging/Logger.js';
 import { PlatformApi } from '../../services/platform/PlatformApi.js';
 import { ContextOperatorFunction, TaskCompiler, TriggerCompiler } from './compilers/types.js';
-import { ConnectionFactory } from '../../connection/types.js';
 export type CompilerContext = {
     compiler: ObservableCompiler;
     log: Logger;
@@ -23,6 +23,11 @@ export type CompilerContext = {
     issueProvider: IssueAPI;
     configReader: ConfigReader;
     cronRegistry: Map<string, string>;
+    webhookRegistry: Map<string, {
+        method: string;
+        path: string;
+        options: any;
+    }>;
     organisationId: string;
 };
 export type CompilerFunc<In = any, Out = any, T extends Task<In, Out> = Task<In, Out>> = (ctx: CompilerContext, task: T) => OperatorFunction<In, Out>;

package/esm/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,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,MAAM,CAAC;AAEpD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,IAAI,EAAY,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAe,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AASrE,OAAO,EAAE,uBAAuB,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAG9F,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAE9D,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,UAAU,EAAE,iBAAiB,CAAC;IAC9B,WAAW,EAAE,WAAW,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,QAAQ,CAAC;IACxB,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,cAAc,EAAE,MAAM,CAAC;CAC1B,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":"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"}

package/esm/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":"AAgBA,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAG5D,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AAkFnE,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":"AAgBA,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAG5D,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AAmFnE,eAAO,MAAM,aAAa,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAGrE,CAAC"}

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

@@ -21,6 +21,7 @@ function compileCatch(compilerCtx, task) {
             return compilerCtx.tracer.startActiveSpan(`catch`, (span) => {
                 span.setAttribute('execution.id', ctx.executionId);
                 span.setAttribute('task.type', 'catch');
+                span.setAttribute('type', 'task');
                 if (error instanceof Error) {
                     span.recordException(error);
                     span.setAttribute('error.message', error.message);

package/esm/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":"AAgBA,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAEtD,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AA+BnE,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":"AAgBA,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAGtD,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AA2CnE,eAAO,MAAM,UAAU,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAG/D,CAAC"}

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

@@ -1,30 +1,33 @@
-/*
- * Copyright (c) 2025 Versori Group Inc
- *
- * Use of this software is governed by the Business Source License 1.1
- * included in the LICENSE file at the root of this repository.
- *
- * Change Date: 2029-01-01
- * Change License: Apache License, Version 2.0
- *
- * 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, tap } from 'rxjs';
 import { FnTask } from '../../../dsl/tasks/FnTask.js';
+import { enabled as supervisorEnabled } from '../../../internal/supervisor.js';
 function compileFn(compilerCtx, task) {
     return (src) => src.pipe(tap({
         complete: () => compilerCtx.log.debug('fn.complete'),
     }), mergeMap(async (ctx) => {
         return await compilerCtx.tracer.startActiveSpan(`fn-${task.id}`, async (span) => {
             span.setAttribute('task.id', task.id);
+            span.setAttribute('type', 'task');
+            span.setAttribute('task.type', 'fn');
             span.setAttribute('execution.id', ctx.executionId);
-            if (typeof ctx.idx === 'number') {
+            try {
+                let result;
+                const spanContext = span.spanContext();
+                const ctxWithLogger = ctx.withLogger(ctx.log.child({ spanId: spanContext.spanId, traceId: spanContext.traceId }));
+                if (typeof ctx.idx === 'number') {
+                    result = ctx.withData(await task._fn(ctxWithLogger, ctx.idx));
+                }
+                else {
+                    result = ctx.withData(await task._fn(ctxWithLogger));
+                }
+                if (supervisorEnabled) {
+                    span.setAttribute('response.body', JSON.stringify(result.data));
+                }
+                return result;
+            }
+            finally {
                 span.end();
-                return ctx.withData(await task._fn(ctx, ctx.idx));
             }
-            span.end();
-            return ctx.withData(await task._fn(ctx));
         });
     }));
 }

package/esm/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":"AAoBA,OAAO,EAAmB,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAE/E,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AAqFnE,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":"AAqBA,OAAO,EAAmB,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAG/E,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AAuHnE,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAG5E,CAAC"}

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

@@ -13,17 +13,31 @@
 import { mergeMap } from 'rxjs';
 import { tap } from 'rxjs/operators';
 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 { 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.error(`Connection ${task.opts.connection} not found, using default fetch with no credentials`);
-        fetchFactory = Promise.resolve(new StaticFetchFactory(globalThis.fetch));
+        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));
+        }
     }
     else if (cnxMap.dynamic) {
-        fetchFactory = Promise.resolve(new DynamicFetchFactory(compilerCtx.cnxFactory, compilerCtx.platformApi, compilerCtx.organisationId, cnxMap.templateId));
+        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));
+        }
     }
     else {
         fetchFactory = compilerCtx.platformApi.getConnection({
@@ -33,8 +47,21 @@ function compileHttp(compilerCtx, task) {
             },
             throwOnError: true,
         })
-            .then(({ data }) => Promise.all([compilerCtx.cnxFactory.fetcher(data), data.baseUrl ?? '']))
-            .then(([fetcher, baseUrl]) => new StaticFetchFactory(fetcher, baseUrl));
+            .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;
+        });
     }
     async function http(ctx) {
         const [fetch, baseUrl] = await fetchFactory.then((ff) => Promise.all([ff.fetcher(ctx), ff.baseUrl(ctx)]));
@@ -48,10 +75,16 @@ function compileHttp(compilerCtx, task) {
         return compilerCtx.tracer.startActiveSpan(`http-${task.id}`, async (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);
+            const spanContext = span.spanContext();
             try {
-                return await http(ctx);
+                const newCtx = await http(ctx.withLogger(ctx.log.child({ spanId: spanContext.spanId, traceId: spanContext.traceId })));
+                if (supervisorEnabled) {
+                    span.setAttribute('response.body', JSON.stringify(newCtx.data));
+                }
+                return newCtx;
             }
             catch (error) {
                 if (error instanceof Error) {

package/esm/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":"AAuBA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAEzF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAwI7C,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":"AAiBA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAQzF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAyI7C,eAAO,MAAM,gBAAgB,EAAE,eAAe,CAAC,YAAY,EAAE,eAAe,CAG3E,CAAC"}

package/esm/src/interpreter/memory/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
@@ -96,6 +96,7 @@ 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/memory/compilers/webhook.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/webhook.ts"],"names":[],"mappings":"AA0BA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAEtF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAyD7C,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,WAAW,EAAE,cAAc,CA4SxE,CAAC"}
+{"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/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,CA4TxE,CAAC"}

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

@@ -12,12 +12,12 @@
  */
 import cors from 'cors';
 import express from 'express';
+import xmlparser from 'express-xml-bodyparser';
 import { pipeline } from 'node:stream/promises';
 import { Observable } from 'rxjs';
 import { createActIdDynamicWebhookMiddleware, createStaticWebhookMiddleware, createUserIdDynamicWebhookMiddleware, } from '../../../dsl/http/versori/webhookmiddleware.js';
 import { WebhookTrigger } from '../../../dsl/triggers/WebhookTrigger.js';
 import { envVarEnvId } from '../../../internal/constants.js';
-import xmlparser from 'express-xml-bodyparser';
 const xml2jsDefaults = {
     explicitArray: false,
     normalize: false,
@@ -117,6 +117,7 @@ export const webhookCompiler = {
                     ctx.webhookRouter.use(cors(corsOptions));
                 }
             }
+            ctx.webhookRegistry.set(trigger.id, { method, path: `/${trigger.id}`, options: trigger.options });
             // endpoint for sans user because I'm not quite sure how the dynamic routing works
             ctx.webhookRouter[method](`/${trigger.id}`, createStaticWebhookMiddleware({
                 id: trigger.id,
@@ -131,8 +132,12 @@ 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;
-                    const executionCtx = ctx.contextProvider.create(staticActivation, req.body, ctxOptionsFn(req, res));
+                    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 }));
+                    executionCtx.log.info("stack", { stack: new Error().stack });
                     span.setAttribute('execution.id', executionCtx.executionId);
                     try {
                         subscriber.next(executionCtx);
@@ -167,6 +172,7 @@ 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;
                     // Right now we only support a user having one activation
@@ -183,7 +189,9 @@ export const webhookCompiler = {
                         span.end();
                         return;
                     }
-                    const executionCtx = ctx.contextProvider.create(activation, req.body, ctxOptionsFn(req, res));
+                    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 }));
                     span.setAttribute('execution.id', executionCtx.executionId);
                     const errors = [];
                     try {
@@ -223,6 +231,7 @@ 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('activation.id', req.params.activationId);
                     const activation = res.locals.activation;
                     const activationId = activation?.id ?? req.params.activationId;
@@ -237,7 +246,9 @@ export const webhookCompiler = {
                         span.end();
                         return;
                     }
-                    const activationCtx = ctx.contextProvider.create(activation, req.body, ctxOptionsFn(req, res));
+                    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 }));
                     span.setAttribute('execution.id', activationCtx.executionId);
                     try {
                         subscriber.next(activationCtx);

package/esm/src/issues/Issues.js

@@ -11,7 +11,7 @@
  * use of this software will be governed by the Apache License, Version 2.0.
  */
 import { createHash } from 'node:crypto';
-import { envVarEnvId, envVarEnvironmentName, envVarOrgId, envVarOrgSlug, envVarProjectId, envVarSDKApiBaseURL, envVarVersion, } from '../dsl/http/versori/constants.js';
+import { envVarEnvId, envVarEnvironmentName, envVarOrgId, envVarOrgSlug, envVarProjectId, envVarSDKApiBaseURL, envVarVersion, } from '../internal/constants.js';
 export class IssueImpl {
     constructor(log) {
         Object.defineProperty(this, "baseUrl", {

package/esm/src/kv/nats/NatsKeyValueProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NatsKeyValueProvider.d.ts","sourceRoot":"","sources":["../../../../src/src/kv/nats/NatsKeyValueProvider.ts"],"names":[],"mappings":"AAeA,OAAO,EAA+B,UAAU,EAAE,MAAM,+DAA+D,CAAC;AAExH,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AA4CvF,MAAM,MAAM,2BAA2B,GAAG;IACtC,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE;QACF,GAAG,EAAE,MAAM,CAAC;QACZ,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,GAAG,CAAC,EAAE,UAAU,CAAC;KACpB,CAAC;CACL,CAAC;AAuBF,qBAAa,oBAAqB,YAAW,gBAAgB,EAAE,eAAe;IAEtE,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,IAAI;IALzB,OAAO;WAQM,WAAW,CACpB,IAAI,GAAE,OAAO,CAAC,2BAA2B,CAAM,GAChD,OAAO,CAAC,oBAAoB,CAAC;IA0BhC,MAAM,CAAC,OAAO,IAAI,OAAO,CAAC,oBAAoB,CAAC;IAI/C,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC;IAI1C,EAAE,CAAC,OAAO,EAAE,SAAS,GAAG,QAAQ;IAqB1B,OAAO,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IA6CrD,OAAO,CAAC,aAAa;CAYxB"}
+{"version":3,"file":"NatsKeyValueProvider.d.ts","sourceRoot":"","sources":["../../../../src/src/kv/nats/NatsKeyValueProvider.ts"],"names":[],"mappings":"AAeA,OAAO,EAA+B,UAAU,EAAE,MAAM,+DAA+D,CAAC;AACxH,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AA6CvF,MAAM,MAAM,2BAA2B,GAAG;IACtC,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE;QACF,GAAG,EAAE,MAAM,CAAC;QACZ,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,GAAG,CAAC,EAAE,UAAU,CAAC;KACpB,CAAC;CACL,CAAC;AAuBF,qBAAa,oBAAqB,YAAW,gBAAgB,EAAE,eAAe;IAEtE,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,IAAI;IALzB,OAAO;WAQM,WAAW,CACpB,IAAI,GAAE,OAAO,CAAC,2BAA2B,CAAM,GAChD,OAAO,CAAC,oBAAoB,CAAC;IA0BhC,MAAM,CAAC,OAAO,IAAI,OAAO,CAAC,oBAAoB,CAAC;IAI/C,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC;IAI1C,EAAE,CAAC,OAAO,EAAE,SAAS,GAAG,QAAQ;IAqB1B,OAAO,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IA6CrD,OAAO,CAAC,aAAa;CAYxB"}

package/esm/src/kv/nats/NatsKeyValueProvider.js

@@ -13,8 +13,8 @@
 import { JetStreamApiCodes, JetStreamApiError } from '../../../deps/jsr.io/@nats-io/jetstream/3.2.0/src/mod.js';
 import { Kvm } from '../../../deps/jsr.io/@nats-io/kv/3.2.0/src/mod.js';
 import { connect, credsAuthenticator } from '../../../deps/jsr.io/@nats-io/transport-deno/3.2.0/src/mod.js';
-import { isKVOptionsExecution } from '../isKVOptionsExecution.js';
 import { NatsKeyValue } from './NatsKeyValue.js';
+import { isKVOptionsExecution } from '../isKVOptionsExecution.js';
 function getOptionsFromEnv() {
     const natsTlsCaFile = Deno.env.get('RUN_NATS_TLS_CA_FILE');
     return {
@@ -172,7 +172,7 @@ export class NatsKeyValueProvider {
         const activationSuffix = options.activationId ? `.${options.activationId}` : '';
         switch (options.scope) {
             case ':organization:':
-                return `${this.opts.organizationId}`;
+                return `${this.opts.organizationId}${activationSuffix}`;
             case ':project:':
                 return `${this.opts.organizationId}.${this.opts.projectId}.${this.opts.environment}${activationSuffix}`;
             case ':execution:':

package/esm/src/kv/sdk/SDKKeyValueProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SDKKeyValueProvider.d.ts","sourceRoot":"","sources":["../../../../src/src/kv/sdk/SDKKeyValueProvider.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAkCvF,MAAM,MAAM,0BAA0B,GAAG;IACrC,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;CACpB,CAAC;AA6BF,qBAAa,mBAAoB,YAAW,gBAAgB,EAAE,eAAe;IAErE,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,IAAI;IAJzB,OAAO;WAOM,WAAW,CACpB,IAAI,GAAE,OAAO,CAAC,0BAA0B,CAAM,GAC/C,OAAO,CAAC,mBAAmB,CAAC;IAY/B,MAAM,CAAC,OAAO,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAI9C,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC;IAI1C,EAAE,CAAC,OAAO,EAAE,SAAS,GAAG,QAAQ;IAqB1B,OAAO,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IA6CrD,OAAO,CAAC,aAAa;CAYxB"}
+{"version":3,"file":"SDKKeyValueProvider.d.ts","sourceRoot":"","sources":["../../../../src/src/kv/sdk/SDKKeyValueProvider.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAmCvF,MAAM,MAAM,0BAA0B,GAAG;IACrC,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;CACpB,CAAC;AA6BF,qBAAa,mBAAoB,YAAW,gBAAgB,EAAE,eAAe;IAErE,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,IAAI;IAJzB,OAAO;WAOM,WAAW,CACpB,IAAI,GAAE,OAAO,CAAC,0BAA0B,CAAM,GAC/C,OAAO,CAAC,mBAAmB,CAAC;IAY/B,MAAM,CAAC,OAAO,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAI9C,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC;IAI1C,EAAE,CAAC,OAAO,EAAE,SAAS,GAAG,QAAQ;IAqB1B,OAAO,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IA6CrD,OAAO,CAAC,aAAa;CAYxB"}

package/esm/src/kv/sdk/SDKKeyValueProvider.js

@@ -10,10 +10,10 @@
  * 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 { KvOperationsService } from '../../dsl/http/versori/kvapi/services/KvOperationsService.js';
 import { StoresService } from '../../dsl/http/versori/kvapi/services/StoresService.js';
-import { isKVOptionsExecution } from '../isKVOptionsExecution.js';
+import { KvOperationsService } from '../../dsl/http/versori/kvapi/services/KvOperationsService.js';
 import { SDKKeyValue } from './SDKKeyValue.js';
+import { isKVOptionsExecution } from '../isKVOptionsExecution.js';
 function getOptionsFromEnv() {
     return {
         organizationId: Deno.env.get('RUN_ORGANISATION_ID'),
@@ -145,7 +145,7 @@ export class SDKKeyValueProvider {
         const activationSuffix = options.activationId ? `/${options.activationId}` : '';
         switch (options.scope) {
             case ':organization:':
-                return `${this.opts.organizationId}`;
+                return `${this.opts.organizationId}${activationSuffix}`;
             case ':project:':
                 return `${this.opts.organizationId}/${this.opts.projectId}/${this.opts.environment}${activationSuffix}`;
             case ':execution:':

package/esm/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;AAsM/C;;;;;GAKG;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,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;AAqM/C;;;;;GAKG;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,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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@versori/run",
-  "version": "0.4.5",
+  "version": "0.5.0-alpha.1",
   "description": "Versori Run",
   "homepage": "https://github.com/versori/versori-run#readme",
   "repository": {
@@ -27,9 +27,11 @@
     "@connectrpc/connect": "^2.0.4",
     "@connectrpc/connect-node": "^2.0.4",
     "@opentelemetry/api": "^1.9.0",
+    "@opentelemetry/core": "^2.1.0",
     "@opentelemetry/exporter-trace-otlp-proto": "^0.200.0",
     "@opentelemetry/resources": "^2.0.0",
     "@opentelemetry/sdk-node": "^0.200.0",
+    "@opentelemetry/sdk-trace-node": "^2.0.0",
     "cors": "^2.8.5",
     "express": "^4.21.2",
     "express-xml-bodyparser": "^0.3.0",

package/script/src/connection/DirectConnectionFactory.d.ts

@@ -1,6 +1,5 @@
 import { Client } from '@connectrpc/connect';
 import { RequestHandler } from 'express';
-import { CredentialsProvider } from '../credentials/CredentialsProvider.js';
 import { Logger } from '../observability/mod.js';
 import { credentialv1alpha1, oauth1v1, tokensv1 } from '../services/credentials/mod.js';
 import { Connection } from '../services/platform/mod.js';
@@ -16,16 +15,15 @@ import { ConnectionFactory, FetchLike } from './types.js';
  */
 export declare class DirectConnectionFactory implements ConnectionFactory {
     private readonly httpClientFactory;
-    readonly credentials: Client<typeof credentialv1alpha1.CredentialService>;
-    readonly tokens: Client<typeof tokensv1.TokenService>;
-    readonly oauth1: Client<typeof oauth1v1.AuthorizationService>;
+    private readonly credentials;
+    private readonly tokens;
+    private readonly oauth1;
     private readonly logger;
     private readonly outboundConnectionFactory;
     private readonly expressInboundConnectionFactory;
     constructor(httpClientFactory: HttpClientFactory, credentials: Client<typeof credentialv1alpha1.CredentialService>, tokens: Client<typeof tokensv1.TokenService>, oauth1: Client<typeof oauth1v1.AuthorizationService>, logger: Logger);
     fetcher(cnx: Connection): Promise<FetchLike>;
     handler(cnx: Connection): Promise<RequestHandler>;
-    getCredentialsProvider(): CredentialsProvider;
     static fromEnv(logger: Logger): DirectConnectionFactory;
 }
 //# sourceMappingURL=DirectConnectionFactory.d.ts.map