govuk_app_config 2.2.1 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11f06b82c25ddd23f985b025b26abdcce2a1c4ab772cdbf129907962d8297da8
-  data.tar.gz: aa6e55ea958fd54cf9eb833762cbf3dfc24d310af1e3bf6dd8a010f3ad4d9bc9
+  metadata.gz: dbd89ce53c62443a1bf91f7c782fc121a493323b8f55f77db131e9fab17bc78b
+  data.tar.gz: cc5435d8e5a2769c688afa0f37869ec96bc58311b2c7e5051e0dbe226496f50c
 SHA512:
-  metadata.gz: c5f01c3eb3f450616bc04577f788a36a4907d690d5694f9e813c89c985b370ad2b94abc53653a3a98885fed96799d7f34085e2e478d545ee15ac9421e846800d
-  data.tar.gz: cbe282314f027a01ed6fd1aae0e490b67b0fcb8425dc802dc7311bab8d97dea60f531b30302879fbe4a11d01f95bd61edda203dda1539c01831ec089d71db278
+  metadata.gz: 8c9a936938fdb3795e3edd0fdf9f43a368a5130f034d30150bdd4201c5490a47b015b492a1275d8dba4668ec9e44b32b4a8692fa4cddf7bb59eee9242f468e23
+  data.tar.gz: ad4e17d9b55e828c4542517a427ba6f35152583fe536f87801a7d2567cff00a0bc6d036103cc29186fab381b61b904b1a7eaa63c0a088a0b55c2735371ea39e1

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+# 2.5.0
+
+* Use delegator pattern for `GovukError.configure`, to allow custom `should_capture` (https://github.com/alphagov/govuk_app_config/pull/160)
+
+# 2.4.1
+
+* Bump 'sentry-raven' to 3.1.1 to improve grouping of errors (https://github.com/alphagov/govuk_app_config/pull/162)
+
+# 2.4.0
+
+* Add new GovukHealthcheck::Mongoid and GovukHealthcheck::RailsCache health checks (https://github.com/alphagov/govuk_app_config/pull/161)
+
+# 2.3.0
+
+* Remove unused SidekiqQueueSizeCheck healthcheck base class (https://github.com/alphagov/govuk_app_config/pull/156)
+
+# 2.2.2
+
+* Add www.googletagmanager.com and www.gstatic.com to Content Security Policy (https://github.com/alphagov/govuk_app_config/pull/153)
+
 # 2.2.1
 
 * Fix linting issues (https://github.com/alphagov/govuk_app_config/pull/149)
@@ -250,7 +270,7 @@
 * Add Unicorn (our web server) as a dependency
 * Use version [2.7.0 of the Sentry client][sentry-270].
 * Set up logging configuration for Rails applications.
-* Don't send `ActionController::BadRequest`
 to Sentry
+* Don't send `ActionController::BadRequest`
  to Sentry
 
 [sentry-270]: https://github.com/getsentry/raven-ruby/commit/ef623824cb0a8a2f60be5fb7e12f80454da54fd7
 

data/README.md

@@ -89,6 +89,27 @@ GovukError.configure do |config|
 end
 ```
 
+And you can exclude errors from being reported if they occur during the nightly data sync (on integration and staging):
+
+```ruby
+GovukError.configure do |config|
+  config.data_sync_excluded_exceptions << "PG::Error"
+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
+`should_capture` callback returns `true`.
+
+```ruby
+GovukError.configure do |config|
+  config.should_capture = lambda do |error_or_event|
+    error_or_event == "do capture"
+  end
+end
+```
+
 `GovukError.configure` has the same options as the Sentry client, Raven. See [the Raven docs for all configuration options](https://docs.sentry.io/clients/ruby/config).
 
 ## Statsd

data/docs/healthchecks.md

@@ -73,6 +73,15 @@ if it must be subclassed to work, but a concrete class which works on its own
 doesn't need that suffix. You should aim to follow this convention in your own
 apps, ideally putting custom health checks into a `Healthcheck` module.
 
+### `RailsCache`
+
+This checks that the Rails cache store, such as Memcached, is acessible by
+writing and reading back a cache entry called "healthcheck-cache".
+
+### `Mongoid`
+
+This checks that the app has a connection to its Mongo database via Mongoid.
+
 ### `SidekiqRedis`
 
 This checks that the app has a connection to Redis via Sidekiq.
@@ -128,24 +137,6 @@ class MySidekiqQueueLatencyCheck < GovukHealthcheck::SidekiqQueueLatencyCheck
 end
 ```
 
-### `SidekiqQueueSizeCheck`
-
-This class is the basis for a check which compares the Sidekiq queue sizes
-with warning or critical thresholds.
-
-```ruby
-class MySidekiqQueueSizeCheck < GovukHealthcheck::SidekiqQueueSizeCheck
-  def warning_threshold(queue:)
-    # the warning threshold for a particular queue
-  end
-
-  def critical_threshold(queue:)
-    # the critical threshold for a particular queue
-  end
-end
-```
-
-
 ### `SidekiqRetrySizeCheck`
 
 Similar to `SidekiqQueueSizeCheck`, this class is the basis for a check which

data/govuk_app_config.gemspec

@@ -21,11 +21,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = %w[lib]
 
   spec.add_dependency "logstasher", ">= 1.2.2", "< 1.4.0"
-  spec.add_dependency "sentry-raven", ">= 2.7.1", "< 3.1.0"
+  spec.add_dependency "sentry-raven", "~> 3.1.1"
   spec.add_dependency "statsd-ruby", "~> 1.4.0"
-  spec.add_dependency "unicorn", ">= 5.4", "< 5.6"
+  spec.add_dependency "unicorn", ">= 5.4", "< 5.8"
 
-  spec.add_development_dependency "bundler", "~> 1.15"
+  spec.add_development_dependency "byebug"
   spec.add_development_dependency "climate_control"
   spec.add_development_dependency "rack-test", "~> 1.1.0"
   spec.add_development_dependency "rails", "~> 6"

data/lib/govuk_app_config.rb

@@ -1,11 +1,11 @@
 require "govuk_app_config/version"
 require "govuk_app_config/govuk_statsd"
 require "govuk_app_config/govuk_error"
+require "govuk_app_config/govuk_error/configure"
 require "govuk_app_config/govuk_healthcheck"
 # This require is deprecated and should be removed on next major version bump
 # and should be required by applications directly.
 require "govuk_app_config/govuk_unicorn"
-require "govuk_app_config/configure"
 
 if defined?(Rails)
   require "govuk_app_config/govuk_logging"

data/lib/govuk_app_config/govuk_content_security_policy.rb

@@ -17,7 +17,10 @@ module GovukContentSecurityPolicy
 
   GOOGLE_ANALYTICS_DOMAINS = %w[www.google-analytics.com
                                 ssl.google-analytics.com
-                                stats.g.doubleclick.net].freeze
+                                stats.g.doubleclick.net
+                                www.googletagmanager.com].freeze
+
+  GOOGLE_STATIC_DOMAINS = %w[www.gstatic.com].freeze
 
   def self.build_policy(policy)
     # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/default-src
@@ -35,6 +38,7 @@ module GovukContentSecurityPolicy
     policy.script_src :self,
                       *GOVUK_DOMAINS,
                       *GOOGLE_ANALYTICS_DOMAINS,
+                      *GOOGLE_STATIC_DOMAINS,
                       # Allow JSONP call to Verify to check whether the user is logged in
                       "www.signin.service.gov.uk",
                       # Allow YouTube Embeds (Govspeak turns YouTube links into embeds)
@@ -51,6 +55,7 @@ module GovukContentSecurityPolicy
     # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/style-src
     policy.style_src :self,
                      *GOVUK_DOMAINS,
+                     *GOOGLE_STATIC_DOMAINS,
                      # We use the `style=""` attribute on some HTML elements
                      :unsafe_inline
 

data/lib/govuk_app_config/govuk_error.rb

@@ -1,5 +1,6 @@
 require "sentry-raven"
 require "govuk_app_config/govuk_statsd"
+require "govuk_app_config/govuk_error/configuration"
 
 module GovukError
   def self.notify(exception_or_message, args = {})
@@ -12,8 +13,7 @@ module GovukError
   end
 
   def self.configure
-    Raven.configure do |config|
-      yield(config)
-    end
+    @configuration ||= Configuration.new(Raven.configuration)
+    yield @configuration
   end
 end

data/lib/govuk_app_config/govuk_error/configuration.rb

@@ -0,0 +1,36 @@
+require "govuk_app_config/govuk_error/govuk_data_sync"
+
+module GovukError
+  class Configuration < SimpleDelegator
+    attr_reader :data_sync
+    attr_accessor :data_sync_excluded_exceptions
+
+    def initialize(_raven_configuration)
+      super
+      @data_sync = GovukDataSync.new(ENV["GOVUK_DATA_SYNC_PERIOD"])
+      self.data_sync_excluded_exceptions = []
+      self.should_capture = ignore_excluded_exceptions_in_data_sync
+    end
+
+    def should_capture=(closure)
+      combined = lambda do |error_or_event|
+        (ignore_excluded_exceptions_in_data_sync.call(error_or_event) && closure.call(error_or_event))
+      end
+
+      super(combined)
+    end
+
+  protected
+
+    def ignore_excluded_exceptions_in_data_sync
+      lambda { |error_or_event|
+        data_sync_ignored_error = data_sync_excluded_exceptions.any? do |exception_to_ignore|
+          exception_chain = Raven::Utils::ExceptionCauseChain.exception_to_array(error_or_event)
+          exception_chain.any? { |exception| exception.class.to_s == exception_to_ignore }
+        end
+
+        !(data_sync.in_progress? && data_sync_ignored_error)
+      }
+    end
+  end
+end

data/lib/govuk_app_config/{configure.rb → govuk_error/configure.rb}

@@ -43,6 +43,15 @@ GovukError.configure do |config|
   # Rails will raise a ActionView::Template::Error, instead of the original error.
   config.inspect_exception_causes_for_exclusion = true
 
+  # List of exceptions to ignore if they take place during the data sync.
+  # Some errors are transient in nature, e.g. PostgreSQL databases being
+  # unavailable, and add little value. In fact, their presence can greatly
+  # increase the number of errors being sent and risk genuine errors being
+  # rate-limited by Sentry.
+  config.data_sync_excluded_exceptions = [
+    "PG::Error",
+  ]
+
   config.transport_failure_callback = proc {
     GovukStatsd.increment("error_reports_failed")
   }

data/lib/govuk_app_config/govuk_error/govuk_data_sync.rb

@@ -0,0 +1,50 @@
+require "time"
+
+module GovukError
+  class GovukDataSync
+    class MalformedDataSyncPeriod < RuntimeError
+      attr_reader :invalid_value
+
+      def initialize(invalid_value)
+        @invalid_value = invalid_value
+      end
+
+      def message
+        "\"#{invalid_value}\" is not a valid value (should be of form '22:00-03:00')."
+      end
+    end
+
+    attr_reader :from, :to
+
+    def initialize(govuk_data_sync_period)
+      return if govuk_data_sync_period.nil?
+
+      parts = govuk_data_sync_period.split("-")
+      raise MalformedDataSyncPeriod, govuk_data_sync_period unless parts.count == 2
+
+      @from, @to = parts.map { |time| Time.parse(time) }
+    rescue ArgumentError
+      raise MalformedDataSyncPeriod, govuk_data_sync_period
+    end
+
+    def in_progress?
+      from.present? && to.present? && in_time_range?(from, to)
+    end
+
+  private
+
+    # `from`/`to` times are in relation to the local server time, which is expected to be in UTC as per:
+    # https://github.com/alphagov/govuk-puppet/blob/b588e4ade996e97b8975e69cb00800521fff4a48/modules/govuk_envsys/files/etc/environment#L3
+    def in_time_range?(from, to)
+      hour_is_in_range = Time.now.hour >= from.hour || Time.now.hour <= to.hour
+      minute_is_in_range = if Time.now.hour == from.hour
+                             Time.now.min >= from.min
+                           elsif Time.now.hour == to.hour
+                             Time.now.min <= to.min
+                           else
+                             true
+                           end
+      hour_is_in_range && minute_is_in_range
+    end
+  end
+end

data/lib/govuk_app_config/govuk_healthcheck.rb

@@ -1,10 +1,11 @@
 require "govuk_app_config/govuk_healthcheck/checkup"
 require "govuk_app_config/govuk_healthcheck/active_record"
+require "govuk_app_config/govuk_healthcheck/mongoid"
+require "govuk_app_config/govuk_healthcheck/rails_cache"
 require "govuk_app_config/govuk_healthcheck/sidekiq_redis"
 require "govuk_app_config/govuk_healthcheck/threshold_check"
 require "govuk_app_config/govuk_healthcheck/sidekiq_queue_check"
 require "govuk_app_config/govuk_healthcheck/sidekiq_queue_latency_check"
-require "govuk_app_config/govuk_healthcheck/sidekiq_queue_size_check"
 require "govuk_app_config/govuk_healthcheck/sidekiq_retry_size_check"
 require "json"
 

data/lib/govuk_app_config/govuk_healthcheck/mongoid.rb

@@ -0,0 +1,14 @@
+module GovukHealthcheck
+  class Mongoid
+    def name
+      :database_connectivity
+    end
+
+    def status
+      ::Mongoid.default_client.database_names.any?
+      GovukHealthcheck::OK
+    rescue StandardError
+      GovukHealthcheck::CRITICAL
+    end
+  end
+end

data/lib/govuk_app_config/govuk_healthcheck/rails_cache.rb

@@ -0,0 +1,16 @@
+module GovukHealthcheck
+  class RailsCache
+    def name
+      :rails_cache
+    end
+
+    def status
+      ::Rails.cache.write("healthcheck-cache", true)
+      raise unless ::Rails.cache.read("healthcheck-cache")
+
+      GovukHealthcheck::OK
+    rescue StandardError
+      GovukHealthcheck::CRITICAL
+    end
+  end
+end

data/lib/govuk_app_config/rails_ext/action_dispatch/debug_exceptions.rb

@@ -27,7 +27,7 @@ module GovukLogging
 
       def self.monkey_patch_log_error(clazz = ::ActionDispatch::DebugExceptions)
         clazz.class_eval do
-        private
+          private
 
           def log_error(request, wrapper)
             logger = logger(request)

data/lib/govuk_app_config/version.rb

@@ -1,3 +1,3 @@
 module GovukAppConfig
-  VERSION = "2.2.1".freeze
+  VERSION = "2.5.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_app_config
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.5.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-20 00:00:00.000000000 Z
+date: 2020-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstasher
@@ -34,22 +34,16 @@ dependencies:
   name: sentry-raven
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.7.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.7.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.1.1
 - !ruby/object:Gem::Dependency
   name: statsd-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -73,7 +67,7 @@ dependencies:
         version: '5.4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.6'
+        version: '5.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -83,21 +77,21 @@ dependencies:
         version: '5.4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.6'
+        version: '5.8'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: climate_control
   requirement: !ruby/object:Gem::Requirement
@@ -232,15 +226,18 @@ files:
 - docs/healthchecks.md
 - govuk_app_config.gemspec
 - lib/govuk_app_config.rb
-- lib/govuk_app_config/configure.rb
 - lib/govuk_app_config/govuk_content_security_policy.rb
 - lib/govuk_app_config/govuk_error.rb
+- lib/govuk_app_config/govuk_error/configuration.rb
+- lib/govuk_app_config/govuk_error/configure.rb
+- lib/govuk_app_config/govuk_error/govuk_data_sync.rb
 - lib/govuk_app_config/govuk_healthcheck.rb
 - lib/govuk_app_config/govuk_healthcheck/active_record.rb
 - lib/govuk_app_config/govuk_healthcheck/checkup.rb
+- lib/govuk_app_config/govuk_healthcheck/mongoid.rb
+- lib/govuk_app_config/govuk_healthcheck/rails_cache.rb
 - lib/govuk_app_config/govuk_healthcheck/sidekiq_queue_check.rb
 - lib/govuk_app_config/govuk_healthcheck/sidekiq_queue_latency_check.rb
-- lib/govuk_app_config/govuk_healthcheck/sidekiq_queue_size_check.rb
 - lib/govuk_app_config/govuk_healthcheck/sidekiq_redis.rb
 - lib/govuk_app_config/govuk_healthcheck/sidekiq_retry_size_check.rb
 - lib/govuk_app_config/govuk_healthcheck/threshold_check.rb
@@ -269,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Base configuration for GOV.UK applications

data/lib/govuk_app_config/govuk_healthcheck/sidekiq_queue_size_check.rb

@@ -1,11 +0,0 @@
-module GovukHealthcheck
-  class SidekiqQueueSizeCheck < SidekiqQueueCheck
-    def name
-      :sidekiq_queue_size
-    end
-
-    def queues
-      @queues ||= Sidekiq::Stats.new.queues
-    end
-  end
-end