jprdonnelly/kestra
1
0
Fork 0
mirror of https://github.com/kestra-io/kestra.git synced 2025-12-19 18:05:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: Webhook-triggered executions do not generate system.correlationId label while direct API executions do

Browse Source
This commit is contained in:
Pratik Dey
2025-12-13 16:46:51 +05:30
committed by Loïc Mathieu
parent a81de811d7
commit 048dcb80cc
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
webserver/src/main/java/io/kestra/webserver/controllers/api/ExecutionController.java
View File

@@ -38,6 +38,9 @@ import io.kestra.core.utils.ListUtils;
import io.kestra.core.utils.Logs;
import io.kestra.plugin.core.flow.Pause;
import io.kestra.plugin.core.trigger.Webhook;
import io.kestra.webserver.controllers.api.ExecutionController.ApiValidateExecutionInputsResponse;
import io.kestra.webserver.controllers.api.ExecutionController.ApiValidateExecutionInputsResponse.ApiCheckFailure;
import io.kestra.webserver.controllers.api.ExecutionController.ExecutionResponse;
import io.kestra.webserver.converters.QueryFilterFormat;
import io.kestra.webserver.responses.BulkErrorResponse;
import io.kestra.webserver.responses.BulkResponse;
@@ -554,7 +557,6 @@ public class ExecutionController {
if (flow.isDisabled()) {
throw new IllegalStateException("Cannot execute a disabled flow");
}
if (flow instanceof FlowWithException fwe) {
throw new IllegalStateException("Cannot execute an invalid flow: " + fwe.getException());
}
@@ -593,6 +595,17 @@ public class ExecutionController {
result = result.withLabels(LabelService.labelsExcludingSystem(flow));
}
List<Label> labels = ListUtils.emptyOnNull(result.getLabels());
boolean hasCorrelationId = labels.stream()
.anyMatch(label -> label.key().equals(CORRELATION_ID));
if (!hasCorrelationId) {
List<Label> newLabels = new ArrayList<>(labels);
newLabels.add(new Label(CORRELATION_ID, result.getId()));
result = result.withLabels(newLabels);
}
// we check conditions here as it's easier as the execution is created we have the body and headers available for the runContext
var conditionContext = conditionService.conditionContext(runContextFactory.of(flow, result), flow, result);
if (!conditionService.isValid(flow, webhook, conditionContext)) {