Add gcsio version as usre agent for gRPC (#515)

Co-authored-by: Igor Dvorzhak <[email protected]>
GoogleCloudDataproc · Dec 29, 2020 · 66bcd59 · 66bcd59
1 parent 095cfce
commit 66bcd59
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/gcsio/src/main/java/com/google/cloud/hadoop/gcsio/GoogleCloudStorageImpl.java b/gcsio/src/main/java/com/google/cloud/hadoop/gcsio/GoogleCloudStorageImpl.java
@@ -273,8 +273,7 @@ public GoogleCloudStorageImpl(
     // Create the gRPC stub if necessary;
     if (this.storageOptions.isGrpcEnabled()) {
       this.storageStubProvider =
-          new StorageStubProvider(
-              this.storageOptions.getReadChannelOptions(), this.backgroundTasksThreadPool);
+          new StorageStubProvider(this.storageOptions, this.backgroundTasksThreadPool);
     }
 
     this.storageRequestAuthorizer = initializeStorageRequestAuthorizer(storageOptions);

diff --git a/gcsio/src/main/java/com/google/cloud/hadoop/gcsio/StorageStubProvider.java b/gcsio/src/main/java/com/google/cloud/hadoop/gcsio/StorageStubProvider.java
@@ -50,6 +50,7 @@ public class StorageStubProvider {
           .getExtension(ClientProto.defaultHost);
 
   private final GoogleCloudStorageReadOptions readOptions;
+  private final String userAgent;
   private final ExecutorService backgroundTasksThreadPool;
   private final List<ChannelAndRequestCounter> mediaChannelPool;
 
@@ -130,8 +131,9 @@ public int activeRequests() {
   }
 
   public StorageStubProvider(
-      GoogleCloudStorageReadOptions readOptions, ExecutorService backgroundTasksThreadPool) {
-    this.readOptions = readOptions;
+      GoogleCloudStorageOptions options, ExecutorService backgroundTasksThreadPool) {
+    this.readOptions = options.getReadChannelOptions();
+    this.userAgent = options.getAppName();
     this.backgroundTasksThreadPool = backgroundTasksThreadPool;
     this.mediaChannelPool = new ArrayList<>();
   }
@@ -146,6 +148,7 @@ private ChannelAndRequestCounter buildManagedChannel() {
             .enableRetry()
             .defaultServiceConfig(getGrpcServiceConfig())
             .intercept(counter)
+            .userAgent(userAgent)
             .build();
     return new ChannelAndRequestCounter(channel, counter);
   }