From dc243009d06eaed4753d52ab22ec6ac34d780e41 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Tue, 23 Aug 2022 15:09:03 +0200 Subject: [PATCH 1/5] chore: update prettier --- index.js | 3 ++- lib/metrics/gc.js | 3 +-- lib/metrics/processHandles.js | 3 +-- lib/metrics/processRequests.js | 3 +-- lib/metrics/processResources.js | 3 +-- package.json | 6 ++++-- 6 files changed, 10 insertions(+), 11 deletions(-) diff --git a/index.js b/index.js index 1c913138..3199417f 100644 --- a/index.js +++ b/index.js @@ -17,7 +17,8 @@ exports.Summary = require('./lib/summary'); exports.Pushgateway = require('./lib/pushgateway'); exports.linearBuckets = require('./lib/bucketGenerators').linearBuckets; -exports.exponentialBuckets = require('./lib/bucketGenerators').exponentialBuckets; +exports.exponentialBuckets = + require('./lib/bucketGenerators').exponentialBuckets; exports.collectDefaultMetrics = require('./lib/defaultMetrics'); diff --git a/lib/metrics/gc.js b/lib/metrics/gc.js index 56ffce3a..75b8f4bc 100644 --- a/lib/metrics/gc.js +++ b/lib/metrics/gc.js @@ -32,8 +32,7 @@ module.exports = (registry, config = {}) => { : DEFAULT_GC_DURATION_BUCKETS; const gcHistogram = new Histogram({ name: namePrefix + NODEJS_GC_DURATION_SECONDS, - help: - 'Garbage collection duration by kind, one of major, minor, incremental or weakcb.', + help: 'Garbage collection duration by kind, one of major, minor, incremental or weakcb.', labelNames: ['kind', ...labelNames], buckets, registers: registry ? [registry] : undefined, diff --git a/lib/metrics/processHandles.js b/lib/metrics/processHandles.js index 7ba58738..9a78d9f8 100644 --- a/lib/metrics/processHandles.js +++ b/lib/metrics/processHandles.js @@ -20,8 +20,7 @@ module.exports = (registry, config = {}) => { new Gauge({ name: namePrefix + NODEJS_ACTIVE_HANDLES, - help: - 'Number of active libuv handles grouped by handle type. Every handle type is C++ class name.', + help: 'Number of active libuv handles grouped by handle type. Every handle type is C++ class name.', labelNames: ['type', ...labelNames], registers, collect() { diff --git a/lib/metrics/processRequests.js b/lib/metrics/processRequests.js index cb47ee38..2351f71d 100644 --- a/lib/metrics/processRequests.js +++ b/lib/metrics/processRequests.js @@ -18,8 +18,7 @@ module.exports = (registry, config = {}) => { new Gauge({ name: namePrefix + NODEJS_ACTIVE_REQUESTS, - help: - 'Number of active libuv requests grouped by request type. Every request type is C++ class name.', + help: 'Number of active libuv requests grouped by request type. Every request type is C++ class name.', labelNames: ['type', ...labelNames], registers: registry ? [registry] : undefined, collect() { diff --git a/lib/metrics/processResources.js b/lib/metrics/processResources.js index 9ed85d25..c8acc1fd 100644 --- a/lib/metrics/processResources.js +++ b/lib/metrics/processResources.js @@ -17,8 +17,7 @@ module.exports = (registry, config = {}) => { new Gauge({ name: namePrefix + NODEJS_ACTIVE_RESOURCES, - help: - 'Number of active resources that are currently keeping the event loop alive, grouped by async resource type.', + help: 'Number of active resources that are currently keeping the event loop alive, grouped by async resource type.', labelNames: ['type', ...labelNames], registers: registry ? [registry] : undefined, collect() { diff --git a/package.json b/package.json index 6649616c..aa13c141 100644 --- a/package.json +++ b/package.json @@ -13,9 +13,11 @@ }, "scripts": { "benchmarks": "node ./benchmarks/index.js", - "test": "npm run lint && npm run compile-typescript && npm run test-unit", + "test": "npm run lint && && npm run check-prettier && npm run compile-typescript && npm run test-unit", "lint": "eslint .", "test-unit": "jest", + "run-prettier": "prettier '**/*.{ts,json,md}'", + "check-prettier": "npm run run-prettier -- --check", "compile-typescript": "tsc --project ." }, "repository": { @@ -41,7 +43,7 @@ "jest": "^26.0.1", "lint-staged": "^10.0.4", "nock": "^13.0.5", - "prettier": "2.0.5", + "prettier": "2.7.1", "typescript": "^4.0.2" }, "dependencies": { From 848214364b8721a8ee56e2790ad350c9c156f9df Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Tue, 23 Aug 2022 15:10:35 +0200 Subject: [PATCH 2/5] oops --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index aa13c141..599256bb 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ }, "scripts": { "benchmarks": "node ./benchmarks/index.js", - "test": "npm run lint && && npm run check-prettier && npm run compile-typescript && npm run test-unit", + "test": "npm run lint && npm run check-prettier && npm run compile-typescript && npm run test-unit", "lint": "eslint .", "test-unit": "jest", "run-prettier": "prettier '**/*.{ts,json,md}'", From 924f4a7ecf1e55e9016982ee0730b2ec461b24b4 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Tue, 23 Aug 2022 15:16:04 +0200 Subject: [PATCH 3/5] auto eol --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 599256bb..a4d2dfc1 100644 --- a/package.json +++ b/package.json @@ -64,6 +64,7 @@ "useTabs": true, "arrowParens": "avoid", "trailingComma": "all", + "endOfLine": "auto", "overrides": [ { "files": "*.md", From 13489b136f81fb7af16e6a61af08ee34632ad4be Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Tue, 23 Aug 2022 15:16:33 +0200 Subject: [PATCH 4/5] run prettier on eslint config --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a4d2dfc1..b43b89aa 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "test": "npm run lint && npm run check-prettier && npm run compile-typescript && npm run test-unit", "lint": "eslint .", "test-unit": "jest", - "run-prettier": "prettier '**/*.{ts,json,md}'", + "run-prettier": "prettier '**/*.{ts,json,md}' .eslintrc", "check-prettier": "npm run run-prettier -- --check", "compile-typescript": "tsc --project ." }, From 0dd05ef9568526d95735dc5baaa6bce3802e37a5 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Tue, 23 Aug 2022 15:23:54 +0200 Subject: [PATCH 5/5] better pattern --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b43b89aa..1eccfed8 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "test": "npm run lint && npm run check-prettier && npm run compile-typescript && npm run test-unit", "lint": "eslint .", "test-unit": "jest", - "run-prettier": "prettier '**/*.{ts,json,md}' .eslintrc", + "run-prettier": "prettier . .eslintrc", "check-prettier": "npm run run-prettier -- --check", "compile-typescript": "tsc --project ." },