n8n 2.15.0 → 2.16.0

package/dist/modules/otel/handlers/node-start.handler.js

@@ -0,0 +1,37 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NodeStartHandler = void 0;
+const di_1 = require("@n8n/di");
+const api_1 = require("@opentelemetry/api");
+const otel_constants_1 = require("../otel.constants");
+let NodeStartHandler = class NodeStartHandler {
+    handle(ctx, spans, tracer) {
+        const node = ctx.workflow.nodes.find((n) => n.name === ctx.nodeName);
+        if (!node)
+            return;
+        const workflowSpan = spans.getWorkflow(ctx.executionId);
+        const parentCtx = workflowSpan
+            ? api_1.trace.setSpan(api_1.context.active(), workflowSpan)
+            : api_1.context.active();
+        const span = tracer.startSpan('node.execute', {
+            attributes: {
+                [otel_constants_1.ATTR.NODE_ID]: node.id,
+                [otel_constants_1.ATTR.NODE_NAME]: node.name,
+                [otel_constants_1.ATTR.NODE_TYPE]: node.type,
+                [otel_constants_1.ATTR.NODE_TYPE_VERSION]: node.typeVersion,
+            },
+        }, parentCtx);
+        spans.addNode(ctx.executionId, node.id, span);
+    }
+};
+exports.NodeStartHandler = NodeStartHandler;
+exports.NodeStartHandler = NodeStartHandler = __decorate([
+    (0, di_1.Service)()
+], NodeStartHandler);
+//# sourceMappingURL=node-start.handler.js.map

package/dist/modules/otel/handlers/node-start.handler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"node-start.handler.js","sourceRoot":"","sources":["../../../../src/modules/otel/handlers/node-start.handler.ts"],"names":[],"mappings":";;;;;;;;;AACA,gCAAkC;AAClC,4CAAoD;AAGpD,sDAAyC;AAKlC,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAC5B,MAAM,CAAC,GAA6B,EAAE,KAAmB,EAAE,MAAc;QACxE,MAAM,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,QAAQ,CAAC,CAAC;QACrE,IAAI,CAAC,IAAI;YAAE,OAAO;QAElB,MAAM,YAAY,GAAG,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QACxD,MAAM,SAAS,GAAG,YAAY;YAC7B,CAAC,CAAC,WAAK,CAAC,OAAO,CAAC,aAAO,CAAC,MAAM,EAAE,EAAE,YAAY,CAAC;YAC/C,CAAC,CAAC,aAAO,CAAC,MAAM,EAAE,CAAC;QAEpB,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAC5B,cAAc,EACd;YACC,UAAU,EAAE;gBACX,CAAC,qBAAI,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,EAAE;gBACvB,CAAC,qBAAI,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,IAAI;gBAC3B,CAAC,qBAAI,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,IAAI;gBAC3B,CAAC,qBAAI,CAAC,iBAAiB,CAAC,EAAE,IAAI,CAAC,WAAW;aAC1C;SACD,EACD,SAAS,CACT,CAAC;QAEF,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IAC/C,CAAC;CACD,CAAA;AAzBY,4CAAgB;2BAAhB,gBAAgB;IAD5B,IAAA,YAAO,GAAE;GACG,gBAAgB,CAyB5B"}

package/dist/modules/otel/handlers/workflow-end.handler.d.ts

@@ -3,5 +3,6 @@ import type { SpanHandler } from './interfaces';
 import type { SpanRegistry } from '../span-registry';
 export declare class WorkflowEndHandler implements SpanHandler<WorkflowExecuteAfterContext> {
     handle(ctx: WorkflowExecuteAfterContext, spans: SpanRegistry): void;
+    private endDanglingNodeSpans;
     private getErrorType;
 }

package/dist/modules/otel/handlers/workflow-end.handler.js

@@ -35,8 +35,16 @@ let WorkflowEndHandler = class WorkflowEndHandler {
             span.setStatus({ code: api_1.SpanStatusCode.OK });
         }
         span.end();
+        this.endDanglingNodeSpans(ctx.executionId, spans);
         spans.cleanup(ctx.executionId);
     }
+    endDanglingNodeSpans(executionId, spans) {
+        for (const span of spans.findUnendedNodeSpans(executionId)) {
+            span.setAttribute(otel_constants_1.ATTR.NODE_TERMINATION_REASON, 'workflow_cancelled');
+            span.setStatus({ code: api_1.SpanStatusCode.ERROR });
+            span.end();
+        }
+    }
     getErrorType(error) {
         if (!isRecord(error))
             return 'UnknownError';

package/dist/modules/otel/handlers/workflow-end.handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"workflow-end.handler.js","sourceRoot":"","sources":["../../../../src/modules/otel/handlers/workflow-end.handler.ts"],"names":[],"mappings":";;;;;;;;;AACA,gCAAkC;AAClC,4CAAoD;AAEpD,sDAAyC;AAKlC,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAC9B,MAAM,CAAC,GAAgC,EAAE,KAAmB;QAC3D,MAAM,IAAI,GAAG,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QACnD,IAAI,CAAC,IAAI;YAAE,OAAO;QAElB,MAAM,UAAU,GAAqC;YACpD,CAAC,qBAAI,CAAC,cAAc,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,IAAI;YACvC,CAAC,qBAAI,CAAC,gBAAgB,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM;YAC3C,CAAC,qBAAI,CAAC,kBAAkB,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,OAAO;SACvD,CAAC;QACF,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;YACjB,UAAU,CAAC,qBAAI,CAAC,kBAAkB,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC;QACnD,CAAC;QACD,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QAE/B,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YACvD,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,oBAAc,CAAC,KAAK,EAAE,CAAC,CAAC;YAE/C,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;YAChD,IAAI,KAAK,EAAE,CAAC;gBACX,IAAI,CAAC,YAAY,CAAC,qBAAI,CAAC,oBAAoB,EAAE,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;YACxE,CAAC;QACF,CAAC;aAAM,CAAC;YACP,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,oBAAc,CAAC,EAAE,EAAE,CAAC,CAAC;QAC7C,CAAC;QAED,IAAI,CAAC,GAAG,EAAE,CAAC;QACX,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAChC,CAAC;IAEO,YAAY,CAAC,KAAc;QAClC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;YAAE,OAAO,cAAc,CAAC;QAE5C,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC;QAC7B,IAAI,OAAO,SAAS,KAAK,QAAQ,IAAI,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE;YAAE,OAAO,SAAS,CAAC;QAE/E,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;QACtC,IAAI,OAAO,WAAW,KAAK,UAAU;YAAE,OAAO,cAAc,CAAC;QAE7D,MAAM,eAAe,GAAG,WAAW,CAAC,IAAI,CAAC;QACzC,IACC,OAAO,eAAe,KAAK,QAAQ;YACnC,eAAe,CAAC,IAAI,EAAE,KAAK,EAAE;YAC7B,eAAe,KAAK,QAAQ,EAC3B,CAAC;YACF,OAAO,eAAe,CAAC;QACxB,CAAC;QAED,OAAO,cAAc,CAAC;IACvB,CAAC;CACD,CAAA;AAlDY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,YAAO,GAAE;GACG,kBAAkB,CAkD9B;AAED,SAAS,QAAQ,CAAC,KAAc;IAC/B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,CAAC;AACpD,CAAC"}
+{"version":3,"file":"workflow-end.handler.js","sourceRoot":"","sources":["../../../../src/modules/otel/handlers/workflow-end.handler.ts"],"names":[],"mappings":"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"}

