diff options
Diffstat (limited to 'runtime/ops/runtime.rs')
| -rw-r--r-- | runtime/ops/runtime.rs | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/runtime/ops/runtime.rs b/runtime/ops/runtime.rs index 77abc45b7..a2f377bed 100644 --- a/runtime/ops/runtime.rs +++ b/runtime/ops/runtime.rs @@ -1,6 +1,7 @@ // Copyright 2018-2021 the Deno authors. All rights reserved. MIT license. -use crate::metrics::Metrics; +use crate::metrics::RuntimeMetrics; +use crate::ops::UnstableChecker; use crate::permissions::Permissions; use deno_core::error::AnyError; use deno_core::serde_json; @@ -42,21 +43,15 @@ fn op_metrics( _args: Value, _zero_copy: &mut [ZeroCopyBuf], ) -> Result<Value, AnyError> { - let m = state.borrow::<Metrics>(); - - Ok(json!({ - "opsDispatched": m.ops_dispatched, - "opsDispatchedSync": m.ops_dispatched_sync, - "opsDispatchedAsync": m.ops_dispatched_async, - "opsDispatchedAsyncUnref": m.ops_dispatched_async_unref, - "opsCompleted": m.ops_completed, - "opsCompletedSync": m.ops_completed_sync, - "opsCompletedAsync": m.ops_completed_async, - "opsCompletedAsyncUnref": m.ops_completed_async_unref, - "bytesSentControl": m.bytes_sent_control, - "bytesSentData": m.bytes_sent_data, - "bytesReceived": m.bytes_received - })) + let m = state.borrow::<RuntimeMetrics>(); + let combined = m.combined_metrics(); + let unstable_checker = state.borrow::<UnstableChecker>(); + let maybe_ops = if unstable_checker.unstable { + Some(&m.ops) + } else { + None + }; + Ok(json!({ "combined": combined, "ops": maybe_ops })) } pub fn ppid() -> Value { |