Skip to content
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.

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

add support for TracingChannel#hasSubscribers, test Node.js v22 #11

Merged
merged 1 commit into from
May 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 7 additions & 3 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,13 @@ jobs:
- 20.0.0 # first 20
- 20.5.1 # sync unsubscribe bug
- 20.6.0 # sync unsubscribe bug fixed
- 20.x # nothing special, full support dc, latest 20
- 21.0.0 # nothing special, full support dc, first 21
- 21.x # nothing special, full support dc, latest 21
- 20.x # nothing special, latest 20
- 20.12.x # last version without TC early exit and TC#hasSubscribers()
- 20.13.0 # introduces TC early exit and TC#hasSubscribers()
- 21.0.0 # nothing special, first 21
- 21.x # nothing special, latest 21
- 22.0.0 # introduces TC early exit and TC#hasSubscribers()
- 22.x # nothing special, full support DC
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ Since this package recreates a Node.js API, read the [Node.js `diagnostics_chann
| Oldest Supported Node.js Version | 12.17.0 |
| Target Node.js DC API Version | 20.6.0 |

> Note that `dc-polyfill` currently has the `TracingChannel#hasSubscribers` getter backported from Node.js v22 however it doesn't yet support the tracing channel early exit feature. Once that's been added we'll delete this clause and update the above table.

Whenever the currently running version of Node.js ships with `diagnostics_channel` (i.e. v16+, v15.14+, v14.17+), **dc-polyfill** will make sure to use the global registry of channels provided by the core module. For older versions of Node.js **dc-polyfill** instead uses its own global collection of channels. This global collection remains in the same location and is shared across all instances of **dc-polyfill**. This avoids the issue wherein multiple versions of an npm library installed in a module dependency hierarchy would otherwise provide different singleton instances.

Ideally, this package will forever remain backwards compatible, there will never be a v2.x release, and there will never be an additional global channel collection.
Expand Down
9 changes: 9 additions & 0 deletions checks.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,12 @@ function hasSyncUnsubscribeBug() {
return MAJOR === 20 && MINOR <= 5;
}
module.exports.hasSyncUnsubscribeBug = hasSyncUnsubscribeBug;

// if there is a TracingChannel#hasSubscribers() getter
// @see https://github.com/nodejs/node/pull/51915
// TODO: note that we still need to add the TC early exit from this same version
function hasTracingChannelHasSubscribers() {
return MAJOR >= 22
|| (MAJOR == 20 && MINOR >= 13);
};
module.exports.hasTracingChannelHasSubscribers = hasTracingChannelHasSubscribers;
4 changes: 4 additions & 0 deletions dc-polyfill.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,9 @@ if (checks.hasSyncUnsubscribeBug()) {
dc = require('./patch-sync-unsubscribe-bug.js')(dc);
}

if (!checks.hasTracingChannelHasSubscribers()) {
dc = require('./patch-tracing-channel-has-subscribers.js')(dc);
}

module.exports = dc;

39 changes: 39 additions & 0 deletions patch-tracing-channel-has-subscribers.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
const {
ObjectDefineProperty,
ObjectGetPrototypeOf,
} = require('./primordials.js');

const { ERR_INVALID_ARG_TYPE } = require('./errors.js');

const traceEvents = [
'start',
'end',
'asyncStart',
'asyncEnd',
'error',
];

module.exports = function (unpatched) {
const { channel } = unpatched;

const dc = { ...unpatched };

{
const fauxTrCh = dc.tracingChannel('dc-polyfill-faux');

const protoTrCh = ObjectGetPrototypeOf(fauxTrCh);

ObjectDefineProperty(protoTrCh, 'hasSubscribers', {
get: function () {
return this.start.hasSubscribers
|| this.end.hasSubscribers
|| this.asyncStart.hasSubscribers
|| this.asyncEnd.hasSubscribers
|| this.error.hasSubscribers;
},
configurable: true
});
}

return dc;
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
'use strict';

const test = require('tape');
const common = require('./common.js');
const dc = require('../dc-polyfill.js');

test('test-diagnostics-channel-tracing-has-subscribers', (t) => {
t.plan(10);

const handler = common.mustNotCall();

{
const handlers = {
start: common.mustNotCall()
};

const channel = dc.tracingChannel('test');

t.strictEqual(channel.hasSubscribers, false);

channel.subscribe(handlers);
t.strictEqual(channel.hasSubscribers, true);

channel.unsubscribe(handlers);
t.strictEqual(channel.hasSubscribers, false);

channel.start.subscribe(handler);
t.strictEqual(channel.hasSubscribers, true);

channel.start.unsubscribe(handler);
t.strictEqual(channel.hasSubscribers, false);
}

{
const handlers = {
asyncEnd: common.mustNotCall()
};

const channel = dc.tracingChannel('test');

t.strictEqual(channel.hasSubscribers, false);

channel.subscribe(handlers);
t.strictEqual(channel.hasSubscribers, true);

channel.unsubscribe(handlers);
t.strictEqual(channel.hasSubscribers, false);

channel.asyncEnd.subscribe(handler);
t.strictEqual(channel.hasSubscribers, true);

channel.asyncEnd.unsubscribe(handler);
t.strictEqual(channel.hasSubscribers, false);
}
});
Loading