package/dist/modules/otel/n8n-instrumentation.d.ts

@@ -1,15 +1,21 @@
 import { Logger } from '@n8n/backend-common';
-import type { WorkflowExecuteBeforeContext, WorkflowExecuteAfterContext } from '@n8n/decorators';
+import type { WorkflowExecuteBeforeContext, WorkflowExecuteAfterContext, NodeExecuteBeforeContext, NodeExecuteAfterContext } from '@n8n/decorators';
+import { NodeEndHandler } from './handlers/node-end.handler';
+import { NodeStartHandler } from './handlers/node-start.handler';
 import { WorkflowEndHandler } from './handlers/workflow-end.handler';
 import { WorkflowStartHandler } from './handlers/workflow-start.handler';
+import { OtelConfig } from './otel.config';
 export declare class N8nInstrumentation {
+    private readonly config;
     private readonly logger;
     private readonly spans;
     private readonly tracer;
     private readonly lifecycleDispatchers;
     private readonly loggedFailureEvents;
-    constructor(workflowStartHandler: WorkflowStartHandler, workflowEndHandler: WorkflowEndHandler, logger: Logger);
+    constructor(workflowStartHandler: WorkflowStartHandler, workflowEndHandler: WorkflowEndHandler, nodeStartHandler: NodeStartHandler, nodeEndHandler: NodeEndHandler, config: OtelConfig, logger: Logger);
     onWorkflowStart(ctx: WorkflowExecuteBeforeContext): void;
     onWorkflowEnd(ctx: WorkflowExecuteAfterContext): void;
+    onNodeStart(ctx: NodeExecuteBeforeContext): void;
+    onNodeEnd(ctx: NodeExecuteAfterContext): void;
     private executeLifecycleHandler;
 }

package/dist/modules/otel/n8n-instrumentation.js

@@ -14,12 +14,16 @@ const backend_common_1 = require("@n8n/backend-common");
 const decorators_1 = require("@n8n/decorators");
 const di_1 = require("@n8n/di");
 const api_1 = require("@opentelemetry/api");
+const node_end_handler_1 = require("./handlers/node-end.handler");
+const node_start_handler_1 = require("./handlers/node-start.handler");
 const workflow_end_handler_1 = require("./handlers/workflow-end.handler");
 const workflow_start_handler_1 = require("./handlers/workflow-start.handler");
