fix(client): Merge default contexts without scope (#47)

Author: jan-auer

Cargo.toml

@@ -33,16 +33,16 @@ backtrace = { version = "0.3.8", optional = true }
 url = { version = "1.7.0", optional = true }
 failure = { version = "0.1.1", optional = true }
 log = { version = "0.4.1", optional = true }
-serde = "1.0.64"
+serde = "1.0.66"
 serde_json = "1.0.19"
-sentry-types = "0.5.2"
+sentry-types = "0.5.3"
 reqwest = { version = "0.8.6", optional = true }
 uuid = { version = "0.6.5", features = ["v4"] }
 lazy_static = "1.0.1"
 regex = { version = "1.0.0", optional = true }
 error-chain = { version = "0.11.0", optional = true }
 im = { version = "10.2.0", optional = true }
-libc = { version = "0.2.41", optional = true }
+libc = { version = "0.2.42", optional = true }
 hostname = { version = "0.1.5", optional = true }
 findshlibs = { version = "0.4.0", optional = true }
 

src/client/real.rs

@@ -11,6 +11,7 @@ use uuid::Uuid;
 use api::Dsn;
 use backtrace_support::{function_starts_with, is_sys_function};
 use constants::{SDK_INFO, USER_AGENT};
+use protocol::map::Entry;
 use protocol::{Context, DebugMeta, Event};
 use scope::{bind_client, Scope};
 use transport::Transport;
@@ -283,6 +284,10 @@ impl Client {
             };
         }
 
+        let mut add_os = true;
+        let mut add_rust = true;
+        let mut add_device = true;
+
         if let Some(scope) = scope {
             if !scope.breadcrumbs.is_empty() {
                 event
@@ -311,10 +316,6 @@ impl Client {
                     .extend(scope.tags.iter().map(|(k, v)| ((*k).clone(), (*v).clone())));
             }
 
-            let mut add_os = true;
-            let mut add_rust = true;
-            let mut add_device = true;
-
             for (key, value) in scope.contexts.iter() {
                 match *value {
                     None => match key.as_str() {
@@ -332,33 +333,6 @@ impl Client {
                 }
             }
 
-            if add_os {
-                if let Some(ref os) = CONTEXT_DEFAULTS.os {
-                    event
-                        .contexts
-                        .entry("os".to_string())
-                        .or_insert_with(|| os.clone());
-                }
-            }
-
-            if add_rust {
-                if let Some(ref rust) = CONTEXT_DEFAULTS.rust {
-                    event
-                        .contexts
-                        .entry("rust".to_string())
-                        .or_insert_with(|| rust.clone());
-                }
-            }
-
-            if add_device {
-                if let Some(ref device) = CONTEXT_DEFAULTS.device {
-                    event
-                        .contexts
-                        .entry("device".to_string())
-                        .or_insert_with(|| device.clone());
-                }
-            }
-
             if event.transaction.is_none() {
                 if let Some(ref txn) = scope.transaction {
                     event.transaction = Some((**txn).clone());
@@ -375,6 +349,30 @@ impl Client {
             }
         }
 
+        if add_os {
+            if let Entry::Vacant(entry) = event.contexts.entry("os".to_string()) {
+                if let Some(ref os) = CONTEXT_DEFAULTS.os {
+                    entry.insert(os.clone());
+                }
+            }
+        }
+
+        if add_rust {
+            if let Entry::Vacant(entry) = event.contexts.entry("rust".to_string()) {
+                if let Some(ref rust) = CONTEXT_DEFAULTS.rust {
+                    entry.insert(rust.clone());
+                }
+            }
+        }
+
+        if add_device {
+            if let Entry::Vacant(entry) = event.contexts.entry("device".to_string()) {
+                if let Some(ref device) = CONTEXT_DEFAULTS.device {
+                    entry.insert(device.clone());
+                }
+            }
+        }
+
         if event.release.is_none() {
             event.release = self.options.release.clone();
         }