govuk_app_config 9.0.2 → 9.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5eebd463208dee81ff14cc1a87f100aca70e681ac5981035e4023fb858e80a73
-  data.tar.gz: a0eb596c770aecad2de8d136615dd2b817d58c13d59b39aeb41cab6eb4647ab0
+  metadata.gz: 13c7b2080a8136a1799208e1bf685d420afbde632c35780c7b2cef063d7bad54
+  data.tar.gz: 757a148a0d5db0867f8ca54033cb243837c5dadb9427c5047c24db4bcc96a897
 SHA512:
-  metadata.gz: 90afd8244f3996cc39d6745d41eee8f7f722eac4933f9963593abdb1e9bbf7e5547badcdcace94271fa0d1e9c2a4dd0a30ea7b7d68e150f2f9ce42dea4f146df
-  data.tar.gz: 9589eb251474ac70f2df9f731fa849689ef16c66a65bc150171dee297c5934f94e99eddb5178bc761ae3dacf5ea5ea1091effb1526ecece9da71faf8b33ded64
+  metadata.gz: 7838253f4088c269f00f85ae005ee072ae3e08a935ba49f39e1dd0aa9b5c857de75472ebb73697b9ad49c31c61a62ad47556a3b75fe660edd2d818b0ad00cd65
+  data.tar.gz: 102c41532cfa9d12140d54c5ed44b8bc06eb0e331524d032652c4f8b9d68fb5b1adcfb1044e197135ed4c7b9161903219719f767327719a09ed862a1de9dbca7

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 9.0.4
+
+* Fix an issue with Rails.logger being not an instance of ActiveSupport::Logger. Rails expects Rails.logger to have methods that Ruby STD Logger does not provide. e.g. `silence()` ([#309](https://github.com/alphagov/govuk_app_config/pull/309))
+
+# 9.0.3
+
+* When error is reported by Rails logger, the field is now logged as "error_message" in order to avoid overwriting the "message" field.
+
 # 9.0.2
 
 * GovukAppConfig no longer automatically initialises OpenTelemetry when running in `rails console`.

data/lib/govuk_app_config/govuk_json_logging.rb

@@ -8,24 +8,21 @@ module GovukJsonLogging
     # indefinitely while troubleshooting.
     $stdout.sync = true
 
-    Rails.logger = Logger.new(
-      $stdout,
-      level: Rails.logger.level,
-      formatter: proc { |severity, datetime, _progname, msg|
-        hash = {
-          "@timestamp": datetime.utc.iso8601(3),
-          message: msg,
-          level: severity,
-          tags: %w[rails],
-        }
+    Rails.logger = ActiveSupport::Logger.new($stdout, level: Rails.logger.level)
+    Rails.logger.formatter = proc { |severity, datetime, _progname, msg|
+      hash = {
+        "@timestamp": datetime.utc.iso8601(3),
+        message: msg,
+        level: severity,
+        tags: %w[rails],
+      }
 
-        if defined?(GdsApi::GovukHeaders) && !GdsApi::GovukHeaders.headers[:govuk_request_id].nil?
-          hash[:govuk_request_id] = GdsApi::GovukHeaders.headers[:govuk_request_id]
-        end
+      if defined?(GdsApi::GovukHeaders) && !GdsApi::GovukHeaders.headers[:govuk_request_id].nil?
+        hash[:govuk_request_id] = GdsApi::GovukHeaders.headers[:govuk_request_id]
+      end
 
-        "#{hash.to_json}\n"
-      },
-    )
+      "#{hash.to_json}\n"
+    }
 
     LogStasher.add_custom_fields do |fields|
       # Mirrors Nginx request logging, e.g. GET /path/here HTTP/1.1
@@ -53,7 +50,7 @@ module GovukJsonLogging
     # Elasticsearch index expect error to be an object and logstash defaults
     # error to be a string causing logs to be dropped.
     Rails.application.config.logstasher.field_renaming = {
-      error: :message,
+      error: :error_message,
     }
 
     Rails.application.config.logstasher.logger = Logger.new(

data/lib/govuk_app_config/version.rb

@@ -1,3 +1,3 @@
 module GovukAppConfig
-  VERSION = "9.0.2".freeze
+  VERSION = "9.0.4".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_app_config
 version: !ruby/object:Gem::Version
-  version: 9.0.2
+  version: 9.0.4
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-11 00:00:00.000000000 Z
+date: 2023-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstasher
@@ -363,7 +363,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.16
+rubygems_version: 3.4.17
 signing_key: 
 specification_version: 4
 summary: Base configuration for GOV.UK applications