Update client name in header for Veneer layer (#1638)

shinfan · web-flow · commit 5c2248e3233d · 2017-02-21T14:58:28.000-08:00
diff --git a/google-cloud-core/src/main/java/com/google/cloud/GrpcServiceOptions.java b/google-cloud-core/src/main/java/com/google/cloud/GrpcServiceOptions.java
@@ -313,7 +313,7 @@ protected ChannelProvider getChannelProvider() {
     InstantiatingChannelProvider.Builder builder = InstantiatingChannelProvider.newBuilder()
         .setServiceAddress(hostAndPort.getHostText())
         .setPort(hostAndPort.getPort())
-        .setClientLibHeader(getLibraryName(), firstNonNull(getLibraryVersion(), ""));
+        .setClientLibHeader(getGoogApiClientLibName(), firstNonNull(getLibraryVersion(), ""));
     Credentials scopedCredentials = getScopedCredentials();
     if (scopedCredentials != null && scopedCredentials != NoCredentials.getInstance()) {
       builder.setCredentialsProvider(FixedCredentialsProvider.create(scopedCredentials));
diff --git a/google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java b/google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java
@@ -74,6 +74,7 @@ public abstract class ServiceOptions<ServiceT extends Service<OptionsT>, Service
   private static final String MANIFEST_VERSION_KEY = "Implementation-Version";
   private static final String ARTIFACT_ID = "google-cloud-core";
   private static final String LIBRARY_NAME = "gcloud-java";
+  private static final String X_GOOGLE_CLIENT_HEADER_NAME = "gccl";
   private static final String LIBRARY_VERSION = defaultLibraryVersion();
   private static final String APPLICATION_NAME =
       LIBRARY_VERSION == null ? LIBRARY_NAME : LIBRARY_NAME + "/" + LIBRARY_VERSION;
@@ -601,6 +602,13 @@ public String getLibraryName() {
     return LIBRARY_NAME;
   }
 
+  /**
+   * Returns the library's name used by x-goog-api-client header as a string.
+   */
+  public String getGoogApiClientLibName() {
+    return X_GOOGLE_CLIENT_HEADER_NAME;
+  }
+
   /**
    * Returns the library's version as a string.
    */
