fix: Correctly apply environment from env (#293)

Author: Swatinem

CHANGELOG.md

@@ -6,6 +6,10 @@
 
 - The deprecated `error-chain` and `failure` integrations, features and crates were removed.
 
+**Fixes**:
+
+- Fix regression defaulting `ClientOptions::environment` from `SENTRY_ENVIRONMENT`.
+
 ## 0.21.0
 
 **Breaking Changes**:

sentry-core/src/clientoptions.rs

@@ -173,16 +173,11 @@ impl fmt::Debug for ClientOptions {
 
 impl Default for ClientOptions {
     fn default() -> ClientOptions {
-        let env = if cfg!(debug_assertions) {
-            "development"
-        } else {
-            "production"
-        };
         ClientOptions {
             dsn: None,
             debug: false,
             release: None,
-            environment: Some(env.into()),
+            environment: None,
             sample_rate: 1.0,
             max_breadcrumbs: 100,
             attach_stacktrace: false,

sentry/src/defaults.rs

@@ -95,9 +95,9 @@ pub fn apply_defaults(mut opts: ClientOptions) -> ClientOptions {
             .map(Cow::Owned)
             .or_else(|| {
                 Some(Cow::Borrowed(if cfg!(debug_assertions) {
-                    "debug"
+                    "development"
                 } else {
-                    "release"
+                    "production"
                 }))
             });
     }
@@ -116,3 +116,26 @@ pub fn apply_defaults(mut opts: ClientOptions) -> ClientOptions {
     }
     opts
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_default_environment() {
+        let opts = ClientOptions {
+            environment: Some("explicit-env".into()),
+            ..Default::default()
+        };
+        let opts = apply_defaults(opts);
+        assert_eq!(opts.environment.unwrap(), "explicit-env");
+
+        let opts = apply_defaults(Default::default());
+        // I doubt anyone runs test code without debug assertions
+        assert_eq!(opts.environment.unwrap(), "development");
+
+        env::set_var("SENTRY_ENVIRONMENT", "env-from-env");
+        let opts = apply_defaults(Default::default());
+        assert_eq!(opts.environment.unwrap(), "env-from-env");
+    }
+}