fix rebase fallout

Author: Centril

crates/core/src/host/instance_env.rs

@@ -187,7 +187,7 @@ impl InstanceEnv {
     }
 
     #[tracing::instrument(level = "trace", skip_all)]
-    pub fn console_log(&self, level: LogLevel, record: &Record, bt: &dyn BacktraceProvider) {
+    pub(crate) fn console_log(&self, level: LogLevel, record: &Record, bt: &dyn BacktraceProvider) {
         self.replica_ctx.logger.write(level, record, bt);
         log::trace!(
             "MOD({}): {}",
@@ -197,7 +197,7 @@ impl InstanceEnv {
     }
 
     /// End a console timer by logging the span at INFO level.
-    pub fn console_timer_end(&self, span: &TimingSpan, function: Option<&str>) {
+    pub(crate) fn console_timer_end(&self, span: &TimingSpan, function: Option<&str>) {
         let elapsed = span.start.elapsed();
         let message = format!("Timing span {:?}: {:?}", &span.name, elapsed);
 

crates/core/src/host/v8/mod.rs

@@ -27,8 +27,6 @@ use spacetimedb_client_api_messages::energy::ReducerBudget;
 use spacetimedb_datastore::locking_tx_datastore::MutTxId;
 use spacetimedb_datastore::traits::Program;
 use spacetimedb_lib::{ConnectionId, Identity, RawModuleDef, Timestamp};
-use spacetimedb_primitives::{ColId, IndexId, TableId};
-use spacetimedb_sats::Serialize;
 use spacetimedb_schema::auto_migrate::MigrationPolicy;
 use std::sync::{Arc, LazyLock};
 use std::time::Instant;

crates/core/src/host/v8/syscall.rs

@@ -937,23 +937,26 @@ fn console_log<'scope>(scope: &mut HandleScope<'scope>, args: FunctionCallbackAr
         .get_script_name(scope)
         .map(|s| s.to_rust_cow_lossy(scope, &mut buf));
 
+    let level = (level as u8).into();
+    let trace = if level == LogLevel::Panic {
+        JsStackTrace::from_current_stack_trace(scope)?
+    } else {
+        <_>::default()
+    };
+
+    let env = env_on_isolate(scope);
+
+    let function = env.log_record_function();
     let record = Record {
         // TODO: figure out whether to use walltime now or logical reducer now (env.reducer_start)
         ts: chrono::Utc::now(),
         target: None,
         filename: filename.as_deref(),
         line_number: Some(frame.get_line_number() as u32),
+        function,
         message: &msg,
     };
 
-    let level = (level as u8).into();
-    let trace = if level == LogLevel::Panic {
-        JsStackTrace::from_current_stack_trace(scope)?
-    } else {
-        <_>::default()
-    };
-
-    let env = env_on_isolate(scope);
     env.instance_env.console_log(level, &record, &trace);
 
     Ok(v8::undefined(scope).into())
@@ -1036,7 +1039,8 @@ fn console_timer_end<'scope>(
         let exc = CodeError::from_code(scope, errno::NO_SUCH_CONSOLE_TIMER.get())?;
         return Err(exc.throw(scope));
     };
-    env.instance_env.console_timer_end(&span);
+    let function = env.log_record_function();
+    env.instance_env.console_timer_end(&span, function);
 
     Ok(v8::undefined(scope).into())
 }