---

sduskis · web-flow · commit 268e126a3514 · 2019-05-30T12:52:27.000-04:00
yaml --- r: 29629 b: refs/heads/autosynth-monitoring c: 28b211f h: refs/heads/master i: 29627: 25fff8b
diff --git a/[refs] b/[refs]
@@ -113,7 +113,7 @@ refs/tags/v0.66.0: ed6a3f57cbdaa20339a1995f7d7d53b172a5b8ef
 refs/tags/v0.67.0: 30b56f02092efc6f3c3667650ea8b8825003e0b7
 refs/heads/autosynth-compute: c0ad4e5b54b2b167d47e508ca215c039404837d3
 refs/heads/autosynth-container: e9a9a8564756e20770320ed54eafa867040a7690
-refs/heads/autosynth-monitoring: 248ace9e690c7a5e00475a4b895b837fb63beb2f
+refs/heads/autosynth-monitoring: 28b211fe52ced1e256561eac518047a10676dde0
 refs/heads/autosynth-pubsub: 8aac5a6202d83e8d67f5cb1d58f0adf9f2622aeb
 refs/heads/autosynth-video-intelligence: 82b145665822830c46d47eb8925edb2d842d6815
 refs/heads/autosynth-vision: 01ef61bcef344ceee0198f56f18bc1db20201261
diff --git a/branches/autosynth-monitoring/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Subscriber.java b/branches/autosynth-monitoring/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Subscriber.java
@@ -29,7 +29,6 @@
 import com.google.api.gax.core.CredentialsProvider;
 import com.google.api.gax.core.Distribution;
 import com.google.api.gax.core.ExecutorProvider;
-import com.google.api.gax.core.FixedExecutorProvider;
 import com.google.api.gax.core.InstantiatingExecutorProvider;
 import com.google.api.gax.rpc.HeaderProvider;
 import com.google.api.gax.rpc.NoHeaderProvider;
@@ -41,12 +40,15 @@
 import com.google.cloud.pubsub.v1.stub.SubscriberStubSettings;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.google.pubsub.v1.ProjectSubscriptionName;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.annotation.Nullable;
@@ -138,13 +140,8 @@ private Subscriber(Builder builder) {
     executorProvider = builder.executorProvider;
 
     ExecutorProvider systemExecutorProvider = builder.systemExecutorProvider;
-    if (systemExecutorProvider == null) {
-      systemExecutorProvider =
-          FixedExecutorProvider.create(
-              Executors.newScheduledThreadPool(Math.max(6, 2 * numPullers)));
-    }
-
     alarmsExecutor = systemExecutorProvider.getExecutor();
+
     if (systemExecutorProvider.shouldAutoClose()) {
       closeables.add(
           new AutoCloseable() {
@@ -405,6 +402,7 @@ public static final class Builder {
         InstantiatingExecutorProvider.newBuilder()
             .setExecutorThreadCount(THREADS_PER_CHANNEL)
             .build();
+    private static final AtomicInteger SYSTEM_EXECUTOR_COUNTER = new AtomicInteger();
 
     private String subscriptionName;
     private MessageReceiver receiver;
@@ -543,6 +541,28 @@ Builder setClock(ApiClock clock) {
     }
 
     public Subscriber build() {
+      if (systemExecutorProvider == null) {
+        ThreadFactory threadFactory =
+            new ThreadFactoryBuilder()
+                .setDaemon(true)
+                .setNameFormat("Subscriber-SE-" + SYSTEM_EXECUTOR_COUNTER.incrementAndGet() + "-%d")
+                .build();
+        int threadCount = Math.max(6, 2 * parallelPullCount);
+        final ScheduledExecutorService executor =
+            Executors.newScheduledThreadPool(threadCount, threadFactory);
+        systemExecutorProvider =
+            new ExecutorProvider() {
+              @Override
+              public boolean shouldAutoClose() {
+                return true;
+              }
+
+              @Override
+              public ScheduledExecutorService getExecutor() {
+                return executor;
+              }
+            };
+      }
       return new Subscriber(this);
     }
   }
