From 24372c1fbdb368ec3f199ced6cde34e174dfe596 Mon Sep 17 00:00:00 2001 From: Shin Fan Date: Tue, 28 Mar 2017 14:56:41 -0700 Subject: [PATCH 1/2] Make logging overrides default channel provider --- .../com/google/cloud/GrpcTransportOptions.java | 18 +++++++++--------- .../cloud/logging/spi/v2/GrpcLoggingRpc.java | 3 ++- 2 files changed, 11 insertions(+), 10 deletions(-) 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..15be6fbe51b5 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 provider, ServiceOptions serviceOptions) { HostAndPort hostAndPort = HostAndPort.fromString(serviceOptions.getHost()); - InstantiatingChannelProvider.Builder builder = InstantiatingChannelProvider.newBuilder() - .setServiceAddress(hostAndPort.getHostText()) + provider.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)); + provider.setCredentialsProvider(FixedCredentialsProvider.create(scopedCredentials)); } - return builder.build(); + return provider.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..b6745ebe1e73 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) From bf67703d0fdf2b1e8078093ac0bd2f701f3ef54d Mon Sep 17 00:00:00 2001 From: Shin Fan Date: Tue, 28 Mar 2017 16:04:58 -0700 Subject: [PATCH 2/2] Fix naming --- .../java/com/google/cloud/GrpcTransportOptions.java | 10 +++++----- .../google/cloud/logging/spi/v2/GrpcLoggingRpc.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) 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 15be6fbe51b5..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 @@ -212,18 +212,18 @@ public UnaryCallSettings.Builder getApiCallSettings(RetrySettings retrySettings) /** * Returns a channel provider from the given default provider. */ - public static ChannelProvider setupChannelProvider( - InstantiatingChannelProvider.Builder provider, ServiceOptions serviceOptions) { + public static ChannelProvider setUpChannelProvider( + InstantiatingChannelProvider.Builder providerBuilder, ServiceOptions serviceOptions) { HostAndPort hostAndPort = HostAndPort.fromString(serviceOptions.getHost()); - provider.setServiceAddress(hostAndPort.getHostText()) + providerBuilder.setServiceAddress(hostAndPort.getHostText()) .setPort(hostAndPort.getPort()) .setClientLibHeader(ServiceOptions.getGoogApiClientLibName(), firstNonNull(ServiceOptions.getLibraryVersion(), "")); Credentials scopedCredentials = serviceOptions.getScopedCredentials(); if (scopedCredentials != null && scopedCredentials != NoCredentials.getInstance()) { - provider.setCredentialsProvider(FixedCredentialsProvider.create(scopedCredentials)); + providerBuilder.setCredentialsProvider(FixedCredentialsProvider.create(scopedCredentials)); } - return provider.build(); + return providerBuilder.build(); } 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 b6745ebe1e73..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,7 @@ public GrpcLoggingRpc(LoggingOptions options) throws IOException { .build(); channelProvider = FixedChannelProvider.create(managedChannel); } else { - channelProvider = GrpcTransportOptions.setupChannelProvider( + channelProvider = GrpcTransportOptions.setUpChannelProvider( LoggingSettings.defaultChannelProviderBuilder(), options); } providerManager = ProviderManager.newBuilder()