metrics: Default reporting metrics to default registry

doc/misc/npm-config.md

@@ -616,7 +616,7 @@ Any "%s" in the message will be replaced with the version number.
 
 ### metrics-registry
 
-* Default: "https://registry.npmjs.org/"
+* Default: The value of  `registry` (which defaults to "https://registry.npmjs.org/")
 * Type: String
 
 The registry you want to send cli metrics to if `send-metrics` is true.

lib/config/defaults.js

@@ -169,7 +169,7 @@ Object.defineProperty(exports, 'defaults', {get: function () {
     long: false,
     maxsockets: 50,
     message: '%s',
-    'metrics-registry': 'https://registry.npmjs.org/',
+    'metrics-registry': null,
     'node-version': process.version,
     'onload-script': false,
     only: null,
@@ -288,7 +288,7 @@ exports.types = {
   long: Boolean,
   maxsockets: Number,
   message: String,
-  'metrics-registry': String,
+  'metrics-registry': [null, String],
   'node-version': [null, semver],
   'onload-script': [null, String],
   only: [null, 'dev', 'development', 'prod', 'production'],

lib/npm.js

@@ -256,6 +256,10 @@
         ua = ua.replace(/\{arch\}/gi, process.arch)
         config.set('user-agent', ua)
 
+        if (config.get('metrics-registry') == null) {
+          config.set('metrics-registry', config.get('registry'))
+        }
+
         var color = config.get('color')
 
         log.level = config.get('loglevel')

test/tap/anon-cli-metrics.js

@@ -23,7 +23,6 @@ var conf = {
     npm_config_tmp: tmpdir,
     npm_config_prefix: globaldir,
     npm_config_registry: common.registry,
-    npm_config_metrics_registry: common.registry,
     npm_config_loglevel: 'warn'
   })
 }