Port scheduler tests to isolate2 (#24851)

GitOrigin-RevId: 6c433fa30b997b6018a3f511f75c2c7de84fbc4d

Author: Sujay Jayakar

crates/isolate/src/environment/action/mod.rs

@@ -111,8 +111,9 @@ use self::{
     task_executor::TaskExecutor,
 };
 use super::warnings::{
-    add_warning_if_approaching_duration_limit,
-    add_warning_if_approaching_limit,
+    approaching_duration_limit_warning,
+    approaching_limit_warning,
+    SystemWarning,
 };
 use crate::{
     client::{
@@ -942,29 +943,31 @@ impl<RT: Runtime> ActionEnvironment<RT> {
         arguments: &ConvexArray,
         result: Option<&ConvexValue>,
     ) -> anyhow::Result<()> {
-        add_warning_if_approaching_limit(
-            self,
+        if let Some(warning) = approaching_limit_warning(
             arguments.size(),
             *FUNCTION_MAX_ARGS_SIZE,
             "FunctionArgumentsTooLarge",
             || "Large size of the action arguments".to_string(),
             None,
             Some(" bytes"),
             None,
-        )?;
+        )? {
+            self.trace_system(warning)?;
+        }
         self.add_warnings_to_log_lines(execution_time)?;
 
         if let Some(result) = result {
-            add_warning_if_approaching_limit(
-                self,
+            if let Some(warning) = approaching_limit_warning(
                 result.size(),
                 *FUNCTION_MAX_RESULT_SIZE,
                 "TooLargeFunctionResult",
                 || "Large size of the action return value".to_string(),
                 None,
                 Some(" bytes"),
                 None,
-            )?
+            )? {
+                self.trace_system(warning)?;
+            }
         };
         Ok(())
     }
@@ -980,16 +983,17 @@ impl<RT: Runtime> ActionEnvironment<RT> {
             return Ok(());
         };
         if let Some(body) = response.body.as_ref() {
-            add_warning_if_approaching_limit(
-                self,
+            if let Some(warning) = approaching_limit_warning(
                 body.len(),
                 HTTP_ACTION_BODY_LIMIT,
                 "HttpResponseTooLarge",
                 || "Large response returned from an HTTP action".to_string(),
                 None,
                 Some(" bytes"),
                 None,
-            )?;
+            )? {
+                self.trace_system(warning)?;
+            }
         };
         Ok(())
     }
@@ -1003,21 +1007,30 @@ impl<RT: Runtime> ActionEnvironment<RT> {
             let total_dangling_tasks = dangling_task_counts.values().sum();
             let task_names = dangling_task_counts.keys().join(", ");
             log_unawaited_pending_op(total_dangling_tasks, "action");
-            self.trace_system(LogLevel::Warn, vec![format!(
-                    "{total_dangling_tasks} unawaited operation{}: [{task_names}]. Async operations should be awaited or they might not run. \
-                     See https://docs.convex.dev/functions/actions#dangling-promises for more information.",
-                    if total_dangling_tasks == 1 { "" } else { "s" },
-                )], SystemLogMetadata { code: "UnawaitedOperations".to_string() })?;
+            let message = format!(
+                "{total_dangling_tasks} unawaited operation{}: [{task_names}]. Async operations should be awaited or they might not run. \
+                 See https://docs.convex.dev/functions/actions#dangling-promises for more information.",
+                if total_dangling_tasks == 1 { "" } else { "s" },
+            );
+            let warning = SystemWarning {
+                level: LogLevel::Warn,
+                messages: vec![message],
+                system_log_metadata: SystemLogMetadata {
+                    code: "UnawaitedOperations".to_string(),
+                },
+            };
+            self.trace_system(warning)?;
         }
-
-        add_warning_if_approaching_duration_limit(
-            self,
+        if let Some(warning) = approaching_duration_limit_warning(
             execution_time.elapsed,
             execution_time.limit,
             "UserTimeout",
             "Function execution took a long time",
             None,
-        )
+        )? {
+            self.trace_system(warning)?;
+        }
+        Ok(())
     }
 
     fn dangling_task_counts(&self) -> BTreeMap<String, usize> {
@@ -1051,6 +1064,17 @@ impl<RT: Runtime> ActionEnvironment<RT> {
             .expect("TaskExecutor went away?");
         Ok(())
     }
+
+    fn trace_system(&mut self, warning: SystemWarning) -> anyhow::Result<()> {
+        self.log_line_sender
+            .unbounded_send(LogLine::new_system_log_line(
+                warning.level,
+                warning.messages,
+                self.rt.unix_timestamp(),
+                warning.system_log_metadata,
+            ))?;
+        Ok(())
+    }
 }
 
 impl<RT: Runtime> IsolateEnvironment<RT> for ActionEnvironment<RT> {
@@ -1084,22 +1108,6 @@ impl<RT: Runtime> IsolateEnvironment<RT> for ActionEnvironment<RT> {
         Ok(())
     }
 
-    fn trace_system(
-        &mut self,
-        level: LogLevel,
-        messages: Vec<String>,
-        system_log_metadata: SystemLogMetadata,
-    ) -> anyhow::Result<()> {
-        self.log_line_sender
-            .unbounded_send(LogLine::new_system_log_line(
-                level,
-                messages,
-                self.rt.unix_timestamp(),
-                system_log_metadata,
-            ))?;
-        Ok(())
-    }
-
     fn rng(&mut self) -> anyhow::Result<&mut ChaCha12Rng> {
         self.phase.rng()
     }

crates/isolate/src/environment/analyze.rs

@@ -15,10 +15,7 @@ use common::{
         DATABASE_UDF_SYSTEM_TIMEOUT,
         DATABASE_UDF_USER_TIMEOUT,
     },
-    log_lines::{
-        LogLevel,
-        SystemLogMetadata,
-    },
+    log_lines::LogLevel,
     runtime::{
         Runtime,
         UnixTimestamp,
@@ -132,19 +129,6 @@ impl<RT: Runtime> IsolateEnvironment<RT> for AnalyzeEnvironment {
         Ok(())
     }
 
-    fn trace_system(
-        &mut self,
-        _level: LogLevel,
-        messages: Vec<String>,
-        _system_log_metadata: SystemLogMetadata,
-    ) -> anyhow::Result<()> {
-        tracing::warn!(
-            "Unexpected Console access at import time: {}",
-            messages.join(" ")
-        );
-        Ok(())
-    }
-
     fn rng(&mut self) -> anyhow::Result<&mut ChaCha12Rng> {
         Ok(&mut self.rng)
     }

crates/isolate/src/environment/auth_config.rs

@@ -10,10 +10,7 @@ use common::{
         DATABASE_UDF_SYSTEM_TIMEOUT,
         DATABASE_UDF_USER_TIMEOUT,
     },
-    log_lines::{
-        LogLevel,
-        SystemLogMetadata,
-    },
+    log_lines::LogLevel,
     runtime::{
         Runtime,
         UnixTimestamp,
@@ -86,19 +83,6 @@ impl<RT: Runtime> IsolateEnvironment<RT> for AuthConfigEnvironment {
         Ok(())
     }
 
-    fn trace_system(
-        &mut self,
-        _level: LogLevel,
-        messages: Vec<String>,
-        _system_log_metadata: SystemLogMetadata,
-    ) -> anyhow::Result<()> {
-        tracing::warn!(
-            "Unexpected Console access when evaluating auth config file: {}",
-            messages.join(" ")
-        );
-        Ok(())
-    }
-
     fn rng(&mut self) -> anyhow::Result<&mut ChaCha12Rng> {
         anyhow::bail!(ErrorMetadata::bad_request(
             "NoRandomDuringAuthConfig",

crates/isolate/src/environment/mod.rs

@@ -11,14 +11,11 @@ pub mod auth_config;
 pub mod helpers;
 pub mod schema;
 pub mod udf;
-mod warnings;
+pub mod warnings;
 
 use common::{
     errors::JsError,
-    log_lines::{
-        LogLevel,
-        SystemLogMetadata,
-    },
+    log_lines::LogLevel,
     runtime::{
         Runtime,
         UnixTimestamp,
@@ -79,12 +76,6 @@ pub trait IsolateEnvironment<RT: Runtime>: 'static {
     ) -> anyhow::Result<()>;
 
     fn trace(&mut self, level: LogLevel, messages: Vec<String>) -> anyhow::Result<()>;
-    fn trace_system(
-        &mut self,
-        level: LogLevel,
-        messages: Vec<String>,
-        system_log_metadata: SystemLogMetadata,
-    ) -> anyhow::Result<()>;
     fn rng(&mut self) -> anyhow::Result<&mut ChaCha12Rng>;
     fn unix_timestamp(&self) -> anyhow::Result<UnixTimestamp>;
 

crates/isolate/src/environment/schema.rs

@@ -6,10 +6,7 @@ use common::{
         DATABASE_UDF_SYSTEM_TIMEOUT,
         DATABASE_UDF_USER_TIMEOUT,
     },
-    log_lines::{
-        LogLevel,
-        SystemLogMetadata,
-    },
+    log_lines::LogLevel,
     runtime::{
         Runtime,
         UnixTimestamp,
@@ -82,19 +79,6 @@ impl<RT: Runtime> IsolateEnvironment<RT> for SchemaEnvironment {
         Ok(())
     }
 
-    fn trace_system(
-        &mut self,
-        _level: LogLevel,
-        messages: Vec<String>,
-        _system_log_metadata: SystemLogMetadata,
-    ) -> anyhow::Result<()> {
-        tracing::warn!(
-            "Unexpected Console access at schema evaluation time: {}",
-            messages.join(" ")
-        );
-        Ok(())
-    }
-
     fn rng(&mut self) -> anyhow::Result<&mut ChaCha12Rng> {
         Ok(&mut self.rng)
     }