[monarch] fold hyperactor_extension into monarch_hyperactor

This originally was separated out as an artifact of dual extensions, now that there is only one hyperactor_extension we don't need to do that.

Differential Revision: [D77945980](https://our.internmc.facebook.com/intern/diff/D77945980/)

ghstack-source-id: 294902065
Pull Request resolved: #464

Author: suo

actor_extension/Cargo.toml

@@ -16,11 +16,12 @@ crate-type = ["cdylib"]
 anyhow = "1.0.98"
 bincode = "1.3.3"
 hyperactor = { version = "0.0.0", path = "../hyperactor" }
-hyperactor_extension = { version = "0.0.0", path = "../hyperactor_extension" }
 hyperactor_mesh = { version = "0.0.0", path = "../hyperactor_mesh" }
+hyperactor_telemetry = { version = "0.0.0", path = "../hyperactor_telemetry" }
 libc = "0.2.139"
 monarch_hyperactor = { version = "0.0.0", path = "../monarch_hyperactor" }
 pyo3 = { version = "0.24", features = ["anyhow", "multiple-pymethods"] }
 pyo3-async-runtimes = { version = "0.24", features = ["attributes", "tokio-runtime"] }
 serde = { version = "1.0.185", features = ["derive", "rc"] }
 tokio = { version = "1.45.0", features = ["full", "test-util", "tracing"] }
+tracing = { version = "0.1.41", features = ["attributes", "valuable"] }

actor_extension/src/lib.rs

@@ -15,6 +15,7 @@ use pyo3::prelude::*;
 mod blocking;
 mod code_sync;
 mod panic;
+mod telemetry;
 
 #[cfg(fbcode_build)]
 mod meta;
@@ -105,14 +106,7 @@ pub fn mod_init(module: &Bound<'_, PyModule>) -> PyResult<()> {
         module,
         "monarch_hyperactor.runtime",
     )?)?;
-    hyperactor_extension::alloc::register_python_bindings(&get_or_add_new_module(
-        module,
-        "hyperactor_extension.alloc",
-    )?)?;
-    hyperactor_extension::telemetry::register_python_bindings(&get_or_add_new_module(
-        module,
-        "hyperactor_extension.telemetry",
-    )?)?;
+    telemetry::register_python_bindings(&get_or_add_new_module(module, "telemetry")?)?;
     crate::panic::register_python_bindings(&get_or_add_new_module(module, "panic")?)?;
 
     crate::blocking::register_python_bindings(&get_or_add_new_module(module, "blocking")?)?;

hyperactor_extension/src/telemetry.rs renamed to actor_extension/src/telemetry.rs

@@ -113,7 +113,7 @@ pub fn use_sim_clock() -> PyResult<()> {
 #[pyclass(
     unsendable,
     subclass,
-    module = "monarch._src.actor._extension.hyperactor_extension.telemetry"
+    module = "monarch._src.actor._extension.telemetry"
 )]
 struct PySpan {
     span: tracing::span::EnteredSpan,
@@ -140,46 +140,28 @@ use pyo3::types::PyModule;
 pub fn register_python_bindings(module: &Bound<'_, PyModule>) -> PyResult<()> {
     // Register the forward_to_tracing function
     let f = wrap_pyfunction!(forward_to_tracing, module)?;
-    f.setattr(
-        "__module__",
-        "monarch._src.actor._extension.hyperactor_extension.telemetry",
-    )?;
+    f.setattr("__module__", "monarch._src.actor._extension.telemetry")?;
     module.add_function(f)?;
 
     // Register the span-related functions
     let enter_span_fn = wrap_pyfunction!(enter_span, module)?;
-    enter_span_fn.setattr(
-        "__module__",
-        "monarch._src.actor._extension.hyperactor_extension.telemetry",
-    )?;
+    enter_span_fn.setattr("__module__", "monarch._src.actor._extension.telemetry")?;
     module.add_function(enter_span_fn)?;
 
     let exit_span_fn = wrap_pyfunction!(exit_span, module)?;
-    exit_span_fn.setattr(
-        "__module__",
-        "monarch._src.actor._extension.hyperactor_extension.telemetry",
-    )?;
+    exit_span_fn.setattr("__module__", "monarch._src.actor._extension.telemetry")?;
     module.add_function(exit_span_fn)?;
 
     let get_current_span_id_fn = wrap_pyfunction!(get_current_span_id, module)?;
-    get_current_span_id_fn.setattr(
-        "__module__",
-        "monarch._src.actor._extension.hyperactor_extension.telemetry",
-    )?;
+    get_current_span_id_fn.setattr("__module__", "monarch._src.actor._extension.telemetry")?;
     module.add_function(get_current_span_id_fn)?;
 
     let use_real_clock_fn = wrap_pyfunction!(use_real_clock, module)?;
-    use_real_clock_fn.setattr(
-        "__module__",
-        "monarch._src.actor._extension.hyperactor_extension.telemetry",
-    )?;
+    use_real_clock_fn.setattr("__module__", "monarch._src.actor._extension.telemetry")?;
     module.add_function(use_real_clock_fn)?;
 
     let use_sim_clock_fn = wrap_pyfunction!(use_sim_clock, module)?;
-    use_sim_clock_fn.setattr(
-        "__module__",
-        "monarch._src.actor._extension.hyperactor_extension.telemetry",
-    )?;
+    use_sim_clock_fn.setattr("__module__", "monarch._src.actor._extension.telemetry")?;
     module.add_function(use_sim_clock_fn)?;
 
     module.add_class::<PySpan>()?;

hyperactor_extension/Cargo.toml

@@ -15,7 +15,6 @@ clap = { version = "4.5.38", features = ["derive", "env", "string", "unicode", "
 erased-serde = "0.3.27"
 fbinit = { version = "0.2.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
 hyperactor = { version = "0.0.0", path = "../hyperactor" }
-hyperactor_extension = { version = "0.0.0", path = "../hyperactor_extension" }
 hyperactor_mesh = { version = "0.0.0", path = "../hyperactor_mesh" }
 hyperactor_multiprocess = { version = "0.0.0", path = "../hyperactor_multiprocess" }
 hyperactor_telemetry = { version = "0.0.0", path = "../hyperactor_telemetry" }