oai-statsig-python-core 0.27.0rc2__tar.gz → 0.28.0__tar.gz

{oai_statsig_python_core-0.27.0rc2 → oai_statsig_python_core-0.28.0}/Cargo.lock

@@ -1738,7 +1738,7 @@ dependencies = [
 
 [[package]]
 name = "oai-statsig-grpc"
-version = "0.27.0-rc.2"
+version = "0.28.0"
 dependencies = [
  "async-trait",
  "chrono",
@@ -1753,7 +1753,7 @@ dependencies = [
 
 [[package]]
 name = "oai-statsig-rust"
-version = "0.27.0-rc.2"
+version = "0.28.0"
 dependencies = [
  "ahash",
  "arc-swap",
@@ -3043,7 +3043,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
 [[package]]
 name = "statsig-node"
-version = "0.27.0-rc.2"
+version = "0.28.0"
 dependencies = [
  "async-trait",
  "napi",
@@ -3058,7 +3058,7 @@ dependencies = [
 
 [[package]]
 name = "statsig-pyo3"
-version = "0.27.0-rc.2"
+version = "0.28.0"
 dependencies = [
  "async-trait",
  "lazy_static",
@@ -3073,7 +3073,7 @@ dependencies = [
 
 [[package]]
 name = "statsig_elixir"
-version = "0.27.0-rc.2"
+version = "0.28.0"
 dependencies = [
  "async-trait",
  "oai-statsig-rust",
@@ -3086,7 +3086,7 @@ dependencies = [
 
 [[package]]
 name = "statsig_ffi"
-version = "0.27.0-rc.2"
+version = "0.28.0"
 dependencies = [
  "async-trait",
  "cbindgen",

{oai_statsig_python_core-0.27.0rc2 → oai_statsig_python_core-0.28.0}/Cargo.toml

@@ -26,7 +26,7 @@ exclude = [
 [workspace.package]
 edition = "2021"
 license = "ISC"
-version = "0.27.0-rc.2"
+version = "0.28.0"
 homepage = "https://statsig.com/"
 authors = ["Statsig", "Daniel Loomb <daniel@statsig.com>"]
 readme = "README.md"

{oai_statsig_python_core-0.27.0rc2 → oai_statsig_python_core-0.28.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oai_statsig_python_core
-Version: 0.27.0rc2
+Version: 0.28.0
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
@@ -55,7 +55,7 @@ Bindings
 
 - PHP [[packagist](https://packagist.org/packages/statsig/statsig-php-core)] [[source](https://github.com/statsig-io/statsig-server-core/blob/main/statsig-php)] [[docs](https://docs.statsig.com/server-core/php-core?ref=gh_server_core)] 
 
-- Java [[maven](https://search.maven.org/artifact/com.statsig/javacore)] [[source](https://github.com/statsig-io/statsig-server-core/tree/main/statsig-java)] [[docs](https://docs.statsig.com/server-core/java-core?ref=gh_server_core)] 
+- Java [[maven](https://central.sonatype.com/artifact/com.oaistatsig/javacore)] [[source](https://github.com/openai/statsig-priv-server-core/tree/main/statsig-java)] [[docs](https://docs.statsig.com/server-core/java-core?ref=gh_server_core)]
 
 - Rust [[crates.io](https://crates.io/crates/oai-statsig-rust)] [[source](https://github.com/statsig-io/statsig-server-core/tree/main/statsig-rust)] [[docs](https://docs.statsig.com/server-core/rust-core?ref=gh_server_core)] 
 

{oai_statsig_python_core-0.27.0rc2 → oai_statsig_python_core-0.28.0}/py_src/statsig_python_core/statsig_python_core.pyi

@@ -22,6 +22,7 @@ __all__ = [
     "LayerEvaluationOptions",
     "LayerParamExposureData",
     "LogEventRequest",
+    "MmapReaderMemorySnapshot",
     "ObservabilityClientBase",
     "OutputLoggerProviderBase",
     "ParameterStore",
@@ -119,6 +120,8 @@ class InternedStore:
     def fetch_and_write_mmap(cls, sdk_key: builtins.str, specs_url: typing.Optional[builtins.str] = None) -> typing.Any: ...
     @classmethod
     def preload_mmap(cls, sdk_key: builtins.str) -> None: ...
+    @classmethod
+    def mmap_reader_memory_snapshot(cls) -> typing.Optional[MmapReaderMemorySnapshot]: ...
 
 @typing.final
 class LayerEvaluationOptions:
@@ -144,6 +147,25 @@ class LogEventRequest:
     def retries(self) -> builtins.int: ...
     def __new__(cls, payload: typing.Any, event_count: builtins.int, retries: builtins.int) -> LogEventRequest: ...
 
+@typing.final
+class MmapReaderMemorySnapshot:
+    @property
+    def format_version(self) -> builtins.int: ...
+    @property
+    def mapped_bytes(self) -> builtins.int: ...
+    @property
+    def resident_bytes(self) -> typing.Optional[builtins.int]: ...
+    @property
+    def proportional_set_bytes(self) -> typing.Optional[builtins.int]: ...
+    @property
+    def private_dirty_bytes(self) -> typing.Optional[builtins.int]: ...
+    @property
+    def deleted_mapped_bytes(self) -> typing.Optional[builtins.int]: ...
+    @property
+    def loaded_generation_count(self) -> builtins.int: ...
+    @property
+    def vma_segment_count(self) -> typing.Optional[builtins.int]: ...
+
 class ObservabilityClientBase:
     def __new__(cls) -> ObservabilityClientBase: ...
 

{oai_statsig_python_core-0.27.0rc2/statsig-pyo3 → oai_statsig_python_core-0.28.0/statsig-grpc}/README.md

@@ -35,7 +35,7 @@ Bindings
 
 - PHP [[packagist](https://packagist.org/packages/statsig/statsig-php-core)] [[source](https://github.com/statsig-io/statsig-server-core/blob/main/statsig-php)] [[docs](https://docs.statsig.com/server-core/php-core?ref=gh_server_core)] 
 
-- Java [[maven](https://search.maven.org/artifact/com.statsig/javacore)] [[source](https://github.com/statsig-io/statsig-server-core/tree/main/statsig-java)] [[docs](https://docs.statsig.com/server-core/java-core?ref=gh_server_core)] 
+- Java [[maven](https://central.sonatype.com/artifact/com.oaistatsig/javacore)] [[source](https://github.com/openai/statsig-priv-server-core/tree/main/statsig-java)] [[docs](https://docs.statsig.com/server-core/java-core?ref=gh_server_core)]
 
 - Rust [[crates.io](https://crates.io/crates/oai-statsig-rust)] [[source](https://github.com/statsig-io/statsig-server-core/tree/main/statsig-rust)] [[docs](https://docs.statsig.com/server-core/rust-core?ref=gh_server_core)] 
 

{oai_statsig_python_core-0.27.0rc2/statsig-grpc → oai_statsig_python_core-0.28.0/statsig-pyo3}/README.md

@@ -35,7 +35,7 @@ Bindings
 
 - PHP [[packagist](https://packagist.org/packages/statsig/statsig-php-core)] [[source](https://github.com/statsig-io/statsig-server-core/blob/main/statsig-php)] [[docs](https://docs.statsig.com/server-core/php-core?ref=gh_server_core)] 
 
-- Java [[maven](https://search.maven.org/artifact/com.statsig/javacore)] [[source](https://github.com/statsig-io/statsig-server-core/tree/main/statsig-java)] [[docs](https://docs.statsig.com/server-core/java-core?ref=gh_server_core)] 
+- Java [[maven](https://central.sonatype.com/artifact/com.oaistatsig/javacore)] [[source](https://github.com/openai/statsig-priv-server-core/tree/main/statsig-java)] [[docs](https://docs.statsig.com/server-core/java-core?ref=gh_server_core)]
 
 - Rust [[crates.io](https://crates.io/crates/oai-statsig-rust)] [[source](https://github.com/statsig-io/statsig-server-core/tree/main/statsig-rust)] [[docs](https://docs.statsig.com/server-core/rust-core?ref=gh_server_core)] 
 

{oai_statsig_python_core-0.27.0rc2 → oai_statsig_python_core-0.28.0}/statsig-pyo3/src/interned_store_py.rs

@@ -8,12 +8,48 @@ use pyo3::types::PyModule;
 use pyo3::types::PyType;
 use pyo3_stub_gen::derive::*;
 
-use statsig_rust::interned_values::InternedStore;
+use statsig_rust::interned_values::{InternedStore, MmapReaderMemorySnapshot};
 use statsig_rust::log_e;
 use statsig_rust::StatsigRuntime;
 
 const TAG: &str = stringify!(InternStorePy);
 
+#[gen_stub_pyclass]
+#[pyclass(name = "MmapReaderMemorySnapshot", module = "statsig_python_core")]
+pub struct MmapReaderMemorySnapshotPy {
+    #[pyo3(get)]
+    pub format_version: u32,
+    #[pyo3(get)]
+    pub mapped_bytes: u64,
+    #[pyo3(get)]
+    pub resident_bytes: Option<u64>,
+    #[pyo3(get)]
+    pub proportional_set_bytes: Option<u64>,
+    #[pyo3(get)]
+    pub private_dirty_bytes: Option<u64>,
+    #[pyo3(get)]
+    pub deleted_mapped_bytes: Option<u64>,
+    #[pyo3(get)]
+    pub loaded_generation_count: u64,
+    #[pyo3(get)]
+    pub vma_segment_count: Option<u64>,
+}
+
+impl From<MmapReaderMemorySnapshot> for MmapReaderMemorySnapshotPy {
+    fn from(snapshot: MmapReaderMemorySnapshot) -> Self {
+        Self {
+            format_version: snapshot.format_version,
+            mapped_bytes: snapshot.mapped_bytes,
+            resident_bytes: snapshot.resident_bytes,
+            proportional_set_bytes: snapshot.proportional_set_bytes,
+            private_dirty_bytes: snapshot.private_dirty_bytes,
+            deleted_mapped_bytes: snapshot.deleted_mapped_bytes,
+            loaded_generation_count: snapshot.loaded_generation_count,
+            vma_segment_count: snapshot.vma_segment_count,
+        }
+    }
+}
+
 #[gen_stub_pyclass]
 #[pyclass(name = "InternedStore", module = "statsig_python_core")]
 #[derive(Default)]
@@ -99,6 +135,21 @@ impl InternedStorePy {
 
         Ok(())
     }
+
+    #[classmethod]
+    pub fn mmap_reader_memory_snapshot(
+        _cls: &Bound<'_, PyType>,
+        py: Python<'_>,
+    ) -> PyResult<Option<MmapReaderMemorySnapshotPy>> {
+        py.detach(|| {
+            InternedStore::mmap_reader_memory_snapshot().map_err(|error| error.to_string())
+        })
+        .map(|snapshot| snapshot.map(Into::into))
+        .map_err(|error| {
+            log_e!(TAG, "Failed to inspect mmap reader memory: {error}");
+            PyRuntimeError::new_err(error)
+        })
+    }
 }
 
 fn get_completion_event(py: Python) -> PyResult<(Py<PyAny>, Py<PyAny>)> {

{oai_statsig_python_core-0.27.0rc2 → oai_statsig_python_core-0.28.0}/statsig-pyo3/src/lib.rs

@@ -43,6 +43,7 @@ fn statsig_python_core(m: &Bound<'_, PyModule>) -> PyResult<()> {
     m.add_class::<statsig_persistent_storage_override_adapter_py::PersistentStorageBasePy>()?;
     m.add_class::<output_logger_provider_base_py::OutputLoggerProviderBasePy>()?;
     m.add_class::<statsig_options_py::SpecAdapterConfigPy>()?;
+    m.add_class::<interned_store_py::MmapReaderMemorySnapshotPy>()?;
     m.add_class::<interned_store_py::InternedStorePy>()?;
     m.add_function(wrap_pyfunction!(notify_python_shutdown, m)?)?;
     m.add_function(wrap_pyfunction!(notify_python_fork, m)?)?;

{oai_statsig_python_core-0.27.0rc2 → oai_statsig_python_core-0.28.0}/statsig-pyo3/src/pyo_utils.rs

@@ -103,10 +103,7 @@ pub fn json_value_to_py_object(py: Python<'_>, value: &Value) -> PyResult<Py<PyA
 pub fn py_list_to_list(py_list: &Bound<PyList>) -> PyResult<Vec<String>> {
     let mut converted_list = Vec::new();
     for value in py_list {
-        match value.extract::<String>() {
-            Ok(s) => converted_list.push(s),
-            Err(e) => return Err(e),
-        }
+        converted_list.push(value.extract::<String>()?);
     }
     Ok(converted_list)
 }

{oai_statsig_python_core-0.27.0rc2 → oai_statsig_python_core-0.28.0}/statsig-pyo3/src/statsig_persistent_storage_override_adapter_py.rs

@@ -169,12 +169,8 @@ fn convert_py_lists_to_secondary_exposures(
 ) -> PyResult<Vec<SecondaryExposure>> {
     let mut exposures = Vec::new();
     for item in py_list {
-        match item.extract::<Bound<PyDict>>() {
-            Ok(e) => {
-                exposures.push(convert_py_dict_to_secondary_exposure(&e)?);
-            }
-            Err(e) => return Err(e.into()),
-        }
+        let exposure = item.extract::<Bound<PyDict>>()?;
+        exposures.push(convert_py_dict_to_secondary_exposure(&exposure)?);
     }
 
     Ok(exposures)

{oai_statsig_python_core-0.27.0rc2 → oai_statsig_python_core-0.28.0}/statsig-pyo3/tests/test_interned_store_preload.py

@@ -1,9 +1,12 @@
-from utils import get_test_data_resource_bytes, get_test_data_resource
-from pytest_httpserver import HTTPServer
-import pytest
 import json
-from statsig_python_core import InternedStore, Statsig, StatsigOptions, StatsigUser
+import sys
+
+import pytest
+from pytest_httpserver import HTTPServer
+
 from mock_output_logger import MockOutputLoggerProvider
+from statsig_python_core import InternedStore, Statsig, StatsigOptions, StatsigUser
+from utils import get_test_data_resource, get_test_data_resource_bytes
 
 EVAL_PROJ_JSON = get_test_data_resource_bytes("eval_proj_dcs.json")
 DEMO_PROJ_PROTO = get_test_data_resource_bytes("demo_proj_dcs.pb.br")
@@ -57,6 +60,24 @@ def test_interned_store_mmap_preload(server_setup):
     fetch_complete = InternedStore.fetch_and_write_mmap(sdk_key, specs_url)
     assert fetch_complete.wait(5)
     InternedStore.preload_mmap(sdk_key)
+    memory = InternedStore.mmap_reader_memory_snapshot()
+    assert memory is not None
+    assert memory.format_version == 2
+    assert memory.mapped_bytes > 0
+    assert memory.loaded_generation_count == 1
+    if sys.platform == "linux":
+        assert memory.resident_bytes is not None
+        assert memory.proportional_set_bytes is not None
+        assert memory.private_dirty_bytes is not None
+        assert memory.deleted_mapped_bytes == 0
+        assert memory.vma_segment_count is not None
+        assert memory.vma_segment_count >= 1
+    else:
+        assert memory.resident_bytes is None
+        assert memory.proportional_set_bytes is None
+        assert memory.private_dirty_bytes is None
+        assert memory.deleted_mapped_bytes is None
+        assert memory.vma_segment_count is None
 
     log_provider = MockOutputLoggerProvider()
     log_provider.logs = []

{oai_statsig_python_core-0.27.0rc2 → oai_statsig_python_core-0.28.0}/statsig-rust/Cargo.toml

@@ -45,7 +45,7 @@ serde_json = { version = "1.0.143", features = [
 ] }
 serde_with = "3.4.0"
 sha2 = "0.10.8"
-oai-statsig-grpc = { path = "../statsig-grpc", version = "0.27.0-rc.2", optional = true }
+oai-statsig-grpc = { path = "../statsig-grpc", version = "0.28.0", optional = true }
 simple_logger = { version = "5.0.0" }
 tempfile = "3.8.1"
 tokio = { version = "1.39.1", features = ["full"] }

{oai_statsig_python_core-0.27.0rc2 → oai_statsig_python_core-0.28.0}/statsig-rust/src/__tests__/spec_store_tests.rs

@@ -361,6 +361,124 @@ async fn receive_proto_latency(
     .flatten()
 }
 
+async fn receive_spec_decode_tags(
+    receiver: &mut tokio::sync::broadcast::Receiver<OpsStatsEvent>,
+    timeout: Duration,
+) -> Option<HashMap<String, String>> {
+    tokio::time::timeout(timeout, async {
+        loop {
+            let OpsStatsEvent::Observability(event) = receiver.recv().await.ok()? else {
+                continue;
+            };
+            if event.metric_name == "interned_mmap.spec_decode.count" {
+                assert!(matches!(&event.metric_type, MetricType::Increment));
+                return event.tags;
+            }
+        }
+    })
+    .await
+    .ok()
+    .flatten()
+}
+
+#[tokio::test]
+#[serial]
+async fn test_spec_decode_metric_reports_owned_materialized_updates_only() {
+    let sdk_key = "secret-owned-metric-test";
+    let ops_stats = OPS_STATS.get_for_instance(sdk_key);
+    let mut receiver = ops_stats.subscribe_for_test();
+    let store = SpecStore::new(
+        sdk_key,
+        sdk_key.to_string(),
+        StatsigRuntime::get_runtime(),
+        Arc::new(SdkEventEmitter::default()),
+        None,
+    );
+
+    store
+        .set_values(SpecsUpdate {
+            data: ResponseData::from_bytes(
+                br#"{
+                    "experiment_to_layer": {},
+                    "condition_map": {},
+                    "dynamic_configs": {},
+                    "feature_gates": {
+                        "owned_metric_gate": {
+                            "type": "feature_gate",
+                            "salt": "owned-metric-salt",
+                            "defaultValue": false,
+                            "enabled": true,
+                            "rules": [],
+                            "idType": "userID",
+                            "entity": "feature_gate"
+                        }
+                    },
+                    "layer_configs": {},
+                    "has_updates": true,
+                    "time": 1
+                }"#
+                .to_vec(),
+            ),
+            source: SpecsSource::Network,
+            received_at: 2_000,
+            source_api: None,
+            has_updates: None,
+        })
+        .unwrap();
+
+    let tags = receive_spec_decode_tags(&mut receiver, Duration::from_millis(100))
+        .await
+        .expect("materialized update should emit spec decode telemetry");
+    assert_eq!(tags.get("source").map(String::as_str), Some("owned"));
+    assert_eq!(
+        tags.get("reason").map(String::as_str),
+        Some("spec_preload_unavailable")
+    );
+    assert_eq!(
+        tags.get("sdk_key").map(String::as_str),
+        Some("secret-owned-")
+    );
+
+    store
+        .set_values(SpecsUpdate {
+            data: ResponseData::from_bytes(
+                br#"{
+                    "experiment_to_layer": {},
+                    "condition_map": {},
+                    "dynamic_configs": {},
+                    "feature_gates": {},
+                    "layer_configs": {},
+                    "has_updates": true,
+                    "time": 2
+                }"#
+                .to_vec(),
+            ),
+            source: SpecsSource::Network,
+            received_at: 2_001,
+            source_api: None,
+            has_updates: None,
+        })
+        .unwrap();
+    assert_eq!(
+        receive_spec_decode_tags(&mut receiver, Duration::from_millis(100)).await,
+        None
+    );
+
+    store
+        .set_values(SpecsUpdate {
+            data: ResponseData::from_bytes(br#"{"has_updates":false}"#.to_vec()),
+            source: SpecsSource::Network,
+            received_at: 2_002,
+            source_api: None,
+            has_updates: Some(false),
+        })
+        .unwrap();
+    assert_eq!(
+        receive_spec_decode_tags(&mut receiver, Duration::from_millis(100)).await,
+        None
+    );
+}
+
 #[tokio::test]
 async fn test_spec_store_data_store_updates_forwarded_to_data_store() {
     let data_store = Arc::new(TestDataStore::new(true));
@@ -864,6 +982,7 @@ async fn test_proto_metrics_classify_processing_and_duplicates() {
         None,
     );
     apply_eval_project(&delta_store);
+    let mut spec_decode_receiver = ops_stats.subscribe_for_test();
     let before = delta_store.load_data();
     let deleted_name = before
         .snapshot
@@ -891,6 +1010,14 @@ async fn test_proto_metrics_classify_processing_and_duplicates() {
         "metric-api",
     )
     .unwrap();
+    let spec_decode_tags =
+        receive_spec_decode_tags(&mut spec_decode_receiver, Duration::from_secs(1))
+            .await
+            .expect("materialized delta should emit spec decode telemetry");
+    assert_eq!(
+        spec_decode_tags.get("source").map(String::as_str),
+        Some("owned")
+    );
     let materialized = delta_store.load_data();
     apply_delta(
         &delta_store,

{oai_statsig_python_core-0.27.0rc2 → oai_statsig_python_core-0.28.0}/statsig-rust/src/evaluation/dynamic_returnable.rs

@@ -113,8 +113,17 @@ impl DynamicReturnable {
     }
 
     pub(crate) fn get_stable_hash(&self) -> u64 {
-        self.stable_hash
-            .map_or_else(|| stable_hash(&self.value), NonZeroU64::get)
+        if let Some(hash) = self.stable_hash {
+            return hash.get();
+        }
+
+        if matches!(&self.value, DynamicReturnableValue::JsonArchived(_)) {
+            if let Some(hash) = InternedStore::get_mmap_returnable_stable_hash(self.hash) {
+                return hash;
+            }
+        }
+
+        stable_hash(&self.value)
     }
 
     pub(crate) fn from_interned_value(hash: u64, value: DynamicReturnableValue) -> Self {
@@ -137,7 +146,7 @@ impl DynamicReturnable {
     }
 
     #[cfg(test)]
-    pub(crate) fn has_precomputed_stable_hash(&self) -> bool {
+    pub(crate) fn has_inline_stable_hash(&self) -> bool {
         self.stable_hash.is_some()
     }
 }
@@ -158,12 +167,16 @@ fn stable_hash(value: &DynamicReturnableValue) -> u64 {
         DynamicReturnableValue::JsonStatic(value) => {
             stable_object_hash(value.iter().map(|(key, value)| (key.as_str(), value)))
         }
-        DynamicReturnableValue::JsonArchived(value) => {
-            stable_object_hash(value.iter().map(|(key, value)| (key.as_str(), value)))
-        }
+        DynamicReturnableValue::JsonArchived(value) => archived_returnable_stable_hash(value),
     }
 }
 
+pub(crate) fn archived_returnable_stable_hash(
+    value: &ArchivedHashMap<ArchivedString, ArchivedRkyvValue>,
+) -> u64 {
+    stable_object_hash(value.iter().map(|(key, value)| (key.as_str(), value)))
+}
+
 impl<'de> Deserialize<'de> for DynamicReturnable {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
     where

{oai_statsig_python_core-0.27.0rc2 → oai_statsig_python_core-0.28.0}/statsig-rust/src/gcir/dynamic_configs_processor.rs

@@ -146,7 +146,7 @@ pub(crate) fn get_dynamic_config_evaluations_with_plan(
     };
 
     for planned in &plan.cmab_configs {
-        if gcir_time!("cmab.filtering", {
+        let should_filter = gcir_time!("cmab.filtering", {
             let is_filtered_by_experiment = options
                 .experiment_filter
                 .as_ref()
@@ -162,7 +162,8 @@ pub(crate) fn get_dynamic_config_evaluations_with_plan(
                     &options.client_sdk_key,
                 )
             }
-        }) {
+        });
+        if should_filter {
             continue;
         }
 

{oai_statsig_python_core-0.27.0rc2 → oai_statsig_python_core-0.28.0}/statsig-rust/src/instance_registry.rs

@@ -26,8 +26,15 @@ impl InstanceRegistry {
         let id_tuple = (short_type_name, Uuid::new_v4());
         let id_hash = hash_one(id_tuple);
 
-        let mut registry = Self::get_write_lock()?;
-        registry.insert(id_hash, instance);
+        let replaced = {
+            let mut registry = Self::get_write_lock()?;
+            registry.insert(id_hash, instance)
+        };
+
+        // Registered instances may run arbitrary shutdown logic when dropped.
+        // Keep that work outside the global registry lock in the unlikely event
+        // of an ID collision.
+        drop(replaced);
 
         Some(id_hash)
     }
@@ -41,27 +48,29 @@ impl InstanceRegistry {
     }
 
     pub fn get<T: Send + Sync + 'static>(id: &u64) -> Option<Arc<T>> {
-        let registry = match REGISTRY.try_read_for(Duration::from_secs(5)) {
-            Some(guard) => guard,
-            None => {
-                log_e!(TAG, "Failed to acquire read lock: Failed to lock REGISTRY");
-                return None;
-            }
+        let instance = {
+            let registry = match REGISTRY.try_read_for(Duration::from_secs(5)) {
+                Some(guard) => guard,
+                None => {
+                    log_e!(TAG, "Failed to acquire read lock: Failed to lock REGISTRY");
+                    return None;
+                }
+            };
+
+            registry.get(id).cloned()
         };
 
-        registry
-            .get(id)
-            .and_then(|any_arc| match any_arc.clone().downcast::<T>() {
-                Ok(t) => Some(t),
-                Err(_) => {
-                    log_e!(
-                        TAG,
-                        "Failed to downcast instance with ref '{}' to generic type",
-                        id
-                    );
-                    None
-                }
-            })
+        instance.and_then(|any_arc| match any_arc.downcast::<T>() {
+            Ok(t) => Some(t),
+            Err(_) => {
+                log_e!(
+                    TAG,
+                    "Failed to downcast instance with ref '{}' to generic type",
+                    id
+                );
+                None
+            }
+        })
     }
 
     pub fn get_raw(id: &u64) -> Option<Arc<dyn Any + Send + Sync>> {
@@ -77,19 +86,29 @@ impl InstanceRegistry {
     }
 
     pub fn remove(id: &u64) {
-        let mut registry = match Self::get_write_lock() {
-            Some(registry) => registry,
-            None => return,
+        let removed = {
+            let mut registry = match Self::get_write_lock() {
+                Some(registry) => registry,
+                None => return,
+            };
+            registry.remove(id)
         };
-        registry.remove(id);
+
+        // Instance destructors can run shutdown hooks and callbacks.
+        drop(removed);
     }
 
     pub fn remove_all() {
-        let mut registry = match Self::get_write_lock() {
-            Some(registry) => registry,
-            None => return,
+        let removed = {
+            let mut registry = match Self::get_write_lock() {
+                Some(registry) => registry,
+                None => return,
+            };
+            std::mem::take(&mut *registry)
         };
-        registry.clear();
+
+        // Drop all instances after the registry is available to other callers.
+        drop(removed);
     }
 
     fn get_write_lock() -> Option<RwLockWriteGuard<'static, AHashMap<u64, AnyInstance>>> {