---

shinfan · web-flow · commit 071b8a8ea6ca · 2017-04-05T02:22:23.000-07:00
yaml --- r: 7949 b: refs/heads/tswast-patch-1 c: 78346c3 h: refs/heads/master i: 7947: 978305c
diff --git a/[refs] b/[refs]
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
 refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
 refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
 refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
-refs/heads/tswast-patch-1: 3a039931aaaaf19b128d96ba94107299c2a82749
+refs/heads/tswast-patch-1: 78346c3527c36bc4581d124de7a862b06f3d86f4
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/google-cloud-core/src/main/java/com/google/cloud/GrpcTransportOptions.java b/branches/tswast-patch-1/google-cloud-core/src/main/java/com/google/cloud/GrpcTransportOptions.java
@@ -210,23 +210,23 @@ public UnaryCallSettings.Builder getApiCallSettings(RetrySettings retrySettings)
   }
 
   /**
-   * Returns a channel provider.
+   * Returns a channel provider from the given default provider.
    */
-  public static ChannelProvider getChannelProvider(
-      ServiceOptions<?, ?> serviceOptions) {
+  public static ChannelProvider setUpChannelProvider(
+      InstantiatingChannelProvider.Builder providerBuilder, ServiceOptions<?, ?> serviceOptions) {
     HostAndPort hostAndPort = HostAndPort.fromString(serviceOptions.getHost());
-    InstantiatingChannelProvider.Builder builder = InstantiatingChannelProvider.newBuilder()
-        .setServiceAddress(hostAndPort.getHostText())
+    providerBuilder.setServiceAddress(hostAndPort.getHostText())
         .setPort(hostAndPort.getPort())
-        .setClientLibHeader(serviceOptions.getGoogApiClientLibName(),
-            firstNonNull(serviceOptions.getLibraryVersion(), ""));
+        .setClientLibHeader(ServiceOptions.getGoogApiClientLibName(),
+            firstNonNull(ServiceOptions.getLibraryVersion(), ""));
     Credentials scopedCredentials = serviceOptions.getScopedCredentials();
     if (scopedCredentials != null && scopedCredentials != NoCredentials.getInstance()) {
-      builder.setCredentialsProvider(FixedCredentialsProvider.create(scopedCredentials));
+      providerBuilder.setCredentialsProvider(FixedCredentialsProvider.create(scopedCredentials));
     }
-    return builder.build();
+    return providerBuilder.build();
   }
 
+
   /**
    * Returns the timeout for the initial RPC, in milliseconds. Subsequent calls will use this value
    * adjusted according to {@link #getTimeoutMultiplier()}. Default value is 20000.
diff --git a/branches/tswast-patch-1/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/GrpcLoggingRpc.java b/branches/tswast-patch-1/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/GrpcLoggingRpc.java
@@ -90,7 +90,8 @@ public GrpcLoggingRpc(LoggingOptions options) throws IOException {
             .build();
         channelProvider = FixedChannelProvider.create(managedChannel);
       } else {
-        channelProvider = transportOptions.getChannelProvider(options);
+        channelProvider = GrpcTransportOptions.setUpChannelProvider(
+            LoggingSettings.defaultChannelProviderBuilder(), options);
       }
       providerManager = ProviderManager.newBuilder()
           .setChannelProvider(channelProvider)
