Use shortened names and enable benchmarks on trunk.

A number of the benchmarks I added are now merged into trunk
and thus can be run to compare PRs to pre-released versions of the
code.

Author: jdmarshall

CHANGELOG.md

@@ -32,6 +32,7 @@ project adheres to [Semantic Versioning](http://semver.org/).
 - AggregatorRegistry renamed to ClusterRegistry, old name deprecated
 - chore: update faceoff to 1.1
 - perf: Stat aggregation uses similar strategy to collection. 60% faster aggregation
+- ci: Run additional benchmarks against trunk
 
 ### Added
 

benchmarks/index.js

@@ -13,9 +13,9 @@ const debug = require('debug')('benchmark');
  */
 
 const benchmarks = new Benchmark({
-	'prom-client@latest': 'prom-client@latest',
-	'prom-client@trunk': 'git@github.com:siimon/prom-client',
-	'prom-client@current': { location: process.cwd() },
+	released: 'prom-client@latest',
+	trunk: 'git@github.com:siimon/prom-client',
+	current: { location: process.cwd() },
 });
 
 benchmarks.suite('counter', require('./counter'));

benchmarks/util.js

@@ -5,7 +5,7 @@ const Path = require('path');
 module.exports = setupUtilSuite;
 
 function setupUtilSuite(suite) {
-	const skip = ['prom-client@latest'];
+	const skip = ['released'];
 
 	suite.add(
 		'hashObject',
@@ -57,10 +57,6 @@ function setupUtilSuite(suite) {
 	suite.add(
 		'LabelGrouper.keyFrom()',
 		(client, labelGrouper) => {
-			if (labelGrouper === undefined) {
-				return;
-			}
-
 			labelGrouper.keyFrom({
 				foo: 'longish',
 				user_agent: 'Chrome',
@@ -77,7 +73,7 @@ function setupUtilSuite(suite) {
 
 				return new Util.LabelGrouper();
 			},
-			skip: ['prom-client@latest', 'prom-client@trunk'],
+			skip: ['released', 'trunk'],
 		},
 	);
 }