From 45f96cad4ca3b9e52ced14778c5a8ab63961bea6 Mon Sep 17 00:00:00 2001
From: Nikita Tkachenko <nikita.tkachenko@datadoghq.com>
Date: Wed, 7 Feb 2024 18:32:32 +0100
Subject: [PATCH] Fix stack overflow on initializing
 DatadogTaskListenerDecorator

---
 .../org/datadog/jenkins/plugins/datadog/model/BuildData.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/datadog/jenkins/plugins/datadog/model/BuildData.java b/src/main/java/org/datadog/jenkins/plugins/datadog/model/BuildData.java
index aad3f6ce..0f161378 100644
--- a/src/main/java/org/datadog/jenkins/plugins/datadog/model/BuildData.java
+++ b/src/main/java/org/datadog/jenkins/plugins/datadog/model/BuildData.java
@@ -262,8 +262,8 @@ private static EnvVars getEnvVars(Run run, TaskListener listener) throws IOExcep
 
         List<EnvActionImpl> envActions = run.getActions(EnvActionImpl.class);
         for (EnvActionImpl envAction : envActions) {
-            EnvVars environment = envAction.getEnvironment();
-            mergedVars.putAll(environment);
+            Map<String, String> overriddenEnvironment = envAction.getOverriddenEnvironment();
+            mergedVars.putAll(overriddenEnvironment);
         }
 
         Map<String, String> envVars;