feat: Added support for unbinding clients

Author: mitsuhiko

src/api.rs

@@ -13,7 +13,8 @@ pub use sentry_types::protocol::v7::{Level, User};
 pub use client::Client;
 #[cfg(feature = "with_client_implementation")]
 pub use client::{init, ClientInitGuard, ClientOptions, IntoClientConfig};
-pub use scope::{bind_client, current_client, push_scope, with_client_and_scope, Scope, ScopeGuard};
+pub use scope::{bind_client, current_client, push_scope, unbind_client, with_client_and_scope,
+                Scope, ScopeGuard};
 
 /// Captures an event on the currently active client if any.
 ///

src/scope/noop.rs

@@ -62,6 +62,11 @@ pub fn bind_client(client: Arc<Client>) {
     shim_unreachable!();
 }
 
+/// Unbinds a client.
+///
+/// In the shim only mode this function doesn't do anything.
+pub fn unbind_client() {}
+
 impl Scope {
     pub fn clear(&mut self) {
         shim_unreachable!();

src/scope/real.rs

@@ -131,9 +131,9 @@ impl Stack {
         self.layers.pop().unwrap();
     }
 
-    pub fn bind_client(&mut self, client: Arc<Client>) {
+    pub fn bind_client(&mut self, client: Option<Arc<Client>>) {
         let depth = self.layers.len() - 1;
-        self.layers[depth].client = Some(client);
+        self.layers[depth].client = client;
     }
 
     pub fn client(&self) -> Option<Arc<Client>> {
@@ -304,7 +304,16 @@ pub fn current_client() -> Option<Arc<Client>> {
 /// process.
 pub fn bind_client(client: Arc<Client>) {
     with_client_impl! {{
-        with_stack_mut(|stack| stack.bind_client(client));
+        with_stack_mut(|stack| stack.bind_client(Some(client)));
+    }}
+}
+
+/// Unbinds the client on the current scope.
+///
+/// This effectively prevents data collection and reporting on the current scope.
+pub fn unbind_client() {
+    with_client_impl! {{
+        with_stack_mut(|stack| stack.bind_client(None));
     }}
 }