fixup! use performance.nodeTiming instead

nodejs · Aug 20, 2024 · 6654a2b · 6654a2b
1 parent aa4dc99
commit 6654a2b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 25 deletions.
diff --git a/lib/internal/perf/nodetiming.js b/lib/internal/perf/nodetiming.js
@@ -28,6 +28,7 @@ const {
     NODE_PERFORMANCE_MILESTONE_ENVIRONMENT,
   },
   loopIdleTime,
+  uvMetricsInfo,
 } = internalBinding('performance');
 
 class PerformanceNodeTiming {
@@ -122,6 +123,13 @@ class PerformanceNodeTiming {
         configurable: true,
         get: loopIdleTime,
       },
+
+      uvMetricsInfo: {
+        __proto__: null,
+        enumerable: true,
+        configurable: true,
+        get: uvMetricsInfo,
+      }
     });
   }
 

diff --git a/lib/internal/perf/performance.js b/lib/internal/perf/performance.js
@@ -39,7 +39,6 @@ const {
 } = require('internal/perf/observe');
 
 const { eventLoopUtilization } = require('internal/perf/event_loop_utilization');
-const { uvMetricsInfo } = require('internal/perf/uv_metrics');
 const nodeTiming = require('internal/perf/nodetiming');
 const timerify = require('internal/perf/timerify');
 const { customInspectSymbol: kInspect, kEnumerableProperty, kEmptyObject } = require('internal/util');
@@ -158,7 +157,6 @@ class Performance extends EventTarget {
       nodeTiming: this.nodeTiming,
       timeOrigin: this.timeOrigin,
       eventLoopUtilization: this.eventLoopUtilization(),
-      uvMetrics: this.uvMetricsInfo(),
     };
   }
 }
@@ -193,14 +191,6 @@ ObjectDefineProperties(Performance.prototype, {
     writable: true,
     value: eventLoopUtilization,
   },
-  uvMetricsInfo: {
-    __proto__: null,
-    configurable: true,
-    // Node.js specific extensions.
-    enumerable: false,
-    writable: true,
-    value: uvMetricsInfo,
-  },
 
   nodeTiming: {
     __proto__: null,

diff --git a/lib/internal/perf/uv_metrics.js b/lib/internal/perf/uv_metrics.js
diff --git a/...arallel/test-performance-uvmetricsinfo.js → ...t-performance-nodetiming-uvmetricsinfo.js b/...arallel/test-performance-uvmetricsinfo.js → ...t-performance-nodetiming-uvmetricsinfo.js
@@ -10,17 +10,17 @@ const assert = require('node:assert');
 const fs = require('node:fs');
 const { performance } = require('node:perf_hooks');
 
-const { uvMetricsInfo } = performance;
+const { nodeTiming } = performance;
 
 function safeMetricsInfo(cb) {
   setImmediate(() => {
-    const info = uvMetricsInfo();
+    const info = nodeTiming.uvMetricsInfo;
     cb(info);
   });
 }
 
 {
-  const info = uvMetricsInfo();
+  const info = nodeTiming.uvMetricsInfo;
   assert.strictEqual(info.loopCount, 0);
   assert.strictEqual(info.events, 0);
   // This is the only part of the test that we test events waiting
@@ -33,7 +33,7 @@ function safeMetricsInfo(cb) {
   // The synchronous call should obviously not affect the uv metrics
   const fd = fs.openSync(filepath, 'r');
   fs.readFileSync(fd);
-  const info = uvMetricsInfo();
+  const info = nodeTiming.uvMetricsInfo;
   assert.strictEqual(info.loopCount, 0);
   assert.strictEqual(info.events, 0);
   assert.strictEqual(info.eventsWaiting, 0);