Skip to content

Upgrade Faceoff and enable some more tests on trunk. #736

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jdmarshall wants to merge 3 commits into
base: main
Choose a base branch
from
+7 −10
Open

Upgrade Faceoff and enable some more tests on trunk. #736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cfc1f6b
Use shortened name feature for better outpul, and enable benchmarks o…
jdmarshall Dec 22, 2025
939bf71
Upgrade to get better jitter analysis.
jdmarshall Jan 25, 2026
d056b48
Merge branch 'main' into faceoff
jdmarshall Jul 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions benchmarks/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
Expand Down
8 changes: 2 additions & 6 deletions benchmarks/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -71,10 +71,6 @@ function setupUtilSuite(suite) {
suite.add(
'LabelGrouper.keyFrom()',
(client, labelGrouper) => {
if (labelGrouper === undefined) {
return;
}

labelGrouper.keyFrom({
foo: 'longish',
user_agent: 'Chrome',
Expand All @@ -91,7 +87,7 @@ function setupUtilSuite(suite) {

return new Util.LabelGrouper();
},
skip: ['@prometheus/client@latest', '@prometheus/client@trunk'],
skip: ['released', 'trunk'],
},
);
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading