Skip to content

Commit e53a73b

Browse files
michaelbausormichaelbausor
authored
---
yaml --- r: 7875 b: refs/heads/tswast-patch-1 c: acb7114 h: refs/heads/master i: 7873: f7891a8 7871: 1431a6e
1 parent e740604 commit e53a73b

13 files changed

Lines changed: 264 additions & 269 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
5757
refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
5858
refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
5959
refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
60-
refs/heads/tswast-patch-1: 7716d7379b5b25e6cd2640c077bfb268b6692822
60+
refs/heads/tswast-patch-1: acb7114f17ba40f7cab47bc40af4e18684d33ec8
6161
refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b

‎branches/tswast-patch-1/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingOptions.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import com.google.cloud.logging.spi.DefaultLoggingRpc;
2121
import com.google.cloud.logging.spi.LoggingRpc;
2222
import com.google.cloud.logging.spi.LoggingRpcFactory;
23-
import com.google.cloud.logging.spi.v2.LoggingServiceV2Settings;
23+
import com.google.cloud.logging.spi.v2.LoggingSettings;
2424
import com.google.common.collect.ImmutableSet;
2525

2626
import java.io.IOException;
@@ -32,8 +32,8 @@ public class LoggingOptions extends GrpcServiceOptions<Logging, LoggingRpc, Logg
3232
private static final long serialVersionUID = -5117984564582881668L;
3333
private static final String LOGGING_SCOPE = "https://www.googleapis.com/auth/logging.admin";
3434
private static final Set<String> SCOPES = ImmutableSet.of(LOGGING_SCOPE);
35-
private static final String DEFAULT_HOST = LoggingServiceV2Settings.getDefaultServiceAddress()
36-
+ ':' + LoggingServiceV2Settings.getDefaultServicePort();
35+
private static final String DEFAULT_HOST = LoggingSettings.getDefaultServiceAddress()
36+
+ ':' + LoggingSettings.getDefaultServicePort();
3737

3838
public static class DefaultLoggingFactory implements LoggingFactory {
3939
private static final LoggingFactory INSTANCE = new DefaultLoggingFactory();

‎branches/tswast-patch-1/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/DefaultLoggingRpc.java‎

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@
3030
import com.google.cloud.NoCredentials;
3131
import com.google.cloud.logging.LoggingException;
3232
import com.google.cloud.logging.LoggingOptions;
33-
import com.google.cloud.logging.spi.v2.ConfigServiceV2Client;
34-
import com.google.cloud.logging.spi.v2.ConfigServiceV2Settings;
35-
import com.google.cloud.logging.spi.v2.LoggingServiceV2Client;
36-
import com.google.cloud.logging.spi.v2.LoggingServiceV2Settings;
37-
import com.google.cloud.logging.spi.v2.MetricsServiceV2Client;
38-
import com.google.cloud.logging.spi.v2.MetricsServiceV2Settings;
33+
import com.google.cloud.logging.spi.v2.ConfigClient;
34+
import com.google.cloud.logging.spi.v2.ConfigSettings;
35+
import com.google.cloud.logging.spi.v2.LoggingClient;
36+
import com.google.cloud.logging.spi.v2.LoggingSettings;
37+
import com.google.cloud.logging.spi.v2.MetricsClient;
38+
import com.google.cloud.logging.spi.v2.MetricsSettings;
3939
import com.google.logging.v2.CreateLogMetricRequest;
4040
import com.google.logging.v2.CreateSinkRequest;
4141
import com.google.logging.v2.DeleteLogMetricRequest;
@@ -70,9 +70,9 @@
7070

7171
public class DefaultLoggingRpc implements LoggingRpc {
7272

73-
private final ConfigServiceV2Client configClient;
74-
private final LoggingServiceV2Client loggingClient;
75-
private final MetricsServiceV2Client metricsClient;
73+
private final ConfigClient configClient;
74+
private final LoggingClient loggingClient;
75+
private final MetricsClient metricsClient;
7676
private final ScheduledExecutorService executor;
7777
private final ProviderManager providerManager;
7878
private final ExecutorFactory<ScheduledExecutorService> executorFactory;
@@ -126,21 +126,24 @@ public DefaultLoggingRpc(LoggingOptions options) throws IOException {
126126
.setExecutorProvider(executorProvider)
127127
.build();
128128
UnaryCallSettings.Builder callSettingsBuilder = internalOptions.getApiCallSettings();
129-
ConfigServiceV2Settings.Builder confBuilder = ConfigServiceV2Settings.defaultBuilder()
130-
.setExecutorProvider(providerManager)
131-
.setChannelProvider(providerManager)
132-
.applyToAllUnaryMethods(callSettingsBuilder);
133-
LoggingServiceV2Settings.Builder logBuilder = LoggingServiceV2Settings.defaultBuilder()
134-
.setExecutorProvider(providerManager)
135-
.setChannelProvider(providerManager)
136-
.applyToAllUnaryMethods(callSettingsBuilder);
137-
MetricsServiceV2Settings.Builder metricsBuilder = MetricsServiceV2Settings.defaultBuilder()
138-
.setExecutorProvider(providerManager)
139-
.setChannelProvider(providerManager)
140-
.applyToAllUnaryMethods(callSettingsBuilder);
141-
configClient = ConfigServiceV2Client.create(confBuilder.build());
142-
loggingClient = LoggingServiceV2Client.create(logBuilder.build());
143-
metricsClient = MetricsServiceV2Client.create(metricsBuilder.build());
129+
ConfigSettings.Builder confBuilder =
130+
ConfigSettings.defaultBuilder()
131+
.setExecutorProvider(providerManager)
132+
.setChannelProvider(providerManager)
133+
.applyToAllUnaryMethods(callSettingsBuilder);
134+
LoggingSettings.Builder logBuilder =
135+
LoggingSettings.defaultBuilder()
136+
.setExecutorProvider(providerManager)
137+
.setChannelProvider(providerManager)
138+
.applyToAllUnaryMethods(callSettingsBuilder);
139+
MetricsSettings.Builder metricsBuilder =
140+
MetricsSettings.defaultBuilder()
141+
.setExecutorProvider(providerManager)
142+
.setChannelProvider(providerManager)
143+
.applyToAllUnaryMethods(callSettingsBuilder);
144+
configClient = ConfigClient.create(confBuilder.build());
145+
loggingClient = LoggingClient.create(logBuilder.build());
146+
metricsClient = MetricsClient.create(metricsBuilder.build());
144147
} catch (Exception ex) {
145148
throw new IOException(ex);
146149
}

0 commit comments

Comments
 (0)