all modules: ensure all User-Agents are set (#1568)

Author: stephenplusplus

package.json

@@ -50,7 +50,7 @@
     "datastore"
   ],
   "dependencies": {
-    "@google-cloud/common": "^0.4.0",
+    "@google-cloud/common": "^0.5.0",
     "arrify": "^1.0.0",
     "concat-stream": "^1.5.0",
     "create-error-class": "^3.0.2",

src/index.js

@@ -49,8 +49,6 @@ var Query = require('./query.js');
  */
 var Transaction = require('./transaction.js');
 
-var PKG = require('../package.json');
-
 /**
  * @constructor
  * @alias module:datastore
@@ -323,7 +321,7 @@ function Datastore(options) {
     service: 'datastore',
     apiVersion: 'v1',
     scopes: ['https://www.googleapis.com/auth/datastore'],
-    userAgent: PKG.name + '/' + PKG.version,
+    packageJson: require('../package.json'),
     grpcMetadata: {
       'google-cloud-resource-prefix': 'projects/' + this.projectId
     }

test/index.js

@@ -21,8 +21,6 @@ var extend = require('extend');
 var proxyquire = require('proxyquire');
 var util = require('@google-cloud/common').util;
 
-var PKG = require('../package.json');
-
 var fakeEntity = {
   Int: function(value) {
     this.value = value;
@@ -157,7 +155,7 @@ describe('Datastore', function() {
       assert.deepEqual(calledWith.scopes, [
         'https://www.googleapis.com/auth/datastore'
       ]);
-      assert.strictEqual(calledWith.userAgent, PKG.name + '/' + PKG.version);
+      assert.deepEqual(calledWith.packageJson, require('../package.json'));
       assert.deepEqual(calledWith.grpcMetadata, {
         'google-cloud-resource-prefix': 'projects/' + datastore.projectId
       });