Merge branch 'master' into ADO2-62-new-app-layout

* master:
  ci: Fix provenance generation during NPM publish (no-changelog) (#10586)
  feat(core): Expose queue metrics for Prometheus (#10559)
  refactor(core): Map out pubsub messages (no-changelog) (#10566)
  fix: Fix scenario prefix not being passed (no-changelog) (#10575)
  refactor(core): Convert `verbose` to `debug` logs (#10574)

.github/workflows/release-publish.yml

@@ -13,6 +13,8 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event.pull_request.merged == true
     timeout-minutes: 10
+    permissions:
+      id-token: write
     env:
       NPM_CONFIG_PROVENANCE: true
     outputs:

packages/@n8n/benchmark/scripts/runOnVm/runOnVm.mjs

@@ -26,14 +26,13 @@ async function main() {
 			N8N_VERSION: n8nTag,
 			BENCHMARK_VERSION: benchmarkTag,
 			K6_API_TOKEN: k6ApiToken,
-			N8N_BENCHMARK_SCENARIO_NAME_PREFIX: n8nSetupToUse,
 		},
 	});
 
 	try {
 		await $$`docker-compose up -d n8n`;
 
-		await $$`docker-compose run benchmark run`;
+		await $$`docker-compose run benchmark run --scenarioNamePrefix=${n8nSetupToUse} `;
 	} catch (error) {
 		console.error('An error occurred while running the benchmarks:');
 		console.error(error);

packages/@n8n/benchmark/src/commands/run.ts

@@ -16,10 +16,14 @@ export default class RunCommand extends Command {
 			description: 'Comma-separated list of test scenarios to run',
 			required: false,
 		}),
+		scenarioNamePrefix: Flags.string({
+			description: 'Prefix for the scenario name. Defaults to Unnamed',
+			required: false,
+		}),
 	};
 
 	async run() {
-		const config = loadConfig();
+		const config = await this.loadConfigAndMergeWithFlags();
 		const scenarioLoader = new ScenarioLoader();
 
 		const scenarioRunner = new ScenarioRunner(
@@ -41,4 +45,15 @@ export default class RunCommand extends Command {
 
 		await scenarioRunner.runManyScenarios(allScenarios);
 	}
+
+	private async loadConfigAndMergeWithFlags() {
+		const config = loadConfig();
+		const { flags } = await this.parse(RunCommand);
+
+		if (flags.scenarioNamePrefix) {
+			config.set('scenarioNamePrefix', flags.scenarioNamePrefix);
+		}
+
+		return config;
+	}
 }

packages/@n8n/config/src/configs/endpoints.config.ts

@@ -49,6 +49,14 @@ class PrometheusMetricsConfig {
 	/** Whether to include metrics derived from n8n's internal events */
 	@Env('N8N_METRICS_INCLUDE_MESSAGE_EVENT_BUS_METRICS')
 	includeMessageEventBusMetrics: boolean = false;
+
+	/** Whether to include metrics for jobs in scaling mode. Not supported in multi-main setup. */
+	@Env('N8N_METRICS_INCLUDE_QUEUE_METRICS')
+	includeQueueMetrics: boolean = false;
+
+	/** How often (in seconds) to update queue metrics. */
+	@Env('N8N_METRICS_QUEUE_METRICS_INTERVAL')
+	queueMetricsInterval: number = 20;
 }
 
 @Config

packages/@n8n/config/test/config.test.ts

@@ -165,6 +165,8 @@ describe('GlobalConfig', () => {
 				includeApiMethodLabel: false,
 				includeCredentialTypeLabel: false,
 				includeApiStatusCodeLabel: false,
+				includeQueueMetrics: false,
+				queueMetricsInterval: 20,
 			},
 			additionalNonUIRoutes: '',
 			disableProductionWebhooksOnMainProcess: false,

packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ConversationalAgent/execute.ts

@@ -19,7 +19,7 @@ export async function conversationalAgentExecute(
 	this: IExecuteFunctions,
 	nodeVersion: number,
 ): Promise<INodeExecutionData[][]> {
-	this.logger.verbose('Executing Conversational Agent');
+	this.logger.debug('Executing Conversational Agent');
 	const model = await this.getInputConnectionData(NodeConnectionType.AiLanguageModel, 0);
 
 	if (!isChatInstance(model)) {

packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/OpenAiFunctionsAgent/execute.ts

@@ -23,7 +23,7 @@ export async function openAiFunctionsAgentExecute(
 	this: IExecuteFunctions,
 	nodeVersion: number,
 ): Promise<INodeExecutionData[][]> {
-	this.logger.verbose('Executing OpenAi Functions Agent');
+	this.logger.debug('Executing OpenAi Functions Agent');
 	const model = (await this.getInputConnectionData(
 		NodeConnectionType.AiLanguageModel,
 		0,

packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/PlanAndExecuteAgent/execute.ts

@@ -22,7 +22,7 @@ export async function planAndExecuteAgentExecute(
 	this: IExecuteFunctions,
 	nodeVersion: number,
 ): Promise<INodeExecutionData[][]> {
-	this.logger.verbose('Executing PlanAndExecute Agent');
+	this.logger.debug('Executing PlanAndExecute Agent');
 	const model = (await this.getInputConnectionData(
 		NodeConnectionType.AiLanguageModel,
 		0,

packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ReActAgent/execute.ts

@@ -24,7 +24,7 @@ export async function reActAgentAgentExecute(
 	this: IExecuteFunctions,
 	nodeVersion: number,
 ): Promise<INodeExecutionData[][]> {
-	this.logger.verbose('Executing ReAct Agent');
+	this.logger.debug('Executing ReAct Agent');
 
 	const model = (await this.getInputConnectionData(NodeConnectionType.AiLanguageModel, 0)) as
 		| BaseLanguageModel

packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/execute.ts

@@ -29,7 +29,7 @@ const parseTablesString = (tablesString: string) =>
 export async function sqlAgentAgentExecute(
 	this: IExecuteFunctions,
 ): Promise<INodeExecutionData[][]> {
-	this.logger.verbose('Executing SQL Agent');
+	this.logger.debug('Executing SQL Agent');
 
 	const model = (await this.getInputConnectionData(
 		NodeConnectionType.AiLanguageModel,

packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ToolsAgent/execute.ts

@@ -76,7 +76,7 @@ async function extractBinaryMessages(ctx: IExecuteFunctions) {
 }
 
 export async function toolsAgentExecute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-	this.logger.verbose('Executing Tools Agent');
+	this.logger.debug('Executing Tools Agent');
 	const model = await this.getInputConnectionData(NodeConnectionType.AiLanguageModel, 0);
 
 	if (!isChatInstance(model) || !model.bindTools) {

packages/@n8n/nodes-langchain/nodes/chains/ChainLLM/ChainLlm.node.ts

@@ -517,7 +517,7 @@ export class ChainLlm implements INodeType {
 	};
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		this.logger.verbose('Executing LLM Chain');
+		this.logger.debug('Executing LLM Chain');
 		const items = this.getInputData();
 
 		const returnData: INodeExecutionData[] = [];

packages/@n8n/nodes-langchain/nodes/chains/ChainRetrievalQA/ChainRetrievalQa.node.ts

@@ -141,7 +141,7 @@ export class ChainRetrievalQa implements INodeType {
 	};
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		this.logger.verbose('Executing Retrieval QA Chain');
+		this.logger.debug('Executing Retrieval QA Chain');
 
 		const model = (await this.getInputConnectionData(
 			NodeConnectionType.AiLanguageModel,

packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/V1/ChainSummarizationV1.node.ts

@@ -162,7 +162,7 @@ export class ChainSummarizationV1 implements INodeType {
 	}
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		this.logger.verbose('Executing Vector Store QA Chain');
+		this.logger.debug('Executing Vector Store QA Chain');
 		const type = this.getNodeParameter('type', 0) as 'map_reduce' | 'stuff' | 'refine';
 
 		const model = (await this.getInputConnectionData(

packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/V2/ChainSummarizationV2.node.ts

@@ -311,7 +311,7 @@ export class ChainSummarizationV2 implements INodeType {
 	}
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		this.logger.verbose('Executing Summarization Chain V2');
+		this.logger.debug('Executing Summarization Chain V2');
 		const operationMode = this.getNodeParameter('operationMode', 0, 'nodeInputJson') as
 			| 'nodeInputJson'
 			| 'nodeInputBinary'

packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentBinaryInputLoader/DocumentBinaryInputLoader.node.ts

@@ -178,7 +178,7 @@ export class DocumentBinaryInputLoader implements INodeType {
 	};
 
 	async supplyData(this: IExecuteFunctions): Promise<SupplyData> {
-		this.logger.verbose('Supply Data for Binary Input Loader');
+		this.logger.debug('Supply Data for Binary Input Loader');
 		const textSplitter = (await this.getInputConnectionData(
 			NodeConnectionType.AiTextSplitter,
 			0,

packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentJSONInputLoader/DocumentJsonInputLoader.node.ts

@@ -80,7 +80,7 @@ export class DocumentJsonInputLoader implements INodeType {
 	};
 
 	async supplyData(this: IExecuteFunctions): Promise<SupplyData> {
-		this.logger.verbose('Supply Data for JSON Input Loader');
+		this.logger.debug('Supply Data for JSON Input Loader');
 		const textSplitter = (await this.getInputConnectionData(
 			NodeConnectionType.AiTextSplitter,
 			0,

packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsAzureOpenAi/EmbeddingsAzureOpenAi.node.ts

@@ -93,7 +93,7 @@ export class EmbeddingsAzureOpenAi implements INodeType {
 	};
 
 	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
-		this.logger.verbose('Supply data for embeddings');
+		this.logger.debug('Supply data for embeddings');
 		const credentials = await this.getCredentials<{
 			apiKey: string;
 			resourceName: string;

packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsCohere/EmbeddingsCohere.node.ts

@@ -100,7 +100,7 @@ export class EmbeddingsCohere implements INodeType {
 	};
 
 	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
-		this.logger.verbose('Supply data for embeddings Cohere');
+		this.logger.debug('Supply data for embeddings Cohere');
 		const modelName = this.getNodeParameter('modelName', itemIndex, 'embed-english-v2.0') as string;
 		const credentials = await this.getCredentials<{ apiKey: string }>('cohereApi');
 		const embeddings = new CohereEmbeddings({

packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsGoogleGemini/EmbeddingsGoogleGemini.node.ts

@@ -117,7 +117,7 @@ export class EmbeddingsGoogleGemini implements INodeType {
 	};
 
 	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
-		this.logger.verbose('Supply data for embeddings Google Gemini');
+		this.logger.debug('Supply data for embeddings Google Gemini');
 		const modelName = this.getNodeParameter(
 			'modelName',
 			itemIndex,

packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsGooglePalm/EmbeddingsGooglePalm.node.ts

@@ -116,7 +116,7 @@ export class EmbeddingsGooglePalm implements INodeType {
 	};
 
 	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
-		this.logger.verbose('Supply data for embeddings Google PaLM');
+		this.logger.debug('Supply data for embeddings Google PaLM');
 		const modelName = this.getNodeParameter(
 			'modelName',
 			itemIndex,

packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsHuggingFaceInference/EmbeddingsHuggingFaceInference.node.ts

@@ -82,7 +82,7 @@ export class EmbeddingsHuggingFaceInference implements INodeType {
 	};
 
 	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
-		this.logger.verbose('Supply data for embeddings HF Inference');
+		this.logger.debug('Supply data for embeddings HF Inference');
 		const model = this.getNodeParameter(
 			'modelName',
 			itemIndex,

packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsOllama/EmbeddingsOllama.node.ts

@@ -45,7 +45,7 @@ export class EmbeddingsOllama implements INodeType {
 	};
 
 	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
-		this.logger.verbose('Supply data for embeddings Ollama');
+		this.logger.debug('Supply data for embeddings Ollama');
 		const modelName = this.getNodeParameter('model', itemIndex) as string;
 		const credentials = await this.getCredentials('ollamaApi');
 

packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsOpenAI/EmbeddingsOpenAi.node.ts

@@ -171,7 +171,7 @@ export class EmbeddingsOpenAi implements INodeType {
 	};
 
 	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
-		this.logger.verbose('Supply data for embeddings');
+		this.logger.debug('Supply data for embeddings');
 		const credentials = await this.getCredentials('openAiApi');
 
 		const options = this.getNodeParameter('options', itemIndex, {}) as {

packages/@n8n/nodes-langchain/nodes/memory/MemoryChatRetriever/MemoryChatRetriever.node.ts

@@ -88,7 +88,7 @@ export class MemoryChatRetriever implements INodeType {
 	};
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		this.logger.verbose('Executing Chat Memory Retriever');
+		this.logger.debug('Executing Chat Memory Retriever');
 
 		const memory = (await this.getInputConnectionData(NodeConnectionType.AiMemory, 0)) as
 			| BaseChatMemory

packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverContextualCompression/RetrieverContextualCompression.node.ts

@@ -64,7 +64,7 @@ export class RetrieverContextualCompression implements INodeType {
 	};
 
 	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
-		this.logger.verbose('Supplying data for Contextual Compression Retriever');
+		this.logger.debug('Supplying data for Contextual Compression Retriever');
 
 		const model = (await this.getInputConnectionData(
 			NodeConnectionType.AiLanguageModel,

packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverMultiQuery/RetrieverMultiQuery.node.ts

@@ -83,7 +83,7 @@ export class RetrieverMultiQuery implements INodeType {
 	};
 
 	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
-		this.logger.verbose('Supplying data for MultiQuery Retriever');
+		this.logger.debug('Supplying data for MultiQuery Retriever');
 
 		const options = this.getNodeParameter('options', itemIndex, {}) as { queryCount?: number };
 

packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverVectorStore/RetrieverVectorStore.node.ts

@@ -57,7 +57,7 @@ export class RetrieverVectorStore implements INodeType {
 	};
 
 	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
-		this.logger.verbose('Supplying data for Vector Store Retriever');
+		this.logger.debug('Supplying data for Vector Store Retriever');
 
 		const topK = this.getNodeParameter('topK', itemIndex, 4) as number;
 		const vectorStore = (await this.getInputConnectionData(

packages/@n8n/nodes-langchain/nodes/text_splitters/TextSplitterCharacterTextSplitter/TextSplitterCharacterTextSplitter.node.ts

@@ -64,7 +64,7 @@ export class TextSplitterCharacterTextSplitter implements INodeType {
 	};
 
 	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
-		this.logger.verbose('Supply Data for Text Splitter');
+		this.logger.debug('Supply Data for Text Splitter');
 
 		const separator = this.getNodeParameter('separator', itemIndex) as string;
 		const chunkSize = this.getNodeParameter('chunkSize', itemIndex) as number;

packages/@n8n/nodes-langchain/nodes/text_splitters/TextSplitterRecursiveCharacterTextSplitter/TextSplitterRecursiveCharacterTextSplitter.node.ts

@@ -95,7 +95,7 @@ export class TextSplitterRecursiveCharacterTextSplitter implements INodeType {
 	};
 
 	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
-		this.logger.verbose('Supply Data for Text Splitter');
+		this.logger.debug('Supply Data for Text Splitter');
 
 		const chunkSize = this.getNodeParameter('chunkSize', itemIndex) as number;
 		const chunkOverlap = this.getNodeParameter('chunkOverlap', itemIndex) as number;

packages/@n8n/nodes-langchain/nodes/text_splitters/TextSplitterTokenSplitter/TextSplitterTokenSplitter.node.ts

@@ -57,7 +57,7 @@ export class TextSplitterTokenSplitter implements INodeType {
 	};
 
 	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
-		this.logger.verbose('Supply Data for Text Splitter');
+		this.logger.debug('Supply Data for Text Splitter');
 
 		const chunkSize = this.getNodeParameter('chunkSize', itemIndex) as number;
 		const chunkOverlap = this.getNodeParameter('chunkOverlap', itemIndex) as number;

packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePineconeInsert/VectorStorePineconeInsert.node.ts

@@ -97,7 +97,7 @@ export class VectorStorePineconeInsert implements INodeType {
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData(0);
-		this.logger.verbose('Executing data for Pinecone Insert Vector Store');
+		this.logger.debug('Executing data for Pinecone Insert Vector Store');
 
 		const namespace = this.getNodeParameter('pineconeNamespace', 0) as string;
 		const index = this.getNodeParameter('pineconeIndex', 0, '', { extractValue: true }) as string;

packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePineconeLoad/VectorStorePineconeLoad.node.ts

@@ -85,7 +85,7 @@ export class VectorStorePineconeLoad implements INodeType {
 	};
 
 	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
-		this.logger.verbose('Supplying data for Pinecone Load Vector Store');
+		this.logger.debug('Supplying data for Pinecone Load Vector Store');
 
 		const namespace = this.getNodeParameter('pineconeNamespace', itemIndex) as string;
 		const index = this.getNodeParameter('pineconeIndex', itemIndex, '', {

packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreSupabaseInsert/VectorStoreSupabaseInsert.node.ts

@@ -94,7 +94,7 @@ export class VectorStoreSupabaseInsert implements INodeType {
 	methods = { listSearch: { supabaseTableNameSearch } };
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		this.logger.verbose('Executing data for Supabase Insert Vector Store');
+		this.logger.debug('Executing data for Supabase Insert Vector Store');
 
 		const items = this.getInputData(0);
 		const tableName = this.getNodeParameter('tableName', 0, '', { extractValue: true }) as string;

packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreSupabaseLoad/VectorStoreSupabaseLoad.node.ts

@@ -82,7 +82,7 @@ export class VectorStoreSupabaseLoad implements INodeType {
 	methods = { listSearch: { supabaseTableNameSearch } };
 
 	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
-		this.logger.verbose('Supply Supabase Load Vector Store');
+		this.logger.debug('Supply Supabase Load Vector Store');
 
 		const tableName = this.getNodeParameter('tableName', itemIndex, '', {
 			extractValue: true,

packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZepInsert/VectorStoreZepInsert.node.ts

@@ -101,7 +101,7 @@ export class VectorStoreZepInsert implements INodeType {
 	};
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		this.logger.verbose('Executing data for Zep Insert Vector Store');
+		this.logger.debug('Executing data for Zep Insert Vector Store');
 		const items = this.getInputData(0);
 		const collectionName = this.getNodeParameter('collectionName', 0) as string;
 		const options =

packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZepLoad/VectorStoreZepLoad.node.ts

@@ -84,7 +84,7 @@ export class VectorStoreZepLoad implements INodeType {
 	};
 
 	async supplyData(this: IExecuteFunctions, itemIndex: number): Promise<SupplyData> {
-		this.logger.verbose('Supplying data for Zep Load Vector Store');
+		this.logger.debug('Supplying data for Zep Load Vector Store');
 
 		const collectionName = this.getNodeParameter('collectionName', itemIndex) as string;