Merge branch 'master' into SNOW-2161718-JDBC-fix-permission-check-for-toml-config

Author: sfc-gh-ext-simba-vb

src/main/java/net/snowflake/client/jdbc/telemetryOOB/TelemetryThreadPool.java

@@ -2,8 +2,10 @@
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
@@ -39,13 +41,23 @@ public static TelemetryThreadPool getInstance() {
    * allowing the pool to shrink back to zero during periods of inactivity.
    */
   private TelemetryThreadPool() {
+    // Create a thread factory that creates daemon threads to prevent blocking JVM termination
+    ThreadFactory daemonThreadFactory =
+        r -> {
+          Thread thread = Executors.defaultThreadFactory().newThread(r);
+          thread.setName("telemetry-uploader-" + thread.getId());
+          thread.setDaemon(true);
+          return thread;
+        };
+
     uploader =
         new ThreadPoolExecutor(
             CORE_POOL_SIZE, // core size
             CORE_POOL_SIZE, // max size
             30L, // keep alive time
             TimeUnit.SECONDS,
-            new LinkedBlockingQueue<>() // work queue
+            new LinkedBlockingQueue<>(), // work queue
+            daemonThreadFactory // thread factory
             );
     // Allow core threads to time out and be terminated when idle.
     ((ThreadPoolExecutor) uploader).allowCoreThreadTimeOut(true);

src/test/java/net/snowflake/client/jdbc/telemetryOOB/TelemetryThreadPoolTest.java

@@ -2,6 +2,7 @@
 
 import static org.awaitility.Awaitility.await;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.lang.reflect.Field;
 import java.util.Collections;
@@ -10,6 +11,7 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
 import net.snowflake.client.category.TestTags;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
@@ -77,6 +79,24 @@ void testThreadPoolScaling() throws InterruptedException {
             });
   }
 
+  @Test
+  void testTelemetryThreadsAreDaemonThreads() throws InterruptedException {
+    TelemetryThreadPool telemetryPool = TelemetryThreadPool.getInstance();
+    final AtomicBoolean isDaemonThread = new AtomicBoolean(false);
+    final CountDownLatch latch = new CountDownLatch(1);
+
+    telemetryPool.execute(
+        () -> {
+          isDaemonThread.set(Thread.currentThread().isDaemon());
+          latch.countDown();
+        });
+
+    // Wait for the task to complete
+    latch.await(1, TimeUnit.SECONDS);
+
+    assertTrue(isDaemonThread.get(), "TelemetryThreadPool threads should be daemon threads");
+  }
+
   private ThreadPoolExecutor getThreadPoolExecutor(TelemetryThreadPool telemetryThreadPool) {
     try {
       Field uploaderField = TelemetryThreadPool.class.getDeclaredField("uploader");