From a2dc5ebbb45f171e8f4d10031e48a3a7e637a1cf Mon Sep 17 00:00:00 2001
From: Simon Schrottner <simon.schrottner@dynatrace.com>
Date: Mon, 30 Mar 2026 21:30:34 +0200
Subject: [PATCH 1/2] test: add @env-var tag to env-var config scenarios

Tag all scenario outlines that mutate System environment variables so
the Cucumber exclusive-resources mechanism can serialise them during
parallel execution (ENV_VARS resource lock in junit-platform.properties).

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: Simon Schrottner <simon.schrottner@dynatrace.com>
---
 gherkin/config.feature | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gherkin/config.feature b/gherkin/config.feature
index a33396a..2245ea2 100644
--- a/gherkin/config.feature
+++ b/gherkin/config.feature
@@ -198,6 +198,7 @@ Feature: Configuration Test
       | option     | type   | value      |
       | providerId | String | providerId |
 
+  @env-var
   Scenario Outline: Dedicated Config via Env_var
     Given an environment variable "<env>" with value "<value>"
     When a config was initialized
@@ -274,7 +275,7 @@ Feature: Configuration Test
       | option     | env               | type   | value          |
       | providerId | FLAGD_PROVIDER_ID | String | env-providerId |
 
-  @in-process @sync-port
+  @in-process @sync-port @env-var
   Scenario Outline: Dedicated Config via Env_var special In-process case
     Given an environment variable "<env>" with value "<value>"
     And an option "resolver" of type "ResolverType" with value "in-process"
@@ -284,7 +285,7 @@ Feature: Configuration Test
       | option | env             | type    | value |
       | port   | FLAGD_SYNC_PORT | Integer | 1234  |
 
-  @file
+  @file @env-var
   Scenario Outline: Dedicated Config via Env_var special file case
     Given an environment variable "<env>" with value "<value>"
     And an option "offlineFlagSourcePath" of type "String" with value "some-path"
@@ -296,6 +297,7 @@ Feature: Configuration Test
       | resolver | FLAGD_RESOLVER | ResolverType | file  |
       | resolver | FLAGD_RESOLVER | ResolverType | FILE  |
 
+  @env-var
   Scenario Outline: Dedicated Config via Env_var and set
     Given an environment variable "<env>" with value "<env-value>"
     And an option "<option>" of type "<type>" with value "<value>"
@@ -376,7 +378,7 @@ Feature: Configuration Test
       | option     | env               | type   | value      | env-value  |
       | providerId | FLAGD_PROVIDER_ID | String | providerId | env-prov |
 
-  @in-process @sync-port
+  @in-process @sync-port @env-var
   Scenario: FLAGD_SYNC_PORT takes priority over FLAGD_PORT
     Given an environment variable "FLAGD_SYNC_PORT" with value "9999"
     And an environment variable "FLAGD_PORT" with value "8888"

From f2782788e72633e447b024548cd8a2cbf0c2a026 Mon Sep 17 00:00:00 2001
From: Simon Schrottner <simon.schrottner@dynatrace.com>
Date: Tue, 31 Mar 2026 15:56:38 +0200
Subject: [PATCH 2/2] fix(envoy): reduce connect_timeout and add active health
 checks

Add active TCP health checks (interval=1s) and reduce connect_timeout from
the default 5s to 0.25s on both flagd clusters (RPC port 8013, sync port 8015).

This ensures envoy detects and recovers from upstream flagd restarts within
one health-check cycle rather than waiting for a client-triggered connection
attempt. Combined with the shorter connect_timeout, failed connections are
detected and retried quickly rather than blocking for up to 5 seconds.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: Simon Schrottner <simon.schrottner@dynatrace.com>
---
 docker-compose.yaml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index bab776a..d386d5e 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -134,7 +134,14 @@ services:
             - name: local-sync-service
               type: LOGICAL_DNS
               dns_lookup_family: V4_ONLY
+              connect_timeout: 0.25s
               http2_protocol_options: {}
+              health_checks:
+                - timeout: 1s
+                  interval: 1s
+                  unhealthy_threshold: 1
+                  healthy_threshold: 1
+                  tcp_health_check: {}
               load_assignment:
                 cluster_name: local-sync-service
                 endpoints:
@@ -148,7 +155,14 @@ services:
             - name: local-rpc-service
               type: LOGICAL_DNS
               dns_lookup_family: V4_ONLY
+              connect_timeout: 0.25s
               http2_protocol_options: {}
+              health_checks:
+                - timeout: 1s
+                  interval: 1s
+                  unhealthy_threshold: 1
+                  healthy_threshold: 1
+                  tcp_health_check: {}
               load_assignment:
                 cluster_name: local-rpc-service
                 endpoints: