Observe bytecode kinds in overrides

Author: slowli

core/node/api_server/src/execution_sandbox/vm_metrics.rs

@@ -5,7 +5,8 @@ use vise::{
     Metrics,
 };
 use zksync_types::{
-    api::state_override::{OverrideState, StateOverride},
+    api::state_override::{BytecodeOverride, OverrideState, StateOverride},
+    bytecode::BytecodeMarker,
     H256,
 };
 
@@ -100,6 +101,30 @@ struct StateOverrideLabels {
     kind: OverrideKind,
 }
 
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, EncodeLabelValue)]
+#[metrics(rename_all = "snake_case")]
+enum BytecodeMarkerLabel {
+    EraVm,
+    DetectedEraVm,
+    Evm,
+    DetectedEvm,
+}
+
+impl BytecodeMarkerLabel {
+    fn detected(kind: BytecodeMarker) -> Self {
+        match kind {
+            BytecodeMarker::EraVm => Self::DetectedEraVm,
+            BytecodeMarker::Evm => Self::DetectedEvm,
+        }
+    }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, EncodeLabelSet)]
+struct BytecodeOverrideLabels {
+    method: &'static str,
+    kind: BytecodeMarkerLabel,
+}
+
 #[derive(Debug, Metrics)]
 #[metrics(prefix = "api_web3")]
 pub(crate) struct SandboxMetrics {
@@ -123,6 +148,8 @@ pub(crate) struct SandboxMetrics {
     pub estimate_gas_optimistic_gas_limit_relative_diff: Histogram<f64>,
     /// Statistics on state overrides.
     state_overrides: Family<StateOverrideLabels, Counter>,
+    /// Statistics on bytecode kinds supplied in overrides.
+    bytecode_overrides: Family<BytecodeOverrideLabels, Counter>,
 }
 
 impl SandboxMetrics {
@@ -140,8 +167,23 @@ impl SandboxMetrics {
 
     pub fn observe_override_metrics(&self, method: &'static str, state_overrides: &StateOverride) {
         for (_, account_override) in state_overrides.iter() {
-            if account_override.code.is_some() {
+            if let Some(code_override) = &account_override.code {
                 self.state_overrides[&OverrideKind::Code.for_method(method)].inc();
+
+                let bytecode_kind = match code_override {
+                    BytecodeOverride::Evm(_) => BytecodeMarkerLabel::Evm,
+                    BytecodeOverride::EraVm(_) => BytecodeMarkerLabel::EraVm,
+                    BytecodeOverride::Unspecified(bytes) => {
+                        // Bytecode kind detection is very cheap, so it's permissible to do it here
+                        let kind = BytecodeMarker::detect(&bytes.0);
+                        BytecodeMarkerLabel::detected(kind)
+                    }
+                };
+                let labels = BytecodeOverrideLabels {
+                    method,
+                    kind: bytecode_kind,
+                };
+                self.bytecode_overrides[&labels].inc();
             }
             if account_override.nonce.is_some() {
                 self.state_overrides[&OverrideKind::Nonce.for_method(method)].inc();