n8n 2.26.3 → 2.27.0

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

@@ -11,6 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OtelConfig = void 0;
 const config_1 = require("@n8n/config");
+const otel_constants_1 = require("./otel.constants");
 let OtelConfig = class OtelConfig {
     constructor() {
         this.enabled = false;
@@ -27,43 +28,43 @@ let OtelConfig = class OtelConfig {
 };
 exports.OtelConfig = OtelConfig;
 __decorate([
-    (0, config_1.Env)('N8N_OTEL_ENABLED'),
+    (0, config_1.Env)(otel_constants_1.OTEL_ENV_VARS.enabled),
     __metadata("design:type", Boolean)
 ], OtelConfig.prototype, "enabled", void 0);
 __decorate([
-    (0, config_1.Env)('N8N_OTEL_EXPORTER_OTLP_ENDPOINT'),
+    (0, config_1.Env)(otel_constants_1.OTEL_ENV_VARS.exporterEndpoint),
     __metadata("design:type", String)
 ], OtelConfig.prototype, "exporterEndpoint", void 0);
 __decorate([
-    (0, config_1.Env)('N8N_OTEL_EXPORTER_OTLP_TRACING_PATH'),
+    (0, config_1.Env)(otel_constants_1.OTEL_ENV_VARS.exporterTracingPath),
     __metadata("design:type", String)
 ], OtelConfig.prototype, "exporterTracingPath", void 0);
 __decorate([
-    (0, config_1.Env)('N8N_OTEL_EXPORTER_OTLP_HEADERS'),
+    (0, config_1.Env)(otel_constants_1.OTEL_ENV_VARS.exporterHeaders),
     __metadata("design:type", String)
 ], OtelConfig.prototype, "exporterHeaders", void 0);
 __decorate([
-    (0, config_1.Env)('N8N_OTEL_EXPORTER_SERVICE_NAME'),
+    (0, config_1.Env)(otel_constants_1.OTEL_ENV_VARS.exporterServiceName),
     __metadata("design:type", String)
 ], OtelConfig.prototype, "exporterServiceName", void 0);
 __decorate([
-    (0, config_1.Env)('N8N_OTEL_TRACES_SAMPLE_RATE'),
+    (0, config_1.Env)(otel_constants_1.OTEL_ENV_VARS.tracesSampleRate),
     __metadata("design:type", Number)
 ], OtelConfig.prototype, "tracesSampleRate", void 0);
 __decorate([
-    (0, config_1.Env)('N8N_OTEL_STARTUP_CONNECTIVITY_TIMEOUT_MS'),
+    (0, config_1.Env)(otel_constants_1.OTEL_ENV_VARS.startupConnectivityTimeoutMs),
     __metadata("design:type", Number)
 ], OtelConfig.prototype, "startupConnectivityTimeoutMs", void 0);
 __decorate([
-    (0, config_1.Env)('N8N_OTEL_TRACES_INCLUDE_NODE_SPANS'),
+    (0, config_1.Env)(otel_constants_1.OTEL_ENV_VARS.includeNodeSpans),
     __metadata("design:type", Boolean)
 ], OtelConfig.prototype, "includeNodeSpans", void 0);
 __decorate([
-    (0, config_1.Env)('N8N_OTEL_TRACES_INJECT_OUTBOUND'),
+    (0, config_1.Env)(otel_constants_1.OTEL_ENV_VARS.injectOutbound),
     __metadata("design:type", Boolean)
 ], OtelConfig.prototype, "injectOutbound", void 0);
 __decorate([
-    (0, config_1.Env)('N8N_OTEL_TRACES_PRODUCTION_ONLY'),
+    (0, config_1.Env)(otel_constants_1.OTEL_ENV_VARS.productionExecutionsOnly),
     __metadata("design:type", Boolean)
 ], OtelConfig.prototype, "productionExecutionsOnly", void 0);
 exports.OtelConfig = OtelConfig = __decorate([

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;QAG7C,qBAAgB,GAAY,IAAI,CAAC;QAGjC,mBAAc,GAAY,IAAI,CAAC;QAI/B,6BAAwB,GAAY,IAAI,CAAC;IAC1C,CAAC;CAAA,CAAA;AA/BY,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;AAGjC;IADC,IAAA,YAAG,EAAC,iCAAiC,CAAC;;kDACR;AAI/B;IADC,IAAA,YAAG,EAAC,iCAAiC,CAAC;;4DACE;qBA9B7B,UAAU;IADtB,eAAM;GACM,UAAU,CA+BtB"}
+{"version":3,"file":"otel.config.js","sourceRoot":"","sources":["../../../src/modules/otel/otel.config.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAA0C;AAE1C,qDAAiD;AAG1C,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;QAGjC,mBAAc,GAAY,IAAI,CAAC;QAI/B,6BAAwB,GAAY,IAAI,CAAC;IAC1C,CAAC;CAAA,CAAA;AA/BY,gCAAU;AAEtB;IADC,IAAA,YAAG,EAAC,8BAAa,CAAC,OAAO,CAAC;;2CACF;AAGzB;IADC,IAAA,YAAG,EAAC,8BAAa,CAAC,gBAAgB,CAAC;;oDACe;AAGnD;IADC,IAAA,YAAG,EAAC,8BAAa,CAAC,mBAAmB,CAAC;;uDACI;AAG3C;IADC,IAAA,YAAG,EAAC,8BAAa,CAAC,eAAe,CAAC;;mDACN;AAG7B;IADC,IAAA,YAAG,EAAC,8BAAa,CAAC,mBAAmB,CAAC;;uDACH;AAGpC;IADC,IAAA,YAAG,EAAC,8BAAa,CAAC,gBAAgB,CAAC;;oDACL;AAG/B;IADC,IAAA,YAAG,EAAC,8BAAa,CAAC,4BAA4B,CAAC;;gEACH;AAG7C;IADC,IAAA,YAAG,EAAC,8BAAa,CAAC,gBAAgB,CAAC;;oDACH;AAGjC;IADC,IAAA,YAAG,EAAC,8BAAa,CAAC,cAAc,CAAC;;kDACH;AAI/B;IADC,IAAA,YAAG,EAAC,8BAAa,CAAC,wBAAwB,CAAC;;4DACH;qBA9B7B,UAAU;IADtB,eAAM;GACM,UAAU,CA+BtB"}

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

@@ -1,8 +1,22 @@
+export declare const OTEL_ENV_VARS: {
+    readonly enabled: "N8N_OTEL_ENABLED";
+    readonly exporterEndpoint: "N8N_OTEL_EXPORTER_OTLP_ENDPOINT";
+    readonly exporterTracingPath: "N8N_OTEL_EXPORTER_OTLP_TRACING_PATH";
+    readonly exporterHeaders: "N8N_OTEL_EXPORTER_OTLP_HEADERS";
+    readonly exporterServiceName: "N8N_OTEL_EXPORTER_SERVICE_NAME";
+    readonly tracesSampleRate: "N8N_OTEL_TRACES_SAMPLE_RATE";
+    readonly startupConnectivityTimeoutMs: "N8N_OTEL_STARTUP_CONNECTIVITY_TIMEOUT_MS";
+    readonly includeNodeSpans: "N8N_OTEL_TRACES_INCLUDE_NODE_SPANS";
+    readonly injectOutbound: "N8N_OTEL_TRACES_INJECT_OUTBOUND";
+    readonly productionExecutionsOnly: "N8N_OTEL_TRACES_PRODUCTION_ONLY";
+};
+export declare const OTEL_TEST_SPAN_NAME = "n8n.test_trace";
 export declare const ATTR: {
     readonly OTEL_SERVICE_NAME: "service.name";
     readonly OTEL_SERVICE_VERSION: "service.version";
     readonly INSTANCE_ID: "n8n.instance.id";
     readonly INSTANCE_ROLE: "n8n.instance.role";
+    readonly IS_TEST_TRACE: "n8n.test";
     readonly PROJECT_ID: "n8n.project.id";
     readonly WORKFLOW_ID: "n8n.workflow.id";
     readonly WORKFLOW_VERSION_ID: "n8n.workflow.version_id";

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

@@ -1,12 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ATTR = void 0;
+exports.ATTR = exports.OTEL_TEST_SPAN_NAME = exports.OTEL_ENV_VARS = void 0;
 const semantic_conventions_1 = require("@opentelemetry/semantic-conventions");
+exports.OTEL_ENV_VARS = {
+    enabled: 'N8N_OTEL_ENABLED',
+    exporterEndpoint: 'N8N_OTEL_EXPORTER_OTLP_ENDPOINT',
+    exporterTracingPath: 'N8N_OTEL_EXPORTER_OTLP_TRACING_PATH',
+    exporterHeaders: 'N8N_OTEL_EXPORTER_OTLP_HEADERS',
+    exporterServiceName: 'N8N_OTEL_EXPORTER_SERVICE_NAME',
+    tracesSampleRate: 'N8N_OTEL_TRACES_SAMPLE_RATE',
+    startupConnectivityTimeoutMs: 'N8N_OTEL_STARTUP_CONNECTIVITY_TIMEOUT_MS',
+    includeNodeSpans: 'N8N_OTEL_TRACES_INCLUDE_NODE_SPANS',
+    injectOutbound: 'N8N_OTEL_TRACES_INJECT_OUTBOUND',
+    productionExecutionsOnly: 'N8N_OTEL_TRACES_PRODUCTION_ONLY',
+};
+exports.OTEL_TEST_SPAN_NAME = 'n8n.test_trace';
 exports.ATTR = {
     OTEL_SERVICE_NAME: semantic_conventions_1.ATTR_SERVICE_NAME,
     OTEL_SERVICE_VERSION: semantic_conventions_1.ATTR_SERVICE_VERSION,
     INSTANCE_ID: 'n8n.instance.id',
     INSTANCE_ROLE: 'n8n.instance.role',
+    IS_TEST_TRACE: 'n8n.test',
     PROJECT_ID: 'n8n.project.id',
     WORKFLOW_ID: 'n8n.workflow.id',
     WORKFLOW_VERSION_ID: 'n8n.workflow.version_id',

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,UAAU,EAAE,gBAAgB;IAE5B,WAAW,EAAE,iBAAiB;IAC9B,mBAAmB,EAAE,yBAAyB;IAC9C,aAAa,EAAE,mBAAmB;IAClC,mBAAmB,EAAE,yBAAyB;IAC9C,sBAAsB,EAAE,sBAAsB;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;IACtD,qBAAqB,EAAE,qBAAqB;IAC5C,kBAAkB,EAAE,kBAAkB;IAEtC,mBAAmB,EAAE,yBAAyB;CACrC,CAAC"}
+{"version":3,"file":"otel.constants.js","sourceRoot":"","sources":["../../../src/modules/otel/otel.constants.ts"],"names":[],"mappings":";;;AAAA,8EAA8F;AAEjF,QAAA,aAAa,GAAG;IAC5B,OAAO,EAAE,kBAAkB;IAC3B,gBAAgB,EAAE,iCAAiC;IACnD,mBAAmB,EAAE,qCAAqC;IAC1D,eAAe,EAAE,gCAAgC;IACjD,mBAAmB,EAAE,gCAAgC;IACrD,gBAAgB,EAAE,6BAA6B;IAC/C,4BAA4B,EAAE,0CAA0C;IACxE,gBAAgB,EAAE,oCAAoC;IACtD,cAAc,EAAE,iCAAiC;IACjD,wBAAwB,EAAE,iCAAiC;CAClD,CAAC;AAEE,QAAA,mBAAmB,GAAG,gBAAgB,CAAC;AAEvC,QAAA,IAAI,GAAG;IACnB,iBAAiB,EAAE,wCAAiB;IACpC,oBAAoB,EAAE,2CAAoB;IAE1C,WAAW,EAAE,iBAAiB;IAC9B,aAAa,EAAE,mBAAmB;IAElC,aAAa,EAAE,UAAU;IAEzB,UAAU,EAAE,gBAAgB;IAE5B,WAAW,EAAE,iBAAiB;IAC9B,mBAAmB,EAAE,yBAAyB;IAC9C,aAAa,EAAE,mBAAmB;IAClC,mBAAmB,EAAE,yBAAyB;IAC9C,sBAAsB,EAAE,sBAAsB;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;IACtD,qBAAqB,EAAE,qBAAqB;IAC5C,kBAAkB,EAAE,kBAAkB;IAEtC,mBAAmB,EAAE,yBAAyB;CACrC,CAAC"}

package/dist/modules/otel/otel.module.js

@@ -45,26 +45,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OtelModule = void 0;
 const decorators_1 = require("@n8n/decorators");
 const di_1 = require("@n8n/di");
+const n8n_core_1 = require("n8n-core");
 let OtelModule = class OtelModule {
     async init() {
-        const { OtelConfig } = await Promise.resolve().then(() => __importStar(require('./otel.config')));
-        const config = di_1.Container.get(OtelConfig);
-        if (!config.enabled)
-            return;
-        const { OtelService } = await Promise.resolve().then(() => __importStar(require('./otel.service')));
-        di_1.Container.get(OtelService).init();
         await Promise.resolve().then(() => __importStar(require('./otel-lifecycle-handler')));
+        const { OtelService } = await Promise.resolve().then(() => __importStar(require('./otel.service')));
+        await di_1.Container.get(OtelService).init();
+        if (di_1.Container.get(n8n_core_1.InstanceSettings).instanceType === 'main') {
+            await Promise.resolve().then(() => __importStar(require('./otel-settings.controller')));
+        }
     }
     async settings() {
-        const { OtelConfig } = await Promise.resolve().then(() => __importStar(require('./otel.config')));
-        const config = di_1.Container.get(OtelConfig);
-        return { enabled: config.enabled };
+        const { OtelSettingsService } = await Promise.resolve().then(() => __importStar(require('./otel-settings.service')));
+        const { enabled } = di_1.Container.get(OtelSettingsService).getSettings();
+        return { enabled };
     }
     async context() {
-        const { OtelConfig } = await Promise.resolve().then(() => __importStar(require('./otel.config')));
-        const config = di_1.Container.get(OtelConfig);
-        if (!config.enabled)
-            return {};
         const { ExecutionLevelTracer } = await Promise.resolve().then(() => __importStar(require('./execution-level-tracer')));
         const tracer = di_1.Container.get(ExecutionLevelTracer);
         return {
@@ -72,10 +68,6 @@ let OtelModule = class OtelModule {
         };
     }
     async shutdown() {
-        const { OtelConfig } = await Promise.resolve().then(() => __importStar(require('./otel.config')));
-        const config = di_1.Container.get(OtelConfig);
-        if (!config.enabled)
-            return;
         const { OtelService } = await Promise.resolve().then(() => __importStar(require('./otel.service')));
         await di_1.Container.get(OtelService).shutdown();
     }

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

@@ -1 +1 @@
-{"version":3,"file":"otel.module.js","sourceRoot":"","sources":["../../../src/modules/otel/otel.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAA4D;AAC5D,gCAAoC;AAM7B,IAAM,UAAU,GAAhB,MAAM,UAAU;IACtB,KAAK,CAAC,IAAI;QACT,MAAM,EAAE,UAAU,EAAE,GAAG,wDAAa,eAAe,GAAC,CAAC;QACrD,MAAM,MAAM,GAAG,cAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACzC,IAAI,CAAC,MAAM,CAAC,OAAO;YAAE,OAAO;QAE5B,MAAM,EAAE,WAAW,EAAE,GAAG,wDAAa,gBAAgB,GAAC,CAAC;QACvD,cAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,IAAI,EAAE,CAAC;QAGlC,wDAAa,0BAA0B,GAAC,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,QAAQ;QACb,MAAM,EAAE,UAAU,EAAE,GAAG,wDAAa,eAAe,GAAC,CAAC;QACrD,MAAM,MAAM,GAAG,cAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAEzC,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,OAAO;QACZ,MAAM,EAAE,UAAU,EAAE,GAAG,wDAAa,eAAe,GAAC,CAAC;QACrD,MAAM,MAAM,GAAG,cAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACzC,IAAI,CAAC,MAAM,CAAC,OAAO;YAAE,OAAO,EAAE,CAAC;QAE/B,MAAM,EAAE,oBAAoB,EAAE,GAAG,wDAAa,0BAA0B,GAAC,CAAC;QAC1E,MAAM,MAAM,GAAG,cAAS,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;QAEnD,OAAO;YACN,kBAAkB,EAAE,MAAM,CAAC,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC;SAC1D,CAAC;IACH,CAAC;IAGK,AAAN,KAAK,CAAC,QAAQ;QACb,MAAM,EAAE,UAAU,EAAE,GAAG,wDAAa,eAAe,GAAC,CAAC;QACrD,MAAM,MAAM,GAAG,cAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACzC,IAAI,CAAC,MAAM,CAAC,OAAO;YAAE,OAAO;QAE5B,MAAM,EAAE,WAAW,EAAE,GAAG,wDAAa,gBAAgB,GAAC,CAAC;QACvD,MAAM,cAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC7C,CAAC;CACD,CAAA;AA1CY,gCAAU;AAkChB;IADL,IAAA,uBAAU,GAAE;;;;0CAQZ;qBAzCW,UAAU;IAJtB,IAAA,0BAAa,EAAC;QACd,IAAI,EAAE,MAAM;QACZ,aAAa,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,SAAS,CAAC;KAC5C,CAAC;GACW,UAAU,CA0CtB"}
+{"version":3,"file":"otel.module.js","sourceRoot":"","sources":["../../../src/modules/otel/otel.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAA4D;AAC5D,gCAAoC;AACpC,uCAA4C;AAMrC,IAAM,UAAU,GAAhB,MAAM,UAAU;IACtB,KAAK,CAAC,IAAI;QACT,wDAAa,0BAA0B,GAAC,CAAC;QAEzC,MAAM,EAAE,WAAW,EAAE,GAAG,wDAAa,gBAAgB,GAAC,CAAC;QACvD,MAAM,cAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,IAAI,EAAE,CAAC;QAExC,IAAI,cAAS,CAAC,GAAG,CAAC,2BAAgB,CAAC,CAAC,YAAY,KAAK,MAAM,EAAE,CAAC;YAC7D,wDAAa,4BAA4B,GAAC,CAAC;QAC5C,CAAC;IACF,CAAC;IAED,KAAK,CAAC,QAAQ;QACb,MAAM,EAAE,mBAAmB,EAAE,GAAG,wDAAa,yBAAyB,GAAC,CAAC;QACxE,MAAM,EAAE,OAAO,EAAE,GAAG,cAAS,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,WAAW,EAAE,CAAC;QACrE,OAAO,EAAE,OAAO,EAAE,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,OAAO;QACZ,MAAM,EAAE,oBAAoB,EAAE,GAAG,wDAAa,0BAA0B,GAAC,CAAC;QAC1E,MAAM,MAAM,GAAG,cAAS,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;QAEnD,OAAO;YACN,kBAAkB,EAAE,MAAM,CAAC,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC;SAC1D,CAAC;IACH,CAAC;IAGK,AAAN,KAAK,CAAC,QAAQ;QACb,MAAM,EAAE,WAAW,EAAE,GAAG,wDAAa,gBAAgB,GAAC,CAAC;QACvD,MAAM,cAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC7C,CAAC;CACD,CAAA;AAhCY,gCAAU;AA4BhB;IADL,IAAA,uBAAU,GAAE;;;;0CAIZ;qBA/BW,UAAU;IAJtB,IAAA,0BAAa,EAAC;QACd,IAAI,EAAE,MAAM;QACZ,aAAa,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,SAAS,CAAC;KAC5C,CAAC;GACW,UAAU,CAgCtB"}

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

@@ -1,16 +1,27 @@
 import { Logger } from '@n8n/backend-common';
 import { InstanceSettings } from 'n8n-core';
-import { OtelConfig } from './otel.config';
+import type { OtelConnectionParams } from './otel-settings.service';
+import { OtelSettingsService } from './otel-settings.service';
+export type OtelTestTraceResult = {
+    success: true;
+} | {
+    success: false;
+    error: string;
+};
 export declare class OtelService {
-    private readonly config;
+    private readonly otelSettingsService;
     private readonly instanceSettings;
     private readonly logger;
     private static isDiagnosticsLoggerConfigured;
     private sdk?;
     private hasLoggedStartupConnectivityFailure;
-    constructor(config: OtelConfig, instanceSettings: InstanceSettings, logger: Logger);
-    init(): void;
+    constructor(otelSettingsService: OtelSettingsService, instanceSettings: InstanceSettings, logger: Logger);
+    init(): Promise<void>;
+    restart(): Promise<void>;
+    sendTestTrace(connection: OtelConnectionParams): Promise<OtelTestTraceResult>;
+    private start;
     shutdown(): Promise<void>;
+    private startSdk;
     parseOtlpHeaders(headersToSplit: string): Record<string, string>;
     private configureDiagnosticsLogger;
     private buildOtlpTracesUrl;

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

@@ -17,27 +17,86 @@ const api_1 = require("@opentelemetry/api");
 const exporter_trace_otlp_proto_1 = require("@opentelemetry/exporter-trace-otlp-proto");
 const resources_1 = require("@opentelemetry/resources");
 const sdk_node_1 = require("@opentelemetry/sdk-node");
+const sdk_trace_base_1 = require("@opentelemetry/sdk-trace-base");
 const sdk_trace_node_1 = require("@opentelemetry/sdk-trace-node");
 const n8n_core_1 = require("n8n-core");
-const constants_1 = require("../../constants");
-const otel_config_1 = require("./otel.config");
+const otel_settings_service_1 = require("./otel-settings.service");
 const otel_constants_1 = require("./otel.constants");
+const constants_1 = require("../../constants");
 let OtelService = OtelService_1 = class OtelService {
-    constructor(config, instanceSettings, logger) {
-        this.config = config;
+    constructor(otelSettingsService, instanceSettings, logger) {
+        this.otelSettingsService = otelSettingsService;
         this.instanceSettings = instanceSettings;
         this.logger = logger;
         this.hasLoggedStartupConnectivityFailure = false;
     }
-    init() {
-        if (!this.config.enabled)
+    async init() {
+        const settings = await this.otelSettingsService.loadSettings();
+        this.start(settings);
+    }
+    async restart() {
+        await this.shutdown();
+        const settings = await this.otelSettingsService.loadSettings();
+        this.start(settings);
+    }
+    async sendTestTrace(connection) {
+        const url = this.buildOtlpTracesUrl(connection.exporterEndpoint, connection.exporterTracingPath);
+        const exporter = new exporter_trace_otlp_proto_1.OTLPTraceExporter({
+            url,
+            headers: this.parseOtlpHeaders(connection.exporterHeaders),
+            timeoutMillis: connection.startupConnectivityTimeoutMs,
+        });
+        let provider;
+        try {
+            return await new Promise((resolve) => {
+                const processor = {
+                    onStart: () => { },
+                    onEnd: (span) => exporter.export([span], (result) => resolve(result.error ? { success: false, error: result.error.message } : { success: true })),
+                    forceFlush: async () => { },
+                    shutdown: async () => { },
+                };
+                provider = new sdk_trace_base_1.BasicTracerProvider({
+                    resource: (0, resources_1.resourceFromAttributes)({
+                        [otel_constants_1.ATTR.OTEL_SERVICE_NAME]: connection.exporterServiceName,
+                        [otel_constants_1.ATTR.OTEL_SERVICE_VERSION]: constants_1.N8N_VERSION,
+                        [otel_constants_1.ATTR.INSTANCE_ID]: this.instanceSettings.instanceId,
+                        [otel_constants_1.ATTR.INSTANCE_ROLE]: this.instanceSettings.instanceType,
+                    }),
+                    sampler: new sdk_trace_node_1.TraceIdRatioBasedSampler(1),
+                    spanProcessors: [processor],
+                });
+                const span = provider
+                    .getTracer('n8n-otel-test')
+                    .startSpan(otel_constants_1.OTEL_TEST_SPAN_NAME, { attributes: { [otel_constants_1.ATTR.IS_TEST_TRACE]: true } });
+                span.end();
+            });
+        }
+        finally {
+            await provider?.shutdown().catch(() => { });
+            await exporter.shutdown().catch(() => { });
+        }
+    }
+    start(settings) {
+        this.hasLoggedStartupConnectivityFailure = false;
+        if (!settings.enabled)
             return;
         this.configureDiagnosticsLogger();
-        const otlpTracesUrl = this.buildOtlpTracesUrl(this.config.exporterEndpoint, this.config.exporterTracingPath);
-        const otlpHeaders = this.parseOtlpHeaders(this.config.exporterHeaders);
+        void this.checkEndpointReachability(this.startSdk(settings), settings.startupConnectivityTimeoutMs);
+    }
+    async shutdown() {
+        await this.sdk?.shutdown();
+        this.sdk = undefined;
+        api_1.trace?.disable();
+        api_1.context?.disable();
+        api_1.propagation?.disable();
+        api_1.metrics?.disable();
+    }
+    startSdk(settings) {
+        const otlpTracesUrl = this.buildOtlpTracesUrl(settings.exporterEndpoint, settings.exporterTracingPath);
+        const otlpHeaders = this.parseOtlpHeaders(settings.exporterHeaders);
         this.sdk = new sdk_node_1.NodeSDK({
             resource: (0, resources_1.resourceFromAttributes)({
-                [otel_constants_1.ATTR.OTEL_SERVICE_NAME]: this.config.exporterServiceName,
+                [otel_constants_1.ATTR.OTEL_SERVICE_NAME]: settings.exporterServiceName,
                 [otel_constants_1.ATTR.OTEL_SERVICE_VERSION]: constants_1.N8N_VERSION,
                 [otel_constants_1.ATTR.INSTANCE_ID]: this.instanceSettings.instanceId,
                 [otel_constants_1.ATTR.INSTANCE_ROLE]: this.instanceSettings.instanceType,
@@ -46,13 +105,10 @@ let OtelService = OtelService_1 = class OtelService {
                 url: otlpTracesUrl,
                 headers: otlpHeaders,
             }),
-            sampler: new sdk_trace_node_1.TraceIdRatioBasedSampler(this.config.tracesSampleRate),
+            sampler: new sdk_trace_node_1.TraceIdRatioBasedSampler(settings.tracesSampleRate),
         });
         this.sdk.start();
-        void this.checkEndpointReachability(otlpTracesUrl);
-    }
-    async shutdown() {
-        await this.sdk?.shutdown();
+        return otlpTracesUrl;
     }
     parseOtlpHeaders(headersToSplit) {
         const headers = {};
@@ -91,11 +147,11 @@ let OtelService = OtelService_1 = class OtelService {
         const exporterEndpointWithoutTrailingSlash = endpoint.replace(/\/+$/, '');
         return `${exporterEndpointWithoutTrailingSlash}${path}`;
     }
-    async checkEndpointReachability(url) {
+    async checkEndpointReachability(url, timeoutMs) {
         try {
             await fetch(url, {
                 method: 'HEAD',
-                signal: AbortSignal.timeout(this.config.startupConnectivityTimeoutMs),
+                signal: AbortSignal.timeout(timeoutMs),
             });
         }
         catch (error) {
@@ -113,7 +169,7 @@ exports.OtelService = OtelService;
 OtelService.isDiagnosticsLoggerConfigured = false;
 exports.OtelService = OtelService = OtelService_1 = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [otel_config_1.OtelConfig,
+    __metadata("design:paramtypes", [otel_settings_service_1.OtelSettingsService,
         n8n_core_1.InstanceSettings,
         backend_common_1.Logger])
 ], OtelService);

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":"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"}

package/dist/modules/provisioning.ee/role-mapping-rule.service.ee.d.ts

@@ -24,6 +24,7 @@ export declare class RoleMappingRuleService {
     constructor(roleMappingRuleRepository: RoleMappingRuleRepository, roleRepository: RoleRepository, projectRepository: ProjectRepository);
     list(query: ListRoleMappingRuleQueryInput): Promise<RoleMappingRuleListResponse>;
     create(dto: CreateRoleMappingRuleInput): Promise<RoleMappingRuleResponse>;
+    private saveWithOrderRetry;
     patch(id: string, dto: PatchRoleMappingRuleInput): Promise<RoleMappingRuleResponse>;
     delete(id: string): Promise<{
         ruleType: 'instance' | 'project';

package/dist/modules/provisioning.ee/role-mapping-rule.service.ee.js

@@ -58,31 +58,47 @@ let RoleMappingRuleService = class RoleMappingRuleService {
         if (projects.length !== uniqueProjectIds.length) {
             throw new bad_request_error_1.BadRequestError('One or more projects were not found');
         }
-        const existingRules = await this.roleMappingRuleRepository.find({
-            where: { type: dto.type },
-            select: ['id', 'order'],
-            order: { order: 'ASC' },
-        });
-        const requestedOrder = dto.order ?? existingRules.length;
-        const targetIndex = Math.min(Math.max(requestedOrder, 0), existingRules.length);
-        const maxOrder = existingRules.length > 0 ? existingRules[existingRules.length - 1].order : -1;
-        const tempOrder = Math.max(maxOrder, existingRules.length - 1) + 1;
-        const rule = new db_1.RoleMappingRule();
-        rule.expression = dto.expression;
-        rule.role = role;
-        rule.type = dto.type;
-        rule.order = tempOrder;
-        rule.projects = projects;
-        const saved = await this.roleMappingRuleRepository.save(rule);
-        const reorderedIds = existingRules.map((r) => r.id);
-        reorderedIds.splice(targetIndex, 0, saved.id);
-        await this.applyOrder(reorderedIds);
+        const saved = await this.saveWithOrderRetry(dto, role, projects);
         const loaded = await this.roleMappingRuleRepository.findOneOrFail({
             where: { id: saved.id },
             relations: ['projects', 'role'],
         });
         return this.toResponse(loaded);
     }
+    async saveWithOrderRetry(dto, role, projects) {
+        const maxAttempts = 3;
+        for (let attempt = 0; attempt < maxAttempts; attempt++) {
+            const existingRules = await this.roleMappingRuleRepository.find({
+                where: { type: dto.type },
+                select: ['id', 'order'],
+                order: { order: 'ASC' },
+            });
+            const requestedOrder = dto.order ?? existingRules.length;
+            const targetIndex = Math.min(Math.max(requestedOrder, 0), existingRules.length);
+            const maxOrder = existingRules.length > 0 ? existingRules[existingRules.length - 1].order : -1;
+            const tempOrder = Math.max(maxOrder, existingRules.length - 1) + 1;
+            const rule = new db_1.RoleMappingRule();
+            rule.expression = dto.expression;
+            rule.role = role;
+            rule.type = dto.type;
+            rule.order = tempOrder;
+            rule.projects = projects;
+            try {
+                const saved = await this.roleMappingRuleRepository.save(rule);
+                const reorderedIds = existingRules.map((r) => r.id);
+                reorderedIds.splice(targetIndex, 0, saved.id);
+                await this.applyOrder(reorderedIds);
+                return saved;
+            }
+            catch (error) {
+                if (attempt < maxAttempts - 1 && isUniqueOrderViolation(error)) {
+                    continue;
+                }
+                throw error;
+            }
+        }
+        throw new conflict_error_1.ConflictError('Could not create role mapping rule due to an order conflict');
+    }
     async patch(id, dto) {
         if (typeof id !== 'string' || id.length === 0) {
             throw new bad_request_error_1.BadRequestError('Rule id is required');
@@ -234,4 +250,15 @@ exports.RoleMappingRuleService = RoleMappingRuleService = __decorate([
         db_1.RoleRepository,
         db_1.ProjectRepository])
 ], RoleMappingRuleService);
+function isUniqueOrderViolation(error) {
+    if (!(error instanceof typeorm_1.QueryFailedError))
+        return false;
+    const driverError = error.driverError;
+    const code = driverError?.code;
+    const message = `${error.message} ${driverError?.message ?? ''} ${driverError?.detail ?? ''}`;
+    return (code === '23505' ||
+        code === 'SQLITE_CONSTRAINT_UNIQUE' ||
+        code === 'ER_DUP_ENTRY' ||
+        (code === 'SQLITE_CONSTRAINT' && message.includes('UNIQUE constraint failed')));
+}
 //# sourceMappingURL=role-mapping-rule.service.ee.js.map

package/dist/modules/provisioning.ee/role-mapping-rule.service.ee.js.map

@@ -1 +1 @@
-{"version":3,"file":"role-mapping-rule.service.ee.js","sourceRoot":"","sources":["../../../src/modules/provisioning.ee/role-mapping-rule.service.ee.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"role-mapping-rule.service.ee.js","sourceRoot":"","sources":["../../../src/modules/provisioning.ee/role-mapping-rule.service.ee.ts"],"names":[],"mappings":"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"}

package/dist/modules/redaction/instance-redaction-enforcement.service.js

@@ -19,7 +19,6 @@ const di_1 = require("@n8n/di");
 const n8n_workflow_1 = require("n8n-workflow");
 const publisher_service_1 = require("../../scaling/pubsub/publisher.service");
 const cache_service_1 = require("../../services/cache/cache.service");
-const redaction_enforcement_feature_flag_1 = require("./redaction-enforcement.feature-flag");
 const KEY = 'redaction.enforcement';
 let InstanceRedactionEnforcementService = class InstanceRedactionEnforcementService {
     constructor(settingsRepository, cacheService, logger, publisher, globalConfig) {
@@ -30,8 +29,6 @@ let InstanceRedactionEnforcementService = class InstanceRedactionEnforcementServ
         this.globalConfig = globalConfig;
     }
     async get() {
-        if (!(0, redaction_enforcement_feature_flag_1.isRedactionEnforcementEnabled)())
-            return api_types_1.REDACTION_FLOOR_DEFAULT;
         return await this.load();
     }
     async load() {
@@ -43,9 +40,6 @@ let InstanceRedactionEnforcementService = class InstanceRedactionEnforcementServ
         return this.parseStoredValue(raw, 'cache') ?? api_types_1.REDACTION_FLOOR_DEFAULT;
     }
     async set(next) {
-        if (!(0, redaction_enforcement_feature_flag_1.isRedactionEnforcementEnabled)()) {
-            throw new n8n_workflow_1.OperationalError('Redaction enforcement is not enabled on this instance');
-        }
         const result = api_types_1.redactionFloorSchema.safeParse(next);
         if (!result.success) {
             this.logger.warn('Invalid redaction enforcement settings payload', {

package/dist/modules/redaction/instance-redaction-enforcement.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"instance-redaction-enforcement.service.js","sourceRoot":"","sources":["../../../src/modules/redaction/instance-redaction-enforcement.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"instance-redaction-enforcement.service.js","sourceRoot":"","sources":["../../../src/modules/redaction/instance-redaction-enforcement.service.ts"],"names":[],"mappings":"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"}

package/dist/modules/source-control.ee/source-control-git.service.ee.js

@@ -41,17 +41,14 @@ var __importStar = (this && this.__importStar) || (function () {
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SourceControlGitService = void 0;
 const backend_common_1 = require("@n8n/backend-common");
+const backend_network_1 = require("@n8n/backend-network");
 const di_1 = require("@n8n/di");
 const child_process_1 = require("child_process");
 const n8n_workflow_1 = require("n8n-workflow");
 const path = __importStar(require("path"));
-const proxy_from_env_1 = __importDefault(require("proxy-from-env"));
 const ownership_service_1 = require("../../services/ownership.service");
 const constants_1 = require("./constants");
 const source_control_helper_ee_1 = require("./source-control-helper.ee");
@@ -135,7 +132,7 @@ let SourceControlGitService = class SourceControlGitService {
                 unsafe: { allowUnsafeCredentialHelper: true },
             };
             const repositoryUrl = preferences.repositoryUrl;
-            const proxyUrl = proxy_from_env_1.default.getProxyForUrl(repositoryUrl);
+            const proxyUrl = (0, backend_network_1.resolveProxyUrl)(repositoryUrl);
             if (proxyUrl) {
                 this.logger.debug('Proxy configuration added', { proxyUrl });
                 httpsGitOptions.config.push(`http.proxy=${proxyUrl}`);