---

mziccard · web-flow · commit d6239cd782d2 · 2016-08-11T12:00:59.000+02:00
yaml --- r: 7483 b: refs/heads/tswast-patch-1 c: 30a7995 h: refs/heads/master i: 7481: e4c5eb7 7479: b234b11
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: e8706fbdb1f2dd655670a2162884402c31ee5850
+refs/heads/tswast-patch-1: 30a79956c35ce953ee2ea4b9d3f0372864f593f7
 refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b
diff --git a/branches/tswast-patch-1/gcloud-java-logging/src/main/java/com/google/cloud/logging/spi/DefaultLoggingRpc.java b/branches/tswast-patch-1/gcloud-java-logging/src/main/java/com/google/cloud/logging/spi/DefaultLoggingRpc.java
@@ -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;
@@ -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();
+    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())) {
