From f59ff8f43d5e66a588efcaf8cc191853efed47cc Mon Sep 17 00:00:00 2001
From: Lawrence Qiu <lawrenceqiu@google.com>
Date: Fri, 10 Apr 2026 20:39:25 -0400
Subject: [PATCH] ci: Add env vars for split units in sdk-platform-java

---
 .github/workflows/ci.yaml                     | 29 +++++++++++++++++++
 .../google/api/gax/logging/Slf4jUtils.java    |  3 +-
 .../api/gax/logging/Slf4jUtilsTest.java       | 14 ++++++---
 3 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index cf5896bff2cd..08d6ad1c6c57 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -147,6 +147,16 @@ jobs:
         BUILD_SUBDIR: ${{matrix.package}}
         JOB_TYPE: test
         JOB_NAME: units-${{matrix.package}}-${{matrix.java}}
+    - name: Env Var Tests
+      if: matrix.package == 'sdk-platform-java'
+      run: .kokoro/build.sh
+      env:
+        BUILD_SUBDIR: ${{matrix.package}}
+        JOB_TYPE: test
+        SUREFIRE_JVM_OPT: '-PenvVarTest'
+        GOOGLE_CLOUD_UNIVERSE_DOMAIN: random.com
+        GOOGLE_CLOUD_ENABLE_DIRECT_PATH_XDS: true
+        GOOGLE_SDK_JAVA_LOGGING: true
   split-units-8:
     runs-on: ubuntu-latest
     name: "split-units"
@@ -198,6 +208,25 @@ jobs:
         JOB_TYPE: test
         JOB_NAME: units-8-runtime-${{matrix.java}}
       working-directory: ${{matrix.package}}
+    - name: Run Env Var Tests in Java ${{matrix.java}} with the source compiled in Java 11
+      if: matrix.package == 'sdk-platform-java'
+      run: |
+        mvn test \
+          -B -ntp \
+          -Pquick-build \
+          -PenvVarTest \
+          -Dorg.slf4j.simpleLogger.showDateTime=true \
+          -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \
+          -Dmaven.wagon.http.retryHandler.count=5 \
+          --also-make \
+          -T 1C
+      env:
+        BUILD_SUBDIR: ${{matrix.package}}
+        JOB_TYPE: test
+        GOOGLE_CLOUD_UNIVERSE_DOMAIN: random.com
+        GOOGLE_CLOUD_ENABLE_DIRECT_PATH_XDS: true
+        GOOGLE_SDK_JAVA_LOGGING: true
+      working-directory: ${{matrix.package}}
   windows:
     runs-on: windows-latest
     steps:
diff --git a/sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/logging/Slf4jUtils.java b/sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/logging/Slf4jUtils.java
index e9bce1101db8..c39d25cf3d3e 100644
--- a/sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/logging/Slf4jUtils.java
+++ b/sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/logging/Slf4jUtils.java
@@ -47,7 +47,6 @@
 class Slf4jUtils {
 
   private static final Logger NO_OP_LOGGER = org.slf4j.helpers.NOPLogger.NOP_LOGGER;
-  private static final boolean loggingEnabled = LoggingUtils.isLoggingEnabled();
 
   private static final boolean isSLF4J2x;
 
@@ -70,7 +69,7 @@ static Logger getLogger(Class<?> clazz) {
 
   // constructor with LoggerFactoryProvider to make testing easier
   static Logger getLogger(Class<?> clazz, LoggerFactoryProvider factoryProvider) {
-    if (loggingEnabled) {
+    if (LoggingUtils.isLoggingEnabled()) {
       ILoggerFactory loggerFactory = factoryProvider.getLoggerFactory();
       return loggerFactory.getLogger(clazz.getName());
     } else {
diff --git a/sdk-platform-java/gax-java/gax/src/test/java/com/google/api/gax/logging/Slf4jUtilsTest.java b/sdk-platform-java/gax-java/gax/src/test/java/com/google/api/gax/logging/Slf4jUtilsTest.java
index b40ca1bc2c9c..1a07a2e3880d 100644
--- a/sdk-platform-java/gax-java/gax/src/test/java/com/google/api/gax/logging/Slf4jUtilsTest.java
+++ b/sdk-platform-java/gax-java/gax/src/test/java/com/google/api/gax/logging/Slf4jUtilsTest.java
@@ -57,10 +57,16 @@ class Slf4jUtilsTest {
   // This test should only run GOOGLE_SDK_JAVA_LOGGING != true
   @Test
   void testGetLogger_loggingDisabled_shouldGetNOPLogger() {
-    Logger logger = Slf4jUtils.getLogger(Slf4jUtilsTest.class);
-    assertEquals(NOPLogger.class, logger.getClass());
-    assertFalse(logger.isInfoEnabled());
-    assertFalse(logger.isDebugEnabled());
+    boolean originalValue = LoggingUtils.isLoggingEnabled();
+    try {
+      LoggingUtils.setLoggingEnabled(false);
+      Logger logger = Slf4jUtils.getLogger(Slf4jUtilsTest.class);
+      assertEquals(NOPLogger.class, logger.getClass());
+      assertFalse(logger.isInfoEnabled());
+      assertFalse(logger.isDebugEnabled());
+    } finally {
+      LoggingUtils.setLoggingEnabled(originalValue);
+    }
   }
 
   // These tests does not require GOOGLE_SDK_JAVA_LOGGING