Skip to content

Commit c1385ed

Browse files
committed
fixup! use performance.nodeTiming instead
1 parent aa4dc99 commit c1385ed

File tree

4 files changed

+12
-25
lines changed

4 files changed

+12
-25
lines changed

lib/internal/perf/nodetiming.js

+8
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ const {
2828
NODE_PERFORMANCE_MILESTONE_ENVIRONMENT,
2929
},
3030
loopIdleTime,
31+
uvMetricsInfo,
3132
} = internalBinding('performance');
3233

3334
class PerformanceNodeTiming {
@@ -122,6 +123,13 @@ class PerformanceNodeTiming {
122123
configurable: true,
123124
get: loopIdleTime,
124125
},
126+
127+
uvMetricsInfo: {
128+
__proto__: null,
129+
enumerable: true,
130+
configurable: true,
131+
get: uvMetricsInfo,
132+
},
125133
});
126134
}
127135

lib/internal/perf/performance.js

-10
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ const {
3939
} = require('internal/perf/observe');
4040

4141
const { eventLoopUtilization } = require('internal/perf/event_loop_utilization');
42-
const { uvMetricsInfo } = require('internal/perf/uv_metrics');
4342
const nodeTiming = require('internal/perf/nodetiming');
4443
const timerify = require('internal/perf/timerify');
4544
const { customInspectSymbol: kInspect, kEnumerableProperty, kEmptyObject } = require('internal/util');
@@ -158,7 +157,6 @@ class Performance extends EventTarget {
158157
nodeTiming: this.nodeTiming,
159158
timeOrigin: this.timeOrigin,
160159
eventLoopUtilization: this.eventLoopUtilization(),
161-
uvMetrics: this.uvMetricsInfo(),
162160
};
163161
}
164162
}
@@ -193,14 +191,6 @@ ObjectDefineProperties(Performance.prototype, {
193191
writable: true,
194192
value: eventLoopUtilization,
195193
},
196-
uvMetricsInfo: {
197-
__proto__: null,
198-
configurable: true,
199-
// Node.js specific extensions.
200-
enumerable: false,
201-
writable: true,
202-
value: uvMetricsInfo,
203-
},
204194

205195
nodeTiming: {
206196
__proto__: null,

lib/internal/perf/uv_metrics.js

-11
This file was deleted.

test/parallel/test-performance-uvmetricsinfo.js test/parallel/test-performance-nodetiming-uvmetricsinfo.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@ const assert = require('node:assert');
1010
const fs = require('node:fs');
1111
const { performance } = require('node:perf_hooks');
1212

13-
const { uvMetricsInfo } = performance;
13+
const { nodeTiming } = performance;
1414

1515
function safeMetricsInfo(cb) {
1616
setImmediate(() => {
17-
const info = uvMetricsInfo();
17+
const info = nodeTiming.uvMetricsInfo;
1818
cb(info);
1919
});
2020
}
2121

2222
{
23-
const info = uvMetricsInfo();
23+
const info = nodeTiming.uvMetricsInfo;
2424
assert.strictEqual(info.loopCount, 0);
2525
assert.strictEqual(info.events, 0);
2626
// This is the only part of the test that we test events waiting
@@ -33,7 +33,7 @@ function safeMetricsInfo(cb) {
3333
// The synchronous call should obviously not affect the uv metrics
3434
const fd = fs.openSync(filepath, 'r');
3535
fs.readFileSync(fd);
36-
const info = uvMetricsInfo();
36+
const info = nodeTiming.uvMetricsInfo;
3737
assert.strictEqual(info.loopCount, 0);
3838
assert.strictEqual(info.events, 0);
3939
assert.strictEqual(info.eventsWaiting, 0);

0 commit comments

Comments
 (0)