+const otel_config_1 = require("./otel.config");
 const span_registry_1 = require("./span-registry");
 const TRACER_NAME = 'n8n-workflow';
 let N8nInstrumentation = class N8nInstrumentation {
-    constructor(workflowStartHandler, workflowEndHandler, logger) {
+    constructor(workflowStartHandler, workflowEndHandler, nodeStartHandler, nodeEndHandler, config, logger) {
+        this.config = config;
         this.logger = logger;
         this.spans = new span_registry_1.SpanRegistry();
         this.tracer = api_1.trace.getTracer(TRACER_NAME);
@@ -27,6 +31,8 @@ let N8nInstrumentation = class N8nInstrumentation {
         this.lifecycleDispatchers = {
             workflowExecuteBefore: (ctx) => workflowStartHandler.handle(ctx, this.spans, this.tracer),
             workflowExecuteAfter: (ctx) => workflowEndHandler.handle(ctx, this.spans),
+            nodeExecuteBefore: (ctx) => nodeStartHandler.handle(ctx, this.spans, this.tracer),
+            nodeExecuteAfter: (ctx) => nodeEndHandler.handle(ctx, this.spans),
         };
     }
     onWorkflowStart(ctx) {
@@ -35,6 +41,16 @@ let N8nInstrumentation = class N8nInstrumentation {
     onWorkflowEnd(ctx) {
         this.executeLifecycleHandler('workflowExecuteAfter', ctx);
     }
+    onNodeStart(ctx) {
+        if (!this.config.includeNodeSpans)
+            return;
+        this.executeLifecycleHandler('nodeExecuteBefore', ctx);
+    }
+    onNodeEnd(ctx) {
+        if (!this.config.includeNodeSpans)
+            return;
+        this.executeLifecycleHandler('nodeExecuteAfter', ctx);
+    }
     executeLifecycleHandler(event, ctx) {
         try {
             this.lifecycleDispatchers[event](ctx);
@@ -63,10 +79,25 @@ __decorate([
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", void 0)
 ], N8nInstrumentation.prototype, "onWorkflowEnd", null);
+__decorate([
+    (0, decorators_1.OnLifecycleEvent)('nodeExecuteBefore'),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", void 0)
+], N8nInstrumentation.prototype, "onNodeStart", null);
+__decorate([
+    (0, decorators_1.OnLifecycleEvent)('nodeExecuteAfter'),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", void 0)
+], N8nInstrumentation.prototype, "onNodeEnd", null);
 exports.N8nInstrumentation = N8nInstrumentation = __decorate([
     (0, di_1.Service)(),
     __metadata("design:paramtypes", [workflow_start_handler_1.WorkflowStartHandler,
         workflow_end_handler_1.WorkflowEndHandler,
+        node_start_handler_1.NodeStartHandler,
+        node_end_handler_1.NodeEndHandler,
+        otel_config_1.OtelConfig,
         backend_common_1.Logger])
 ], N8nInstrumentation);
 //# sourceMappingURL=n8n-instrumentation.js.map

package/dist/modules/otel/n8n-instrumentation.js.map

@@ -1 +1 @@
-{"version":3,"file":"n8n-instrumentation.js","sourceRoot":"","sources":["../../../src/modules/otel/n8n-instrumentation.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAA6C;AAC7C,gDAAmD;AAEnD,gCAAkC;AAClC,4CAA2C;AAE3C,0EAAqE;AACrE,8EAAyE;AACzE,mDAA+C;AAE/C,MAAM,WAAW,GAAG,cAAc,CAAC;AAU5B,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAM9B,YACC,oBAA0C,EAC1C,kBAAsC,EACrB,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;QARf,UAAK,GAAG,IAAI,4BAAY,EAAE,CAAC;QAC3B,WAAM,GAAG,WAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QAEtC,wBAAmB,GAAG,IAAI,GAAG,EAAkC,CAAC;QAOhF,IAAI,CAAC,oBAAoB,GAAG;YAC3B,qBAAqB,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,oBAAoB,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC;YACzF,oBAAoB,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,kBAAkB,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC;SACzE,CAAC;IACH,CAAC;IAGD,eAAe,CAAC,GAAiC;QAChD,IAAI,CAAC,uBAAuB,CAAC,uBAAuB,EAAE,GAAG,CAAC,CAAC;IAC5D,CAAC;IAGD,aAAa,CAAC,GAAgC;QAC7C,IAAI,CAAC,uBAAuB,CAAC,sBAAsB,EAAE,GAAG,CAAC,CAAC;IAC3D,CAAC;IAEO,uBAAuB,CAC9B,KAAQ,EACR,GAA6B;QAE7B,IAAI,CAAC;YACJ,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC;QACvC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,KAAK,CAAC;gBAAE,OAAO;YAEhD,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACpC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,2CAA2C,EAAE;gBAC9D,KAAK;gBACL,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;aAC7D,CAAC,CAAC;QACJ,CAAC;IACF,CAAC;CACD,CAAA;AA3CY,gDAAkB;AAkB9B;IADC,IAAA,6BAAgB,EAAC,uBAAuB,CAAC;;;;yDAGzC;AAGD;IADC,IAAA,6BAAgB,EAAC,sBAAsB,CAAC;;;;uDAGxC;6BAzBW,kBAAkB;IAD9B,IAAA,YAAO,GAAE;qCAQc,6CAAoB;QACtB,yCAAkB;QACb,uBAAM;GATpB,kBAAkB,CA2C9B"}
+{"version":3,"file":"n8n-instrumentation.js","sourceRoot":"","sources":["../../../src/modules/otel/n8n-instrumentation.ts"],"names":[],"mappings":"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"}

package/dist/modules/otel/otel.config.d.ts

@@ -6,4 +6,5 @@ export declare class OtelConfig {
     exporterServiceName: string;
     tracesSampleRate: number;
     startupConnectivityTimeoutMs: number;
+    includeNodeSpans: boolean;
 }

package/dist/modules/otel/otel.config.js

@@ -20,6 +20,7 @@ let OtelConfig = class OtelConfig {
         this.exporterServiceName = 'n8n';
         this.tracesSampleRate = 1.0;
         this.startupConnectivityTimeoutMs = 2_000;
+        this.includeNodeSpans = true;
     }
 };
 exports.OtelConfig = OtelConfig;
@@ -51,6 +52,10 @@ __decorate([
     (0, config_1.Env)('N8N_OTEL_STARTUP_CONNECTIVITY_TIMEOUT_MS'),
     __metadata("design:type", Number)
 ], OtelConfig.prototype, "startupConnectivityTimeoutMs", void 0);
+__decorate([
+    (0, config_1.Env)('N8N_OTEL_TRACES_INCLUDE_NODE_SPANS'),
+    __metadata("design:type", Boolean)
+], OtelConfig.prototype, "includeNodeSpans", void 0);
 exports.OtelConfig = OtelConfig = __decorate([
     config_1.Config
 ], OtelConfig);

package/dist/modules/otel/otel.config.js.map

@@ -1 +1 @@
-{"version":3,"file":"otel.config.js","sourceRoot":"","sources":["../../../src/modules/otel/otel.config.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAA0C;AAGnC,IAAM,UAAU,GAAhB,MAAM,UAAU;IAAhB;QAEN,YAAO,GAAY,KAAK,CAAC;QAGzB,qBAAgB,GAAW,uBAAuB,CAAC;QAGnD,wBAAmB,GAAW,YAAY,CAAC;QAG3C,oBAAe,GAAW,EAAE,CAAC;QAG7B,wBAAmB,GAAW,KAAK,CAAC;QAGpC,qBAAgB,GAAW,GAAG,CAAC;QAG/B,iCAA4B,GAAW,KAAK,CAAC;IAC9C,CAAC;CAAA,CAAA;AArBY,gCAAU;AAEtB;IADC,IAAA,YAAG,EAAC,kBAAkB,CAAC;;2CACC;AAGzB;IADC,IAAA,YAAG,EAAC,iCAAiC,CAAC;;oDACY;AAGnD;IADC,IAAA,YAAG,EAAC,qCAAqC,CAAC;;uDACA;AAG3C;IADC,IAAA,YAAG,EAAC,gCAAgC,CAAC;;mDACT;AAG7B;IADC,IAAA,YAAG,EAAC,gCAAgC,CAAC;;uDACF;AAGpC;IADC,IAAA,YAAG,EAAC,6BAA6B,CAAC;;oDACJ;AAG/B;IADC,IAAA,YAAG,EAAC,0CAA0C,CAAC;;gEACH;qBApBjC,UAAU;IADtB,eAAM;GACM,UAAU,CAqBtB"}
+{"version":3,"file":"otel.config.js","sourceRoot":"","sources":["../../../src/modules/otel/otel.config.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAA0C;AAGnC,IAAM,UAAU,GAAhB,MAAM,UAAU;IAAhB;QAEN,YAAO,GAAY,KAAK,CAAC;QAGzB,qBAAgB,GAAW,uBAAuB,CAAC;QAGnD,wBAAmB,GAAW,YAAY,CAAC;QAG3C,oBAAe,GAAW,EAAE,CAAC;QAG7B,wBAAmB,GAAW,KAAK,CAAC;QAGpC,qBAAgB,GAAW,GAAG,CAAC;QAG/B,iCAA4B,GAAW,KAAK,CAAC;QAG7C,qBAAgB,GAAY,IAAI,CAAC;IAClC,CAAC;CAAA,CAAA;AAxBY,gCAAU;AAEtB;IADC,IAAA,YAAG,EAAC,kBAAkB,CAAC;;2CACC;AAGzB;IADC,IAAA,YAAG,EAAC,iCAAiC,CAAC;;oDACY;AAGnD;IADC,IAAA,YAAG,EAAC,qCAAqC,CAAC;;uDACA;AAG3C;IADC,IAAA,YAAG,EAAC,gCAAgC,CAAC;;mDACT;AAG7B;IADC,IAAA,YAAG,EAAC,gCAAgC,CAAC;;uDACF;AAGpC;IADC,IAAA,YAAG,EAAC,6BAA6B,CAAC;;oDACJ;AAG/B;IADC,IAAA,YAAG,EAAC,0CAA0C,CAAC;;gEACH;AAG7C;IADC,IAAA,YAAG,EAAC,oCAAoC,CAAC;;oDACT;qBAvBrB,UAAU;IADtB,eAAM;GACM,UAAU,CAwBtB"}

package/dist/modules/otel/otel.constants.d.ts

@@ -12,4 +12,11 @@ export declare const ATTR: {
     readonly EXECUTION_IS_RETRY: "n8n.execution.is_retry";
     readonly EXECUTION_RETRY_OF: "n8n.execution.retry_of";
     readonly EXECUTION_ERROR_TYPE: "n8n.execution.error_type";
+    readonly NODE_ID: "n8n.node.id";
+    readonly NODE_NAME: "n8n.node.name";
+    readonly NODE_TYPE: "n8n.node.type";
+    readonly NODE_TYPE_VERSION: "n8n.node.type_version";
+    readonly NODE_ITEMS_INPUT: "n8n.node.items.input";
+    readonly NODE_ITEMS_OUTPUT: "n8n.node.items.output";
+    readonly NODE_TERMINATION_REASON: "n8n.node.termination_reason";
 };

package/dist/modules/otel/otel.constants.js

@@ -16,5 +16,12 @@ exports.ATTR = {
     EXECUTION_IS_RETRY: 'n8n.execution.is_retry',
     EXECUTION_RETRY_OF: 'n8n.execution.retry_of',
     EXECUTION_ERROR_TYPE: 'n8n.execution.error_type',
+    NODE_ID: 'n8n.node.id',
+    NODE_NAME: 'n8n.node.name',
+    NODE_TYPE: 'n8n.node.type',
+    NODE_TYPE_VERSION: 'n8n.node.type_version',
+    NODE_ITEMS_INPUT: 'n8n.node.items.input',
+    NODE_ITEMS_OUTPUT: 'n8n.node.items.output',
+    NODE_TERMINATION_REASON: 'n8n.node.termination_reason',
 };
 //# sourceMappingURL=otel.constants.js.map

package/dist/modules/otel/otel.constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"otel.constants.js","sourceRoot":"","sources":["../../../src/modules/otel/otel.constants.ts"],"names":[],"mappings":";;;AAAA,8EAA8F;AAEjF,QAAA,IAAI,GAAG;IACnB,iBAAiB,EAAE,wCAAiB;IACpC,oBAAoB,EAAE,2CAAoB;IAE1C,WAAW,EAAE,iBAAiB;IAC9B,aAAa,EAAE,mBAAmB;IAElC,WAAW,EAAE,iBAAiB;IAC9B,aAAa,EAAE,mBAAmB;IAClC,mBAAmB,EAAE,yBAAyB;IAE9C,YAAY,EAAE,kBAAkB;IAChC,cAAc,EAAE,oBAAoB;IACpC,gBAAgB,EAAE,sBAAsB;IACxC,kBAAkB,EAAE,wBAAwB;IAC5C,kBAAkB,EAAE,wBAAwB;IAC5C,oBAAoB,EAAE,0BAA0B;CACvC,CAAC"}
+{"version":3,"file":"otel.constants.js","sourceRoot":"","sources":["../../../src/modules/otel/otel.constants.ts"],"names":[],"mappings":";;;AAAA,8EAA8F;AAEjF,QAAA,IAAI,GAAG;IACnB,iBAAiB,EAAE,wCAAiB;IACpC,oBAAoB,EAAE,2CAAoB;IAE1C,WAAW,EAAE,iBAAiB;IAC9B,aAAa,EAAE,mBAAmB;IAElC,WAAW,EAAE,iBAAiB;IAC9B,aAAa,EAAE,mBAAmB;IAClC,mBAAmB,EAAE,yBAAyB;IAE9C,YAAY,EAAE,kBAAkB;IAChC,cAAc,EAAE,oBAAoB;IACpC,gBAAgB,EAAE,sBAAsB;IACxC,kBAAkB,EAAE,wBAAwB;IAC5C,kBAAkB,EAAE,wBAAwB;IAC5C,oBAAoB,EAAE,0BAA0B;IAEhD,OAAO,EAAE,aAAa;IACtB,SAAS,EAAE,eAAe;IAC1B,SAAS,EAAE,eAAe;IAC1B,iBAAiB,EAAE,uBAAuB;IAC1C,gBAAgB,EAAE,sBAAsB;IACxC,iBAAiB,EAAE,uBAAuB;IAC1C,uBAAuB,EAAE,6BAA6B;CAC7C,CAAC"}

package/dist/modules/otel/otel.service.d.ts

@@ -11,8 +11,8 @@ export declare class OtelService {
     constructor(config: OtelConfig, instanceSettings: InstanceSettings, logger: Logger);
     init(): void;
     shutdown(): Promise<void>;
+    parseOtlpHeaders(headersToSplit: string): Record<string, string>;
     private configureDiagnosticsLogger;
-    private parseOtlpHeaders;
     private buildOtlpTracesUrl;
     private checkEndpointReachability;
 }

package/dist/modules/otel/otel.service.js

@@ -33,8 +33,8 @@ let OtelService = OtelService_1 = class OtelService {
         if (!this.config.enabled)
             return;
         this.configureDiagnosticsLogger();
-        const otlpTracesUrl = this.buildOtlpTracesUrl();
-        const otlpHeaders = this.parseOtlpHeaders();
+        const otlpTracesUrl = this.buildOtlpTracesUrl(this.config.exporterEndpoint, this.config.exporterTracingPath);
+        const otlpHeaders = this.parseOtlpHeaders(this.config.exporterHeaders);
         this.sdk = new sdk_node_1.NodeSDK({
             resource: (0, resources_1.resourceFromAttributes)({
                 [otel_constants_1.ATTR.OTEL_SERVICE_NAME]: this.config.exporterServiceName,
@@ -54,23 +54,9 @@ let OtelService = OtelService_1 = class OtelService {
     async shutdown() {
         await this.sdk?.shutdown();
     }
-    configureDiagnosticsLogger() {
-        if (OtelService_1.isDiagnosticsLoggerConfigured)
-            return;
-        const diagnosticsLogger = {
-            error: (...args) => this.logger.error('OpenTelemetry diagnostics error', { args }),
-            warn: (...args) => this.logger.warn('OpenTelemetry diagnostics warning', { args }),
-            info: (...args) => this.logger.info('OpenTelemetry diagnostics info', { args }),
-            debug: (...args) => this.logger.debug('OpenTelemetry diagnostics debug', { args }),
-            verbose: (...args) => this.logger.debug('OpenTelemetry diagnostics verbose', { args }),
-        };
-        api_1.diag.setLogger(diagnosticsLogger, api_1.DiagLogLevel.WARN);
-        OtelService_1.isDiagnosticsLoggerConfigured = true;
-    }
-    parseOtlpHeaders() {
-        const exporterHeaders = this.config.exporterHeaders;
+    parseOtlpHeaders(headersToSplit) {
         const headers = {};
-        for (const pair of exporterHeaders.split(',')) {
+        for (const pair of headersToSplit.split(',')) {
             const trimmedPair = pair.trim();
             if (!trimmedPair)
                 continue;
@@ -88,11 +74,22 @@ let OtelService = OtelService_1 = class OtelService {
         }
         return headers;
     }
-    buildOtlpTracesUrl() {
-        const exporterEndpoint = this.config.exporterEndpoint;
-        const exporterTracingPath = this.config.exporterTracingPath;
-        const exporterEndpointWithoutTrailingSlash = exporterEndpoint.replace(/\/+$/, '');
-        return `${exporterEndpointWithoutTrailingSlash}${exporterTracingPath}`;
+    configureDiagnosticsLogger() {
+        if (OtelService_1.isDiagnosticsLoggerConfigured)
+            return;
+        const diagnosticsLogger = {
+            error: (...args) => this.logger.error('OpenTelemetry diagnostics error', { args }),
+            warn: (...args) => this.logger.warn('OpenTelemetry diagnostics warning', { args }),
+            info: (...args) => this.logger.info('OpenTelemetry diagnostics info', { args }),
+            debug: (...args) => this.logger.debug('OpenTelemetry diagnostics debug', { args }),
+            verbose: (...args) => this.logger.debug('OpenTelemetry diagnostics verbose', { args }),
+        };
+        api_1.diag.setLogger(diagnosticsLogger, api_1.DiagLogLevel.WARN);
+        OtelService_1.isDiagnosticsLoggerConfigured = true;
+    }
+    buildOtlpTracesUrl(endpoint, path) {
+        const exporterEndpointWithoutTrailingSlash = endpoint.replace(/\/+$/, '');
+        return `${exporterEndpointWithoutTrailingSlash}${path}`;
     }
     async checkEndpointReachability(url) {
         try {

package/dist/modules/otel/otel.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"otel.service.js","sourceRoot":"","sources":["../../../src/modules/otel/otel.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"otel.service.js","sourceRoot":"","sources":["../../../src/modules/otel/otel.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,wDAA6C;AAC7C,gCAAkC;AAElC,4CAAwD;AACxD,wFAA6E;AAC7E,wDAAkE;AAClE,sDAAkD;AAClD,kEAAyE;AACzE,uCAA4C;AAE5C,2CAA0C;AAE1C,+CAA2C;AAC3C,qDAAwC;AAGjC,IAAM,WAAW,mBAAjB,MAAM,WAAW;IAKvB,YACkB,MAAkB,EAClB,gBAAkC,EAClC,MAAc;QAFd,WAAM,GAAN,MAAM,CAAY;QAClB,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,WAAM,GAAN,MAAM,CAAQ;QALxB,wCAAmC,GAAG,KAAK,CAAC;IAMjD,CAAC;IAEJ,IAAI;QACH,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO;YAAE,OAAO;QAEjC,IAAI,CAAC,0BAA0B,EAAE,CAAC;QAElC,MAAM,aAAa,GAAG,IAAI,CAAC,kBAAkB,CAC5C,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAC5B,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAC/B,CAAC;QACF,MAAM,WAAW,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QAEvE,IAAI,CAAC,GAAG,GAAG,IAAI,kBAAO,CAAC;YACtB,QAAQ,EAAE,IAAA,kCAAsB,EAAC;gBAChC,CAAC,qBAAI,CAAC,iBAAiB,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,mBAAmB;gBACzD,CAAC,qBAAI,CAAC,oBAAoB,CAAC,EAAE,uBAAW;gBACxC,CAAC,qBAAI,CAAC,WAAW,CAAC,EAAE,IAAI,CAAC,gBAAgB,CAAC,UAAU;gBACpD,CAAC,qBAAI,CAAC,aAAa,CAAC,EAAE,IAAI,CAAC,gBAAgB,CAAC,YAAY;aACxD,CAAC;YACF,aAAa,EAAE,IAAI,6CAAiB,CAAC;gBACpC,GAAG,EAAE,aAAa;gBAClB,OAAO,EAAE,WAAW;aACpB,CAAC;YACF,OAAO,EAAE,IAAI,yCAAwB,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC;SACnE,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;QACjB,KAAK,IAAI,CAAC,yBAAyB,CAAC,aAAa,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,QAAQ;QACb,MAAM,IAAI,CAAC,GAAG,EAAE,QAAQ,EAAE,CAAC;IAC5B,CAAC;IAED,gBAAgB,CAAC,cAAsB;QACtC,MAAM,OAAO,GAA2B,EAAE,CAAC;QAC3C,KAAK,MAAM,IAAI,IAAI,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;YAC9C,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;YAChC,IAAI,CAAC,WAAW;gBAAE,SAAS;YAE3B,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBAChC,IAAI,CAAC,MAAM,CAAC,IAAI,CACf,0CAA0C,WAAW,yDAAyD,CAC9G,CAAC;gBACF,SAAS;YACV,CAAC;YAED,MAAM,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC9C,MAAM,UAAU,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;YAC9B,IAAI,CAAC,UAAU,EAAE,CAAC;gBACjB,IAAI,CAAC,MAAM,CAAC,IAAI,CACf,0CAA0C,WAAW,6CAA6C,CAClG,CAAC;gBACF,SAAS;YACV,CAAC;YAED,OAAO,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QAC7C,CAAC;QACD,OAAO,OAAO,CAAC;IAChB,CAAC;IAEO,0BAA0B;QACjC,IAAI,aAAW,CAAC,6BAA6B;YAAE,OAAO;QAEtD,MAAM,iBAAiB,GAAe;YACrC,KAAK,EAAE,CAAC,GAAG,IAAe,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iCAAiC,EAAE,EAAE,IAAI,EAAE,CAAC;YAC7F,IAAI,EAAE,CAAC,GAAG,IAAe,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mCAAmC,EAAE,EAAE,IAAI,EAAE,CAAC;YAC7F,IAAI,EAAE,CAAC,GAAG,IAAe,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gCAAgC,EAAE,EAAE,IAAI,EAAE,CAAC;YAC1F,KAAK,EAAE,CAAC,GAAG,IAAe,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iCAAiC,EAAE,EAAE,IAAI,EAAE,CAAC;YAC7F,OAAO,EAAE,CAAC,GAAG,IAAe,EAAE,EAAE,CAC/B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE,EAAE,IAAI,EAAE,CAAC;SACjE,CAAC;QACF,UAAI,CAAC,SAAS,CAAC,iBAAiB,EAAE,kBAAY,CAAC,IAAI,CAAC,CAAC;QACrD,aAAW,CAAC,6BAA6B,GAAG,IAAI,CAAC;IAClD,CAAC;IAEO,kBAAkB,CAAC,QAAgB,EAAE,IAAY;QACxD,MAAM,oCAAoC,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAC1E,OAAO,GAAG,oCAAoC,GAAG,IAAI,EAAE,CAAC;IACzD,CAAC;IAEO,KAAK,CAAC,yBAAyB,CAAC,GAAW;QAClD,IAAI,CAAC;YAIJ,MAAM,KAAK,CAAC,GAAG,EAAE;gBAChB,MAAM,EAAE,MAAM;gBACd,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,4BAA4B,CAAC;aACrE,CAAC,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,IAAI,CAAC,mCAAmC;gBAAE,OAAO;YACrD,IAAI,CAAC,mCAAmC,GAAG,IAAI,CAAC;YAEhD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iEAAiE,EAAE;gBACpF,QAAQ,EAAE,GAAG;gBACb,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;aAC7D,CAAC,CAAC;QACJ,CAAC;IACF,CAAC;;AA7GW,kCAAW;AACR,yCAA6B,GAAG,KAAK,AAAR,CAAS;sBADzC,WAAW;IADvB,IAAA,YAAO,GAAE;qCAOiB,wBAAU;QACA,2BAAgB;QAC1B,uBAAM;GARpB,WAAW,CA8GvB"}

package/dist/modules/otel/span-registry.d.ts

@@ -9,5 +9,6 @@ export declare class SpanRegistry {
     addNode(executionId: string, nodeId: string, span: Span): void;
     getNode(executionId: string, nodeId: string): Span | undefined;
     removeNode(executionId: string, nodeId: string): Span | undefined;
+    findUnendedNodeSpans(executionId: string): Span[];
     cleanup(executionId: string): void;
 }

package/dist/modules/otel/span-registry.js

@@ -35,6 +35,17 @@ class SpanRegistry {
         this.spans.delete(key);
         return span;
     }
+    findUnendedNodeSpans(executionId) {
+        const prefix = `${executionId}:`;
+        const dangling = [];
+        for (const [key, span] of this.spans.entries()) {
+            if (key.startsWith(prefix)) {
+                dangling.push(span);
+                this.spans.delete(key);
+            }
+        }
+        return dangling;
+    }
     cleanup(executionId) {
         for (const key of this.spans.keys()) {
             if (key === executionId || key.startsWith(`${executionId}:`)) {

package/dist/modules/otel/span-registry.js.map

@@ -1 +1 @@
-{"version":3,"file":"span-registry.js","sourceRoot":"","sources":["../../../src/modules/otel/span-registry.ts"],"names":[],"mappings":";;;AAEA,MAAa,YAAY;IAAzB;QACS,UAAK,GAAG,IAAI,GAAG,EAAgB,CAAC;IA+CzC,CAAC;IA7CA,MAAM,CAAC,WAAW,CAAC,WAAmB;QACrC,OAAO,WAAW,CAAC;IACpB,CAAC;IAED,MAAM,CAAC,OAAO,CAAC,WAAmB,EAAE,MAAc;QACjD,OAAO,GAAG,WAAW,IAAI,MAAM,EAAE,CAAC;IACnC,CAAC;IAED,WAAW,CAAC,WAAmB,EAAE,IAAU;QAC1C,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,WAAW,CAAC,WAAW,CAAC,EAAE,IAAI,CAAC,CAAC;IAC7D,CAAC;IAED,WAAW,CAAC,WAAmB;QAC9B,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,CAAC;IAC9D,CAAC;IAED,cAAc,CAAC,WAAmB;QACjC,MAAM,GAAG,GAAG,YAAY,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QAClD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACjC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACvB,OAAO,IAAI,CAAC;IACb,CAAC;IAED,OAAO,CAAC,WAAmB,EAAE,MAAc,EAAE,IAAU;QACtD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC;IACjE,CAAC;IAED,OAAO,CAAC,WAAmB,EAAE,MAAc;QAC1C,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC;IAClE,CAAC;IAED,UAAU,CAAC,WAAmB,EAAE,MAAc;QAC7C,MAAM,GAAG,GAAG,YAAY,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QACtD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACjC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACvB,OAAO,IAAI,CAAC;IACb,CAAC;IAED,OAAO,CAAC,WAAmB;QAC1B,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;YACrC,IAAI,GAAG,KAAK,WAAW,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,WAAW,GAAG,CAAC,EAAE,CAAC;gBAC9D,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACxB,CAAC;QACF,CAAC;IACF,CAAC;CACD;AAhDD,oCAgDC"}
+{"version":3,"file":"span-registry.js","sourceRoot":"","sources":["../../../src/modules/otel/span-registry.ts"],"names":[],"mappings":";;;AAEA,MAAa,YAAY;IAAzB;QACS,UAAK,GAAG,IAAI,GAAG,EAAgB,CAAC;IA6DzC,CAAC;IA3DA,MAAM,CAAC,WAAW,CAAC,WAAmB;QACrC,OAAO,WAAW,CAAC;IACpB,CAAC;IAED,MAAM,CAAC,OAAO,CAAC,WAAmB,EAAE,MAAc;QACjD,OAAO,GAAG,WAAW,IAAI,MAAM,EAAE,CAAC;IACnC,CAAC;IAED,WAAW,CAAC,WAAmB,EAAE,IAAU;QAC1C,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,WAAW,CAAC,WAAW,CAAC,EAAE,IAAI,CAAC,CAAC;IAC7D,CAAC;IAED,WAAW,CAAC,WAAmB;QAC9B,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,CAAC;IAC9D,CAAC;IAED,cAAc,CAAC,WAAmB;QACjC,MAAM,GAAG,GAAG,YAAY,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QAClD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACjC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACvB,OAAO,IAAI,CAAC;IACb,CAAC;IAED,OAAO,CAAC,WAAmB,EAAE,MAAc,EAAE,IAAU;QACtD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC;IACjE,CAAC;IAED,OAAO,CAAC,WAAmB,EAAE,MAAc;QAC1C,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC;IAClE,CAAC;IAED,UAAU,CAAC,WAAmB,EAAE,MAAc;QAC7C,MAAM,GAAG,GAAG,YAAY,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QACtD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACjC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACvB,OAAO,IAAI,CAAC;IACb,CAAC;IAED,oBAAoB,CAAC,WAAmB;QACvC,MAAM,MAAM,GAAG,GAAG,WAAW,GAAG,CAAC;QACjC,MAAM,QAAQ,GAAW,EAAE,CAAC;QAE5B,KAAK,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;YAChD,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC5B,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACpB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACxB,CAAC;QACF,CAAC;QAED,OAAO,QAAQ,CAAC;IACjB,CAAC;IAED,OAAO,CAAC,WAAmB;QAC1B,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;YACrC,IAAI,GAAG,KAAK,WAAW,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,WAAW,GAAG,CAAC,EAAE,CAAC;gBAC9D,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACxB,CAAC;QACF,CAAC;IACF,CAAC;CACD;AA9DD,oCA8DC"}

package/dist/modules/provisioning.ee/provisioning.service.ee.d.ts

@@ -1,12 +1,15 @@
 import { ProvisioningConfigDto } from '@n8n/api-types';
 import { Logger } from '@n8n/backend-common';
 import { GlobalConfig } from '@n8n/config';
-import { RoleRepository, SettingsRepository, User, UserRepository, ProjectRepository } from '@n8n/db';
+import { RoleRepository, RoleMappingRuleRepository, SettingsRepository, User, UserRepository, ProjectRepository } from '@n8n/db';
 import { EventService } from '../../events/event.service';
 import { Publisher } from '../../scaling/pubsub/publisher.service';
 import { ProjectService } from '../../services/project.service.ee';
 import { InstanceSettings } from 'n8n-core';
 import { UserService } from '../../services/user.service';
+import { RoleResolverService } from './role-resolver.service.ee';
+import type { RoleResolverContext } from './role-resolver-types';
+export declare function isExpressionMappingFlagEnabled(): boolean;
 export declare class ProvisioningService {
     private readonly eventService;
     private readonly globalConfig;
@@ -19,8 +22,10 @@ export declare class ProvisioningService {
     private readonly logger;
     private readonly publisher;
     private readonly instanceSettings;
+    private readonly roleMappingRuleRepository;
+    private readonly roleResolverService;
     private provisioningConfig;
-    constructor(eventService: EventService, globalConfig: GlobalConfig, settingsRepository: SettingsRepository, projectRepository: ProjectRepository, projectService: ProjectService, roleRepository: RoleRepository, userRepository: UserRepository, userService: UserService, logger: Logger, publisher: Publisher, instanceSettings: InstanceSettings);
+    constructor(eventService: EventService, globalConfig: GlobalConfig, settingsRepository: SettingsRepository, projectRepository: ProjectRepository, projectService: ProjectService, roleRepository: RoleRepository, userRepository: UserRepository, userService: UserService, logger: Logger, publisher: Publisher, instanceSettings: InstanceSettings, roleMappingRuleRepository: RoleMappingRuleRepository, roleResolverService: RoleResolverService);
     init(): Promise<void>;
     getConfig(): Promise<ProvisioningConfigDto>;
     provisionInstanceRoleForUser(user: User, roleSlug: unknown): Promise<void>;
@@ -34,4 +39,10 @@ export declare class ProvisioningService {
     isProvisioningEnabled(): Promise<boolean>;
     private isInstanceRoleProvisioningEnabled;
     private isProjectRolesProvisioningEnabled;
+    isExpressionMappingEnabled(): Promise<boolean>;
+    private buildRoleMappingConfig;
+    private applyExpressionMappedRoles;
+    private applyExpressionMappedInstanceRole;
+    private applyExpressionMappedProjectRoles;
+    provisionExpressionMappedRolesForUser(user: User, context: RoleResolverContext): Promise<void>;
 }

package/dist/modules/provisioning.ee/provisioning.service.ee.js

@@ -10,6 +10,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProvisioningService = void 0;
+exports.isExpressionMappingFlagEnabled = isExpressionMappingFlagEnabled;
 const api_types_1 = require("@n8n/api-types");
 const backend_common_1 = require("@n8n/backend-common");
 const config_1 = require("@n8n/config");
@@ -26,8 +27,12 @@ const zod_1 = require("zod");
 const project_service_ee_1 = require("../../services/project.service.ee");
 const n8n_core_1 = require("n8n-core");
 const user_service_1 = require("../../services/user.service");
+const role_resolver_service_ee_1 = require("./role-resolver.service.ee");
+function isExpressionMappingFlagEnabled() {
+    return process.env.N8N_ENV_FEAT_ROLE_MAPPING_STRATEGY === 'true';
+}
 let ProvisioningService = class ProvisioningService {
-    constructor(eventService, globalConfig, settingsRepository, projectRepository, projectService, roleRepository, userRepository, userService, logger, publisher, instanceSettings) {
+    constructor(eventService, globalConfig, settingsRepository, projectRepository, projectService, roleRepository, userRepository, userService, logger, publisher, instanceSettings, roleMappingRuleRepository, roleResolverService) {
         this.eventService = eventService;
         this.globalConfig = globalConfig;
         this.settingsRepository = settingsRepository;
@@ -39,6 +44,8 @@ let ProvisioningService = class ProvisioningService {
         this.logger = logger;
         this.publisher = publisher;
         this.instanceSettings = instanceSettings;
+        this.roleMappingRuleRepository = roleMappingRuleRepository;
+        this.roleResolverService = roleResolverService;
     }
     async init() {
         this.provisioningConfig = await this.loadConfig();
@@ -197,6 +204,7 @@ let ProvisioningService = class ProvisioningService {
             'scopesName',
             'scopesInstanceRoleClaimName',
             'scopesProjectsRolesClaimName',
+            'scopesUseExpressionMapping',
         ];
         const updatedConfig = {
             ...currentConfig,
@@ -207,6 +215,10 @@ let ProvisioningService = class ProvisioningService {
                 delete updatedConfig[supportedPatchField];
             }
         }
+        if (updatedConfig.scopesUseExpressionMapping &&
+            (updatedConfig.scopesProvisionInstanceRole || updatedConfig.scopesProvisionProjectRoles)) {
+            throw new bad_request_error_1.BadRequestError('Expression-based mapping and direct-claim provisioning cannot both be enabled at the same time.');
+        }
         api_types_1.ProvisioningConfigDto.parse(updatedConfig);
         await this.settingsRepository.upsert({
             key: constants_1.PROVISIONING_PREFERENCES_DB_KEY,
@@ -273,6 +285,135 @@ let ProvisioningService = class ProvisioningService {
         const provisioningConfig = await this.getConfig();
         return provisioningConfig.scopesProvisionProjectRoles;
     }
+    async isExpressionMappingEnabled() {
+        if (!isExpressionMappingFlagEnabled())
+            return false;
+        const provisioningConfig = await this.getConfig();
+        return provisioningConfig.scopesUseExpressionMapping;
+    }
+    async buildRoleMappingConfig() {
+        const dbRules = await this.roleMappingRuleRepository.find({
+            relations: ['role', 'projects'],
+            order: { order: 'ASC' },
+        });
+        const instanceRoleRules = [];
+        const projectRoleRules = [];
+        for (const dbRule of dbRules) {
+            if (dbRule.type === 'instance') {
+                instanceRoleRules.push({
+                    id: dbRule.id,
+                    expression: dbRule.expression,
+                    role: dbRule.role.slug,
+                    enabled: true,
+                });
+            }
+            else {
+                for (const project of dbRule.projects) {
+                    projectRoleRules.push({
+                        id: `${dbRule.id}:${project.id}`,
+                        expression: dbRule.expression,
+                        role: dbRule.role.slug,
+                        projectId: project.id,
+                        enabled: true,
+                    });
+                }
+            }
+        }
+        return { instanceRoleRules, projectRoleRules, fallbackInstanceRole: 'global:member' };
+    }
+    async applyExpressionMappedRoles(user, resolvedRoles) {
+        await this.applyExpressionMappedInstanceRole(user, resolvedRoles.instanceRole);
+        await this.applyExpressionMappedProjectRoles(user.id, resolvedRoles.projectRoles);
+    }
+    async applyExpressionMappedInstanceRole(user, instanceRoleSlug) {
+        let dbRole;
+        try {
+            dbRole = await this.roleRepository.findOneOrFail({ where: { slug: instanceRoleSlug } });
+        }
+        catch {
+            this.logger.warn(`Expression mapping: skipping instance role, slug "${instanceRoleSlug}" not found`, { userId: user.id });
+            return;
+        }
+        if (dbRole.roleType !== 'global') {
+            this.logger.warn(`Expression mapping: skipping instance role, "${instanceRoleSlug}" is not a global role`, { userId: user.id });
+            return;
+        }
+        const globalOwnerRoleSlug = 'global:owner';
+        if (user.role.slug === globalOwnerRoleSlug && dbRole.slug !== globalOwnerRoleSlug) {
+            const otherOwners = await this.userRepository.count({
+                where: { role: { slug: globalOwnerRoleSlug }, id: (0, typeorm_1.Not)(user.id) },
+            });
+            if (otherOwners === 0) {
+                this.logger.warn('Expression mapping: skipping instance role update, cannot demote last owner', { userId: user.id });
+                return;
+            }
+        }
+        if (user.role.slug !== dbRole.slug) {
+            await this.userService.changeUserRole(user, { newRoleName: dbRole.slug });
+            this.eventService.emit('sso-user-instance-role-updated', {
+                userId: user.id,
+                role: dbRole.slug,
+            });
+        }
+    }
+    async applyExpressionMappedProjectRoles(userId, projectRoleMap) {
+        const currentlyAccessibleProjects = await this.projectRepository.find({
+            where: { type: (0, typeorm_1.Not)('personal'), projectRelations: { userId } },
+            relations: ['projectRelations'],
+        });
+        const validMappings = [];
+        if (projectRoleMap.size > 0) {
+            const projectIds = [...projectRoleMap.keys()];
+            const roleSlugs = [...new Set(projectRoleMap.values())];
+            const [existingProjects, existingRoles] = await Promise.all([
+                this.projectRepository.find({
+                    where: { id: (0, typeorm_1.In)(projectIds), type: (0, typeorm_1.Not)('personal') },
+                    select: ['id'],
+                }),
+                this.roleRepository.find({
+                    where: { slug: (0, typeorm_1.In)(roleSlugs), roleType: 'project' },
+                    select: ['displayName', 'slug'],
+                }),
+            ]);
+            const existingProjectIds = new Set(existingProjects.map((p) => p.id));
+            for (const [projectId, roleSlug] of projectRoleMap.entries()) {
+                if (!existingProjectIds.has(projectId)) {
+                    this.logger.warn(`Expression mapping: skipping project ${projectId}, not found or is a personal project`, { userId, projectId, roleSlug });
+                    continue;
+                }
+                const role = existingRoles.find((r) => r.slug === roleSlug);
+                if (!role) {
+                    this.logger.warn(`Expression mapping: skipping role "${roleSlug}", not found or not a project role`, { userId, projectId, roleSlug });
+                    continue;
+                }
+                validMappings.push({ projectId, roleSlug: role.slug });
+            }
+        }
+        const validProjectIds = new Set(validMappings.map((m) => m.projectId));
+        const projectsToRemoveAccessFrom = currentlyAccessibleProjects.filter((p) => !validProjectIds.has(p.id));
+        if (projectsToRemoveAccessFrom.length === 0 && validMappings.length === 0)
+            return;
+        await this.projectRepository.manager.transaction(async (tx) => {
+            for (const project of projectsToRemoveAccessFrom) {
+                await tx.delete(db_1.ProjectRelation, { projectId: project.id, userId });
+            }
+            for (const { projectId, roleSlug } of validMappings) {
+                await this.projectService.addUser(projectId, { userId, role: roleSlug }, tx);
+            }
+        });
+        this.eventService.emit('sso-user-project-access-updated', {
+            projectsAdded: validProjectIds.size,
+            projectsRemoved: projectsToRemoveAccessFrom.length,
+            userId,
+        });
+    }
+    async provisionExpressionMappedRolesForUser(user, context) {
+        if (!(await this.isExpressionMappingEnabled()))
+            return;
+        const config = await this.buildRoleMappingConfig();
+        const resolvedRoles = await this.roleResolverService.resolveRoles(config, context);
+        await this.applyExpressionMappedRoles(user, resolvedRoles);
+    }
 };
 exports.ProvisioningService = ProvisioningService;
 __decorate([
@@ -293,6 +434,8 @@ exports.ProvisioningService = ProvisioningService = __decorate([
         user_service_1.UserService,
         backend_common_1.Logger,
         publisher_service_1.Publisher,
-        n8n_core_1.InstanceSettings])
+        n8n_core_1.InstanceSettings,
+        db_1.RoleMappingRuleRepository,
+        role_resolver_service_ee_1.RoleResolverService])
 ], ProvisioningService);
 //# sourceMappingURL=provisioning.service.ee.js.map