govuk_app_config 1.20.1 → 1.20.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf2918a76fa58fab8da3747d27c1dae9eb70672271abc5b84d528d8332ab8387
-  data.tar.gz: 6937852b992e536cdb189d4699ef35613468725473af032c7a2cb78cdbf79117
+  metadata.gz: 3b1731a99ecfb353b1a6966e1130a9672063bf88860ddba6e138eb293a26bd5f
+  data.tar.gz: a1e6eac2ed3cae975f2d70e4a6cf8f4fa57bc68c30c706d7bf59bb83afaab9eb
 SHA512:
-  metadata.gz: 76e8b83d03de29fb4ccebe901de6511a6f0ee2f26b5cae8a204f481f87dbe2e48b80a47b4c60fdcfd29fc4e16db9182473153e94b8c16d739e1e8566b7e36a18
-  data.tar.gz: 579b472a4dc10de84653114c313448111f1edfdf6bb2291630c81fbd49439bd0222e05607876b6c822522d9de56e8a2b3ef57978ed8b8927bf2765670fecb9d2
+  metadata.gz: 899cc76ce800f97d336c17d773a11f30fdb81f07d40089c4196ce5e679947445a3d2460ca271eeaa21c3c598f0ac1602ee53bc6b803395aa4f3d264c000026d3
+  data.tar.gz: bb9a67f24fec523f852df233304ae6d77c91176c85f25c595598ff7b7a39193c652172682d8cb7fefd868affd89f93a2f4b8423f1f64b1dfc267cf7454d34e72

data/.ruby-version

@@ -1 +1 @@
-2.4.2
+2.6.3

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.20.2
+
+* Fix GdsApi::HTTPIntermittentServer errors no longer being filtered from
+  exceptions sent to Sentry.
+
 # 1.20.1
 
 * Fix regression in error reporting code which caused an error.

data/govuk_app_config.gemspec

@@ -1,5 +1,6 @@
 # coding: utf-8
-lib = File.expand_path("../lib", __FILE__)
+
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "govuk_app_config/version"
 
@@ -9,8 +10,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["GOV.UK Dev"]
   spec.email         = ["govuk-dev@digital.cabinet-office.gov.uk"]
 
-  spec.summary       = %q{Base configuration for GOV.UK applications}
-  spec.description   = %q{Base configuration for GOV.UK applications}
+  spec.summary       = "Base configuration for GOV.UK applications"
+  spec.description   = "Base configuration for GOV.UK applications"
   spec.homepage      = "https://github.com/alphagov/govuk_app_config"
   spec.license       = "MIT"
 
@@ -19,20 +20,19 @@ Gem::Specification.new do |spec|
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = %w[lib]
 
   spec.add_dependency "aws-xray-sdk", "~> 0.10.0"
-  spec.add_dependency "statsd-ruby", "~> 1.4.0"
   spec.add_dependency "logstasher", ">= 1.2.2", "< 1.4.0"
-  spec.add_dependency "sentry-raven", ">= 2.7.1", "< 2.10.0"
+  spec.add_dependency "sentry-raven", ">= 2.7.1", "< 2.12.0"
+  spec.add_dependency "statsd-ruby", "~> 1.4.0"
   spec.add_dependency "unicorn", ">= 5.4", "< 5.6"
 
   spec.add_development_dependency "bundler", "~> 1.15"
+  spec.add_development_dependency "climate_control"
   spec.add_development_dependency "rails", "~> 5"
   spec.add_development_dependency "rake", "~> 12.3"
   spec.add_development_dependency "rspec", "~> 3.8.0"
   spec.add_development_dependency "rspec-its", "~> 1.3.0"
-  spec.add_development_dependency "climate_control"
   spec.add_development_dependency "webmock"
-  spec.add_development_dependency "pry"
 end

data/lib/govuk_app_config.rb

@@ -1,7 +1,6 @@
 require "govuk_app_config/version"
 require "govuk_app_config/govuk_statsd"
 require "govuk_app_config/govuk_error"
-require "govuk_app_config/govuk_logging"
 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.
@@ -11,5 +10,6 @@ require "govuk_app_config/configure"
 
 if defined?(Rails)
   require "govuk_app_config/railtie"
+  require "govuk_app_config/govuk_logging"
   require "govuk_app_config/govuk_content_security_policy"
 end

data/lib/govuk_app_config/configure.rb

@@ -19,7 +19,7 @@ GovukError.configure do |config|
     'ActiveJob::DeserializationError',
     'ActiveRecord::RecordNotFound',
     'CGI::Session::CookieStore::TamperedWithCookie',
-    'GdsApi::HTTPIntermittent',
+    'GdsApi::HTTPIntermittentServerError',
     'GdsApi::TimedOutException',
     'Mongoid::Errors::DocumentNotFound',
     'Sinatra::NotFound',

data/lib/govuk_app_config/govuk_logging.rb

@@ -1,21 +1,18 @@
 require 'logstasher'
+require 'action_controller'
 
 module GovukLogging
   def self.configure
-    # Rails applications have 2 outputs types:
+    # GOV.UK Rails applications are expected to output JSON to stdout which is
+    # then indexed in a Kibana instance. These log outputs are created by the
+    # logstasher gem.
     #
-    # 1) Structured logging statements like the ones we create with
-    # `Rails.logger.info` and Rails request logging, which we do with the logstasher
-    # gem. These logs are output in JSON and can be read easily by our logging
-    # stack.
+    # Rails applications will typically write other things to stdout such as
+    # `Rails.logger` calls or 'puts' statements. However these are not in a
+    # JSON format which causes problems for the log file parsers.
     #
-    # 2) The second are logs that are outputted when an exception occurs or `puts`
-    # is used directly. This is unstructured text. Often this logging is sent to
-    # STDOUT directly.
-    #
-    # We want to differentiate between the two types. To do this, we direct all log
-    # statements that would _normally_ go to STDOUT to STDERR. This frees up the "real
-    # stdout" for use by our loggers.
+    # To resolve this we've directed stdout to stderr, to cover any Rails
+    # writing. This frees up the normal stdout for the logstasher logs.
     $real_stdout = $stdout.clone
     $stdout.reopen($stderr)
 

data/lib/govuk_app_config/version.rb

@@ -1,3 +1,3 @@
 module GovukAppConfig
-  VERSION = "1.20.1"
+  VERSION = "1.20.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_app_config
 version: !ruby/object:Gem::Version
-  version: 1.20.1
+  version: 1.20.2
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-12 00:00:00.000000000 Z
+date: 2019-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-xray-sdk
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.0
-- !ruby/object:Gem::Dependency
-  name: statsd-ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: logstasher
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +53,7 @@ dependencies:
         version: 2.7.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -77,7 +63,21 @@ dependencies:
         version: 2.7.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.12.0
+- !ruby/object:Gem::Dependency
+  name: statsd-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: unicorn
   requirement: !ruby/object:Gem::Requirement
@@ -112,6 +112,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.15'
+- !ruby/object:Gem::Dependency
+  name: climate_control
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -168,20 +182,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.0
-- !ruby/object:Gem::Dependency
-  name: climate_control
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -196,20 +196,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Base configuration for GOV.UK applications
 email:
 - govuk-dev@digital.cabinet-office.gov.uk