Reintroduce x-goog-api-client for common-grpc

jmuk · jmuk · commit ed92594ecf79 · 2017-03-30T11:01:10.000-07:00
This introduces this header for non-gapic APIs. Revise of #2020.
diff --git a/packages/common-grpc/src/service.js b/packages/common-grpc/src/service.js
@@ -25,6 +25,7 @@ var duplexify = require('duplexify');
 var extend = require('extend');
 var googleProtoFiles = require('google-proto-files');
 var grpc = require('grpc');
+var grpcVersion = require('grpc/package.json').version;
 var is = require('is');
 var nodeutil = require('util');
 var path = require('path');
@@ -178,6 +179,11 @@ function GrpcService(config, options) {
 
   this.grpcMetadata = new grpc.Metadata();
 
+  this.grpcMetadata.add('x-goog-api-client', [
+    'gl-node/' + process.versions.node,
+    'gccl/' + (config.packageJson.version || ''),
+    'grpc/' + grpcVersion
+  ].join(' '));
   if (config.grpcMetadata) {
     for (var prop in config.grpcMetadata) {
       if (config.grpcMetadata.hasOwnProperty(prop)) {
diff --git a/packages/common-grpc/test/service.js b/packages/common-grpc/test/service.js
@@ -21,6 +21,7 @@ var duplexify = require('duplexify');
 var extend = require('extend');
 var googleProtoFiles = require('google-proto-files');
 var grpc = require('grpc');
+var grpcVersion = require('grpc/package.json').version;
 var is = require('is');
 var path = require('path');
 var proxyquire = require('proxyquire');
@@ -273,33 +274,40 @@ describe('GrpcService', function() {
     });
 
     it('should default grpcMetadata to empty metadata', function() {
-      var fakeGrpcMetadata = {};
+      var fakeGrpcMetadata = {
+        'x-goog-api-client': [
+          'gl-node/' + process.versions.node,
+          'gccl/' + CONFIG.packageJson.version,
+          'grpc/' + grpcVersion].join(' ')
+      };
 
-      GrpcMetadataOverride = function() {
-        return fakeGrpcMetadata;
+      GrpcMetadataOverride = function() {};
+      GrpcMetadataOverride.prototype.add = function(prop, val) {
+        this[prop] = val;
       };
 
       var config = extend({}, CONFIG);
       delete config.grpcMetadata;
 
       var grpcService = new GrpcService(config, OPTIONS);
-      assert.strictEqual(grpcService.grpcMetadata, fakeGrpcMetadata);
+      assert.deepEqual(grpcService.grpcMetadata, fakeGrpcMetadata);
     });
 
     it('should create and localize grpcMetadata', function() {
-      var fakeGrpcMetadata = {
-        add: function(prop, value) {
-          assert.strictEqual(prop, Object.keys(CONFIG.grpcMetadata)[0]);
-          assert.strictEqual(value, CONFIG.grpcMetadata[prop]);
-        }
-      };
+      var fakeGrpcMetadata = extend({
+        'x-goog-api-client': [
+          'gl-node/' + process.versions.node,
+          'gccl/' + CONFIG.packageJson.version,
+          'grpc/' + grpcVersion].join(' ')
+      }, CONFIG.grpcMetadata);
 
-      GrpcMetadataOverride = function() {
-        return fakeGrpcMetadata;
+      GrpcMetadataOverride = function() {};
+      GrpcMetadataOverride.prototype.add = function(prop, val) {
+        this[prop] = val;
       };
 
       var grpcService = new GrpcService(CONFIG, OPTIONS);
-      assert.strictEqual(grpcService.grpcMetadata, fakeGrpcMetadata);
+      assert.deepEqual(grpcService.grpcMetadata, fakeGrpcMetadata);
     });
 
     it('should localize maxRetries', function() {
