Merge branch 'master' into server-ansible-cleanup

walmartlabs · Feb 20, 2023 · 15fafa4 · 15fafa4
2 parents 16b50cf + 3d5c506
commit 15fafa4
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/events/TriggerProcessExecutor.java b/server/impl/src/main/java/com/walmartlabs/concord/server/events/TriggerProcessExecutor.java
@@ -166,7 +166,11 @@ private Future<PartialProcessKey> submitProcess(Event event,
             if (t.getArguments() != null) {
                 args.putAll(t.getArguments());
             }
-            args.put("event", ExpressionUtils.escapeMap(event.attributes()));
+
+            Map<String, Object> eventAttributes = new LinkedHashMap<>(event.attributes());
+            eventAttributes.put("id", event.id());
+
+            args.put("event", ExpressionUtils.escapeMap(eventAttributes));
 
             Map<String, Object> cfg = new HashMap<>();
             cfg.put(Constants.Request.ARGUMENTS_KEY, args);