Some pr feedback

Signed-off-by: Ludvig Liljenberg <[email protected]>

Author: ludfjig

src/hyperlight_host/src/hypervisor/hypervisor_handler.rs

@@ -435,7 +435,7 @@ impl HypervisorHandler {
                                         .try_read();
 
                                 let res = HistogramMetric::time_and_emit_guest_call(
-                                    function_name.clone(),
+                                    &function_name,
                                     || {
                                         hv.dispatch_call_from_host(
                                             dispatch_function_addr,

src/hyperlight_host/src/metrics/metrics_macro.rs

@@ -1,3 +1,19 @@
+/*
+Copyright 2024 The Hyperlight Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 /// Crate-internal trait for defining metrics.
 pub(crate) trait NamedMetric {
     /// The name of the metric.
@@ -15,7 +31,6 @@ macro_rules! define_metrics {
         $(
             $metric_type:ident $( < $( $gen:tt ),+ > )? {
                 $(
-                    $( #[cfg($feature:meta)] )?
                     $variant:ident $( { $($field_name:ident : $field_ty:ty),* $(,)? } )? => {
                         name: $name:expr,
                         description: $description:expr,
@@ -30,7 +45,6 @@ macro_rules! define_metrics {
             #[allow(dead_code)]
             pub(crate) enum $metric_type $( < $( $gen ),+ > )? {
                 $(
-                    $( #[cfg($feature)] )?
                     $variant $( { $($field_name : $field_ty),* } )?
                 ),*
             }
@@ -39,7 +53,6 @@ macro_rules! define_metrics {
                 fn name(&self) -> &'static str {
                     match self {
                         $(
-                            $( #[cfg($feature)] )?
                             Self::$variant { .. } => $name,
                         )*
                     }
@@ -48,7 +61,6 @@ macro_rules! define_metrics {
                 fn description(&self) -> &'static str {
                     match self {
                         $(
-                            $( #[cfg($feature)] )?
                             Self::$variant { .. } => $description,
                         )*
                     }
@@ -57,7 +69,6 @@ macro_rules! define_metrics {
                 fn unit(&self) -> metrics::Unit {
                     match self {
                         $(
-                            $( #[cfg($feature)] )?
                             Self::$variant { .. } => $unit,
                         )*
                     }

src/hyperlight_host/src/metrics/mod.rs

@@ -1,3 +1,19 @@
+/*
+Copyright 2024 The Hyperlight Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 use std::sync::Once;
 use std::time::Duration;
 
@@ -54,7 +70,7 @@ impl HistogramMetric {
     /// Note: If the `function_call_metrics` feature is not enabled, this function
     /// will simply execute the closure without measuring time or emitting metrics.
     pub(crate) fn time_and_emit_guest_call<T, F: FnOnce() -> T>(
-        #[allow(unused_variables)] name: String,
+        #[allow(unused_variables)] name: &str,
         f: F,
     ) -> T {
         cfg_if::cfg_if! {
@@ -64,7 +80,7 @@ impl HistogramMetric {
                 let start = Instant::now();
                 let result = f();
                 let duration = start.elapsed();
-                HistogramMetric::GuestCallDuration { name, duration }.emit();
+                HistogramMetric::GuestCallDuration { name: name.to_string(), duration }.emit();
                 result
             } else {
                 f()
@@ -78,7 +94,7 @@ impl HistogramMetric {
     /// Note: If the `function_call_metrics` feature is not enabled, this function
     /// will simply execute the closure without measuring time or emitting metrics.
     pub(crate) fn time_and_emit_host_call<T, F: FnOnce() -> T>(
-        #[allow(unused_variables)] name: String,
+        #[allow(unused_variables)] name: &str,
         f: F,
     ) -> T {
         cfg_if::cfg_if! {
@@ -88,7 +104,7 @@ impl HistogramMetric {
                 let start = Instant::now();
                 let result = f();
                 let duration = start.elapsed();
-                HistogramMetric::HostCallDuration { name, duration }.emit();
+                HistogramMetric::HostCallDuration { name: name.to_string(), duration }.emit();
                 result
             } else {
                 f()

src/hyperlight_host/src/sandbox/host_funcs.rs

@@ -182,7 +182,7 @@ fn call_host_func_impl(
             seccompiler::apply_filter(&seccomp_filter)?;
         }
 
-        HistogramMetric::time_and_emit_host_call(name.to_string(), || func.call(args.clone()))
+        HistogramMetric::time_and_emit_host_call(name, || func.call(args))
     }
 
     cfg_if::cfg_if! {