govuk_app_config 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b8b7a21f65eaad2497889dc826180443c5aae98bde55db7922cb85a6953b43f
-  data.tar.gz: 7fc22880f83e1dc5ceca2eab8f53d4842b39fd5c42431d9c53bdf985f08d1c9c
+  metadata.gz: 4ef48ff1d4edbc117dba4f4d8b09b862dacdc5faa06f879c9094e695d29025df
+  data.tar.gz: e6465d32e6522637f3a7cdd5681c3286bf3f1fd96657099e3e28ce0e716468fa
 SHA512:
-  metadata.gz: bf269f9b44cfa14887ac6c465cd76ac8f799a6c5c96e08d3728da3b48bece7093ffba68080fba509590e931bc1efdbcbcaf33e5fb5ab4055047c1e6a9c0fb9c2
-  data.tar.gz: 134e5c912a8fab095fafc1be65cdaa0b84f2aa45a04bcd1c5aa776df8b4743e25c8c9891b9c6115028a5dc047b48d15a229be62cf57850866b5b6c4e4f6df316
+  metadata.gz: dd241443a0a59323c2210c67fb04268bd7a662cff61c7eef3580bcde200efd6d38d7efa2bfb22b7642761fd1f929f2e8a4259fe12af8692338f69ce024a9cd15
+  data.tar.gz: 8470470f8cf108e25155b6eca6c64f82a9f79b601c22889399bfe71ce87cc39bb3e80a6efda7d30432121766721143329cc5271c591dc75ec36e495687d06a65

data/.ruby-version

@@ -1 +1 @@
-2.7.2
+2.6.5

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 3.3.0
+
+- Revert the `should_capture`/`before_send` consolidation introduced in 3.1.0. This fixes the `data_sync_excluded_exceptions` behaviour that has been broken since v3.1.0. ([#211](https://github.com/alphagov/govuk_app_config/pull/211))
+
 # 3.2.0
 
 -  Add Speedcurve's LUX to connect-src policy ([#206](https://github.com/alphagov/govuk_app_config/pull/206))

data/README.md

@@ -112,12 +112,12 @@ end
 Finally, you can pass your own callback to evaluate whether or not to capture the exception.
 Note that if an exception is on the `excluded_exceptions` list, or on the `data_sync_excluded_exceptions`
 and occurs at the time of a data sync, then it will be excluded even if the custom
-`before_send` callback doesn't return `nil`.
+`should_capture` callback returns `true`.
 
 ```ruby
 GovukError.configure do |config|
-  config.before_send = lambda do |error_or_event|
-    error_or_event == "do capture" ? error_or_event : nil
+  config.should_capture = lambda do |error_or_event|
+    error_or_event == "do capture"
   end
 end
 ```

data/lib/govuk_app_config/govuk_error/configuration.rb

@@ -12,26 +12,32 @@ module GovukError
       @data_sync = GovukDataSync.new(ENV["GOVUK_DATA_SYNC_PERIOD"])
       self.active_sentry_environments = []
       self.data_sync_excluded_exceptions = []
-      @before_send_callbacks = [
-        ignore_exceptions_if_not_in_active_sentry_env,
-        ignore_excluded_exceptions_in_data_sync,
-        increment_govuk_statsd_counters,
-      ]
+      self.should_capture = ignore_exceptions_based_on_env_and_data_sync
     end
 
-    def before_send=(closure)
-      @before_send_callbacks.insert(-2, closure)
-      super(run_before_send_callbacks)
+    def should_capture=(closure)
+      combined = lambda do |error_or_event|
+        (ignore_exceptions_based_on_env_and_data_sync.call(error_or_event) && closure.call(error_or_event))
+      end
+
+      super(combined)
     end
 
   protected
 
+    def ignore_exceptions_based_on_env_and_data_sync
+      lambda do |error_or_event|
+        ignore_exceptions_if_not_in_active_sentry_env.call(error_or_event) &&
+          ignore_excluded_exceptions_in_data_sync.call(error_or_event)
+      end
+    end
+
     def ignore_exceptions_if_not_in_active_sentry_env
-      ->(error_or_event, _hint) { error_or_event if active_sentry_environments.include?(sentry_environment) }
+      ->(_error_or_event) { active_sentry_environments.include?(sentry_environment) }
     end
 
     def ignore_excluded_exceptions_in_data_sync
-      lambda { |error_or_event, _hint|
+      lambda { |error_or_event|
         data_sync_ignored_error = data_sync_excluded_exceptions.any? do |exception_to_ignore|
           exception_to_ignore = Object.const_get(exception_to_ignore) unless exception_to_ignore.is_a?(Module)
           exception_chain = Raven::Utils::ExceptionCauseChain.exception_to_array(error_or_event)
@@ -42,27 +48,8 @@ module GovukError
           false
         end
 
-        error_or_event unless data_sync.in_progress? && data_sync_ignored_error
-      }
-    end
-
-    def increment_govuk_statsd_counters
-      lambda { |error_or_event, _hint|
-        GovukStatsd.increment("errors_occurred")
-        GovukStatsd.increment("error_types.#{error_or_event.class.name.demodulize.underscore}")
-        error_or_event
+        !(data_sync.in_progress? && data_sync_ignored_error)
       }
     end
-
-    def run_before_send_callbacks
-      lambda do |error_or_event, hint|
-        result = error_or_event
-        @before_send_callbacks.each do |callback|
-          result = callback.call(error_or_event, hint)
-          break if result.nil?
-        end
-        result
-      end
-    end
   end
 end

data/lib/govuk_app_config/govuk_error/configure.rb

@@ -1,4 +1,10 @@
 GovukError.configure do |config|
+  config.before_send = proc { |e|
+    GovukStatsd.increment("errors_occurred")
+    GovukStatsd.increment("error_types.#{e.class.name.demodulize.underscore}")
+    e
+  }
+
   config.silence_ready = !Rails.env.production? if defined?(Rails)
 
   # These are the environments (described by the `SENTRY_CURRENT_ENV`
@@ -58,10 +64,6 @@ GovukError.configure do |config|
     "GdsApi::ContentStore::ItemNotFound",
   ]
 
-  config.before_send = lambda { |error_or_event, _hint|
-    error_or_event
-  }
-
   config.transport_failure_callback = proc {
     GovukStatsd.increment("error_reports_failed")
   }

data/lib/govuk_app_config/version.rb

@@ -1,3 +1,3 @@
 module GovukAppConfig
-  VERSION = "3.2.0".freeze
+  VERSION = "3.3.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_app_config
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-16 00:00:00.000000000 Z
+date: 2021-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstasher
@@ -265,7 +265,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: Base configuration for GOV.UK applications