Skip to content

Commit

Permalink
Merge main into next
Browse files Browse the repository at this point in the history
  • Loading branch information
simonecorsi authored Jun 4, 2024
2 parents 2f90657 + 1ac576b commit 235d881
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/setup-node@v3
with:
# codfish/semantic-release-action@v2 needs 18+
node-version: 18
node-version: 20
- uses: actions/checkout@v4
with:
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
node-version: [14.x, 16.x, 18.x]
node-version: [18.x, 20.x]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,5 @@ typings/
# lock files
package-lock.json
yarn.lock

.tap
8 changes: 6 additions & 2 deletions .taprc
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
test-ignore: helpers
nyc-arg: --exclude=tests/helpers*
# vim: set filetype=yaml :
files:
- tests/*.test.js
allow-incomplete-coverage: true
plugin:
- "@tapjs/sinon"
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## [6.0.1](https://github.com/immobiliare/fastify-metrics/compare/v6.0.0...v6.0.1) (2024-06-04)


### Bug Fixes

* bump version ([361a32c](https://github.com/immobiliare/fastify-metrics/commit/361a32c0ae7c3a7af9285f43cf58fc48fa268534))

# [6.0.0](https://github.com/immobiliare/fastify-metrics/compare/v5.1.1...v6.0.0) (2023-12-18)


Expand Down
24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@immobiliarelabs/fastify-metrics",
"version": "6.0.0",
"version": "6.0.1",
"description": "A minimalistic and opinionated Fastify plugin that collects metrics and dispatches them to statsd",
"main": "index.js",
"publishConfig": {
Expand Down Expand Up @@ -48,14 +48,15 @@
"node": ">=18"
},
"devDependencies": {
"@commitlint/cli": "^17.0.0",
"@commitlint/config-conventional": "^17.0.0",
"@commitlint/cli": "^18.4.3",
"@commitlint/config-conventional": "^18.4.3",
"@semantic-release/changelog": "^6.0.0",
"@semantic-release/commit-analyzer": "^10.0.1",
"@semantic-release/commit-analyzer": "^11.1.0",
"@semantic-release/git": "^10.0.0",
"@semantic-release/github": "^9.0.3",
"@semantic-release/npm": "^10.0.3",
"@semantic-release/release-notes-generator": "^11.0.4",
"@semantic-release/npm": "^11.0.2",
"@semantic-release/release-notes-generator": "^12.1.0",
"@tapjs/sinon": "^1.1.17",
"@types/node": "^20.4.1",
"@typescript-eslint/eslint-plugin": "^6.1.0",
"@typescript-eslint/parser": "^6.0.0",
Expand All @@ -68,19 +69,18 @@
"fastify": "^4.25.1",
"husky": "^8.0.0",
"is-ci": "^3.0.0",
"lint-staged": "^14.0.1",
"lint-staged": "^15.2.0",
"markdown-toc": "^1.2.0",
"nyc": "^15.1.0",
"prettier": "^3.0.0",
"sinon": "^15.0.0",
"tap": "^16.0.0",
"tsd": "^0.29.0",
"tap": "^19.0.2",
"tsd": "^0.30.0",
"typescript": "^5.0.4"
},
"dependencies": {
"@dnlup/doc": "^5.0.2",
"@dnlup/doc": "^5.0.3",
"@dnlup/hrtime-utils": "^1.0.1",
"@immobiliarelabs/dats": "^5.0.0",
"@immobiliarelabs/dats": "^5.1.0",
"fastify-plugin": "^4.0.0"
},
"volta": {
Expand Down
3 changes: 1 addition & 2 deletions tests/configuration.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
const tap = require('tap');
const fastify = require('fastify');
const { default: Dats } = require('@immobiliarelabs/dats');
const sinon = require('sinon');
const plugin = require('../');
const { STATSD_METHODS } = require('../lib/util');

Expand Down Expand Up @@ -220,7 +219,7 @@ tap.test('should cleanup a custom prefix', async (t) => {
});

tap.test('should allow custom dats client', async (t) => {
const stub = sinon.stub();
const stub = t.sinon.stub();

const datsMock = {
counter: stub,
Expand Down
3 changes: 1 addition & 2 deletions tests/decorators.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

const tap = require('tap');
const { Sampler } = require('@dnlup/doc');
const sinon = require('sinon');
const { STATSD_METHODS } = require('../lib/util');
const { setupRoutes } = require('./helpers/utils');

Expand Down Expand Up @@ -146,7 +145,7 @@ tap.test('hooks', async (t) => {
false
);
t.teardown(() => server.close());
const spy = sinon.spy(server.log, 'error');
const spy = t.sinon.spy(server.log, 'error');
server.metrics.client.socket.onError(new Error('test'));
t.equal('test', spy.getCall(0).firstArg.message);
});
Expand Down

0 comments on commit 235d881

Please sign in to comment.