Merge pull request #247 from mozilla/train-125

Uplift Train 125 to master

CHANGELOG.md

@@ -1,3 +1,13 @@
+<a name="v1.125.2"></a>
+## v1.125.2 (2018-11-20)
+
+
+#### Bug Fixes
+
+* **sentry:** stop passing 4xx errors to Sentry ([3fed1052](3fed1052))
+
+
+
 <a name="v1.125.1"></a>
 ## v1.125.1 (2018-11-15)
 

Cargo.lock

@@ -598,7 +598,7 @@ dependencies = [
 
 [[package]]
 name = "fxa_email_service"
-version = "1.125.1"
+version = "1.125.2"
 dependencies = [
  "base64 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fxa_email_service"
-version = "1.125.1"
+version = "1.125.2"
 publish = false
 
 [[bin]]

src/types/error/mod.rs

@@ -87,10 +87,16 @@ impl Fail for AppError {
 
 impl From<AppErrorKind> for AppError {
     fn from(kind: AppErrorKind) -> AppError {
+        let capture_in_sentry = kind.http_status() == Status::InternalServerError;
+
         let error = AppError {
             inner: Context::new(kind).into(),
         };
-        sentry::integrations::failure::capture_fail(&error);
+
+        if capture_in_sentry {
+            sentry::integrations::failure::capture_fail(&error);
+        }
+
         error
     }
 }