diff --git a/CHANGELOG.md b/CHANGELOG.md index 11be4a31..72300e13 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,6 +38,7 @@ This release marks our first release under the Prometheus umbrella. - 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 - chore: Add copyright license headers and test - Make cluster and worker-thread metric aggregation order deterministic - Export `MetricObject`, `MetricObjectWithValues`, `MetricValue` and `MetricValueWithName` from the TypeScript definitions diff --git a/benchmarks/index.js b/benchmarks/index.js index 90c4211c..387ecc15 100644 --- a/benchmarks/index.js +++ b/benchmarks/index.js @@ -29,9 +29,9 @@ const Benchmark = require('faceoff').default; const benchmarks = new Benchmark({ // TODO: Update this once the module is published to as @prometheus/client. - '@prometheus/client@latest': 'prom-client@latest', - '@prometheus/client@trunk': 'git@github.com:prometheus/client_js', - '@prometheus/client@current': { location: process.cwd() }, + released: 'prom-client@latest', + trunk: 'git@github.com:prometheus/client_js', + current: { location: process.cwd() }, }); benchmarks.suite('counter', require('./counter')); diff --git a/benchmarks/util.js b/benchmarks/util.js index a4009e14..0fb38f40 100644 --- a/benchmarks/util.js +++ b/benchmarks/util.js @@ -19,7 +19,7 @@ const Path = require('path'); module.exports = setupUtilSuite; function setupUtilSuite(suite) { - const skip = ['@prometheus/client@latest']; + const skip = ['released']; suite.add( 'hashObject', @@ -71,10 +71,6 @@ function setupUtilSuite(suite) { suite.add( 'LabelGrouper.keyFrom()', (client, labelGrouper) => { - if (labelGrouper === undefined) { - return; - } - labelGrouper.keyFrom({ foo: 'longish', user_agent: 'Chrome', @@ -91,7 +87,7 @@ function setupUtilSuite(suite) { return new Util.LabelGrouper(); }, - skip: ['@prometheus/client@latest', '@prometheus/client@trunk'], + skip: ['released', 'trunk'], }, ); } diff --git a/package.json b/package.json index 0a6816c9..34049890 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "eslint-plugin-n": "^17.20.0", "eslint-plugin-prettier": "^5.0.1", "express": "^5.1.0", - "faceoff": "^1.1.0", + "faceoff": "~1.3.1", "globals": "^16.2.0", "husky": "^9.0.0", "jest": "^30.0.2",