Skip to content

Set user agent for Logging client #1147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mziccard merged 1 commit into from
Aug 11, 2016
Merged

Set user agent for Logging client #1147

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions gcloud-java-logging/src/main/java/com/google/cloud/logging/spi/DefaultLoggingRpc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

package com.google.cloud.logging.spi;

import static com.google.common.base.MoreObjects.firstNonNull;

import com.google.api.gax.core.RetrySettings;
import com.google.api.gax.grpc.ApiCallSettings;
import com.google.api.gax.grpc.ApiException;
Expand Down Expand Up @@ -97,13 +99,18 @@ protected ExecutorFactory<ScheduledExecutorService> executorFactory() {
public DefaultLoggingRpc(LoggingOptions options) throws IOException {
executorFactory = new InternalLoggingOptions(options).executorFactory();
executor = executorFactory.get();
String libraryName = options.libraryName();

This comment was marked as spam.

Sign in to view

String libraryVersion = firstNonNull(options.libraryVersion(), "");
try {
ConfigServiceV2Settings.Builder confBuilder =
ConfigServiceV2Settings.defaultBuilder().provideExecutorWith(executor, false);
LoggingServiceV2Settings.Builder logBuilder =
LoggingServiceV2Settings.defaultBuilder().provideExecutorWith(executor, false);
MetricsServiceV2Settings.Builder metricsBuilder =
MetricsServiceV2Settings.defaultBuilder().provideExecutorWith(executor, false);
ConfigServiceV2Settings.Builder confBuilder = ConfigServiceV2Settings.defaultBuilder()
.provideExecutorWith(executor, false)
.setClientLibHeader(libraryName, libraryVersion);
LoggingServiceV2Settings.Builder logBuilder = LoggingServiceV2Settings.defaultBuilder()
.provideExecutorWith(executor, false)
.setClientLibHeader(libraryName, libraryVersion);
MetricsServiceV2Settings.Builder metricsBuilder = MetricsServiceV2Settings.defaultBuilder()
.provideExecutorWith(executor, false)
.setClientLibHeader(libraryName, libraryVersion);
// todo(mziccard): PublisherSettings should support null/absent credentials for testing
if (options.host().contains("localhost")
|| options.authCredentials().equals(AuthCredentials.noAuth())) {
Expand Down