Fix hardcoded old package name (#2391)

Fixes: #2389

packages/error-reporting/package.json

@@ -4,7 +4,7 @@
   "main": "./src/index.js",
   "repository": "GoogleCloudPlatform/google-cloud-node",
   "scripts": {
-    "test": "nyc --exclude=\"fuzzer.js\" mocha ./test/unit/**/*.js",
+    "test": "nyc --exclude=\"fuzzer.js\" mocha ./test/unit/*.js ./test/unit/**/*.js",
     "system-test": "nyc --exclude=\"error-message.js\" mocha ./system-test/*.js",
     "lint": "jshint -c ../../.jshintrc src system-test test utils && jscs -c ../../.jscsrc src system-test test utils",
     "publish-module": "node ../../scripts/publish.js error-reporting"

packages/error-reporting/src/configuration.js

@@ -22,7 +22,6 @@ var isObject = is.object;
 var isBoolean = is.boolean;
 var isString = is.string;
 var isNumber = is.number;
-var version = require('../package.json').version;
 
 /**
  * The Configuration constructor function initializes several internal
@@ -135,15 +134,6 @@ var Configuration = function(givenConfig, logger) {
    * @type {Object}
    */
   this._serviceContext = {service: 'nodejs', version: ''};
-  /**
-   * The _version of the Error reporting library that is currently being run.
-   * This information will be logged in errors communicated to the Stackdriver
-   * Error API.
-   * @memberof Configuration
-   * @private
-   * @type {String}
-   */
-  this._version = version;
   /**
    * The _givenConfiguration property holds a ConfigurationOptions object
    * which, if valid, will be merged against by the values taken from the meta-
@@ -364,14 +354,4 @@ Configuration.prototype.getCredentials = function() {
 Configuration.prototype.getServiceContext = function() {
   return this._serviceContext;
 };
-/**
- * Returns the _version property on the instance.
- * @memberof Configuration
- * @public
- * @function getVersion
- * @returns {String} - returns the _version property
- */
-Configuration.prototype.getVersion = function() {
-  return this._version;
-};
 module.exports = Configuration;

packages/error-reporting/src/interfaces/hapi.js

@@ -21,6 +21,7 @@ var isFunction = is.fn;
 var ErrorMessage = require('../classes/error-message.js');
 var hapiRequestInformationExtractor = require('../request-extractors/hapi.js');
 var errorHandlerRouter = require('../error-router.js');
+var packageJson = require('../../package.json');
 
 /**
  * The Hapi error handler function serves simply to create an error message
@@ -105,12 +106,10 @@ function makeHapiPlugin(client, config) {
   }
 
   var hapiPlugin = {register: hapiRegisterFunction};
-  var version = (isObject(config) && config.getVersion()) ?
-    config.getVersion(): '0.0.0';
 
   hapiPlugin.register.attributes = {
-    name: '@google/cloud-errors',
-    version: version
+    name: packageJson.name,
+    version: packageJson.version
   };
 
   return hapiPlugin;

packages/error-reporting/src/logger.js

@@ -22,6 +22,8 @@ var isObject = is.object;
 var isString = is.string;
 var isNumber = is.number;
 var logger = require('@google-cloud/common').logger;
+var packageJson = require('../package.json');
+
 /**
  * Creates an instance of the Google Cloud Diagnostics logger class. This
  * instance will be configured to log at the level given by the environment or
@@ -59,7 +61,7 @@ function createLogger(initConfiguration) {
         'representation of a number in string form');
     }
   }
-  return logger({level: level, tag: '@google/cloud-errors'});
+  return logger({level: level, tag: packageJson.name });
 }
 
 module.exports = createLogger;

packages/error-reporting/test/unit/configuration.js

@@ -19,7 +19,6 @@ var assert = require('assert');
 var isNumber = require('is').number;
 var merge = require('lodash.merge');
 var Configuration = require('../fixtures/configuration.js');
-var version = require('../../package.json').version;
 var Fuzzer = require('../../utils/fuzzer.js');
 var level = process.env.GCLOUD_ERRORS_LOGLEVEL;
 var logger = require('../../src/logger.js')({
@@ -93,9 +92,6 @@ describe('Configuration class', function() {
           assert.deepEqual(c.getServiceContext(),
             {service: 'node', version: undefined});
         });
-        it('Should have a version corresponding to package.json', function() {
-          assert.strictEqual(c.getVersion(), version);
-        });
       });
       describe('with ignoreEnvironmentCheck', function() {
         var conf = merge({}, stubConfig, {ignoreEnvironmentCheck: true});

packages/error-reporting/test/unit/interfaces/hapi.js

@@ -57,7 +57,7 @@ describe('Hapi interface', function() {
       function() {
         assert(has(plugin.register.attributes, 'name'));
         assert.strictEqual(plugin.register.attributes.name,
-          '@google/cloud-errors');
+          '@google-cloud/error-reporting');
       }
    );
     it('the plugin\'s attribute property should have a version property',

packages/error-reporting/test/unit/logger.js

@@ -72,13 +72,13 @@ describe('logger', function() {
         var logger = createLogger();
         logger.warn('test warning message');
         assert.strictEqual(text,
-          'WARN:@google/cloud-errors: test warning message');
+          'WARN:@google-cloud/error-reporting: test warning message');
       });
       it('Should print ERROR logs by default', function() {
         var logger = createLogger();
         logger.error('test error message');
         assert.strictEqual(text,
-          'ERROR:@google/cloud-errors: test error message');
+          'ERROR:@google-cloud/error-reporting: test error message');
       });
     });
   });