From e62db558460a9f8fd9d7171d3d2c3c0471fc18b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Mathieu?= <loikeseke@gmail.com>
Date: Fri, 25 Oct 2024 17:55:03 +0200
Subject: [PATCH] feat(core): add the system_correlationId label on all
 executions

Fixes #5644
---
 .../java/io/kestra/core/models/executions/Execution.java   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/io/kestra/core/models/executions/Execution.java b/core/src/main/java/io/kestra/core/models/executions/Execution.java
index 18ddade573..46c4a62af1 100644
--- a/core/src/main/java/io/kestra/core/models/executions/Execution.java
+++ b/core/src/main/java/io/kestra/core/models/executions/Execution.java
@@ -143,13 +143,14 @@ public static Execution newExecution(final Flow flow,
             .build();
 
         List<Label> executionLabels = new ArrayList<>(LabelService.labelsExcludingSystem(flow));
-
         if (labels != null) {
             executionLabels.addAll(labels);
         }
-        if (!executionLabels.isEmpty()) {
-            execution = execution.withLabels(executionLabels);
+        if (executionLabels.stream().noneMatch(label -> Label.CORRELATION_ID.equals(label.key()))) {
+            // add a correlation ID if none exist
+            executionLabels.add(new Label(Label.CORRELATION_ID, execution.getId()));
         }
+        execution = execution.withLabels(executionLabels);
 
         if (inputs != null) {
             execution = execution.withInputs(inputs.apply(flow, execution));