diff --git a/google-cloud-core/src/main/java/com/google/cloud/GrpcTransportOptions.java b/google-cloud-core/src/main/java/com/google/cloud/GrpcTransportOptions.java index 0295b00972c9..b84f03e9156d 100644 --- a/google-cloud-core/src/main/java/com/google/cloud/GrpcTransportOptions.java +++ b/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/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/GrpcLoggingRpc.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/GrpcLoggingRpc.java index e7b8ddffb2ad..1ca3155872b2 100644 --- a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/GrpcLoggingRpc.java +++ b/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)