govuk_app_config 9.11.1 → 9.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e328b8f14abd03a18e3f68c5334eca8681fd149b6572bbc30bd2336f32fa4a8
-  data.tar.gz: f31ef5725579cb25b04fcc0ddfb75a00e1efedb7e6f6ca838182edea6fdfd0ff
+  metadata.gz: 20f6c0f84338e2323ad36493234894a5b960374c173111f134062d2911d5f224
+  data.tar.gz: 1a83af7fc6f2ea3710bdfc34e8c0bec33c3c0799b9d00448943f433bfb6a70e2
 SHA512:
-  metadata.gz: 6387c742d5b1e535e8e26b7e60f5161377e410c9a1a974aae32572546746f9e6bed7cbbf09ed2501492106d3db82bf57293f661c116d748e79e5d973f2242ca9
-  data.tar.gz: 8b5283cc08344c0975d0cdd5904f380bfd937e87f41f4f89e10c296b4f3eb906d76625160130aea6ad77f399f4e2b0e129e648dd6df1bfb278ddea65ad821704
+  metadata.gz: 81e16fe6cde2884271be25e436753544e12f75415643b4972390ab55563f72ff9e144de4e7b0692c9eced7ce8591be121c40c06d175ef014128a0d92ec0583c4
+  data.tar.gz: f6d1b1bdc33591394cdb16f156e51e713312b02dcd108066c71a9f05c5c27a89d2bf7b36836ce349f899058c0c0891313e1ac6a511f8878aa8b58bb4d081fabd

data/.github/workflows/ci.yml

@@ -1,3 +1,5 @@
+name: CI
+
 on:
   push:
     branches:

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 9.12.0
+
+* Set time_zone to London in all GOV.UK apps ([#381](https://github.com/alphagov/govuk_app_config/pull/381))
+
+# 9.11.2
+
+* Fix Logstasher monkey patch overriding patch from this library for OpenTelemetry errors ([#377](https://github.com/alphagov/govuk_app_config/pull/377))
+
 # 9.11.1
 
 * Fix OpenTelemetry errors when using with Logstasher gem ([#372](https://github.com/alphagov/govuk_app_config/pull/372))

data/README.md

@@ -8,6 +8,7 @@ Adds the basics of a GOV.UK application:
 - Statsd client for reporting stats (deprecated; use Prometheus instead)
 - Rails logging
 - Content Security Policy generation for frontend apps
+- Sets the time zone to London
 
 ## Installation
 
@@ -181,6 +182,9 @@ GovukContentSecurityPolicy.configure
 
 Some frontend apps support languages that are not defined in the i18n gem. This provides them with our own custom rules for these languages.
 
+## Time zone
+
+This gem sets `config.time_zone` to `"London"` - this cannot currently be overridden in application config.
 
 ## License
 

data/govuk_app_config.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = %w[lib]
 
   spec.add_dependency "logstasher", "~> 2.1"
-  spec.add_dependency "opentelemetry-exporter-otlp", ">= 0.25", "< 0.27"
-  spec.add_dependency "opentelemetry-instrumentation-all", ">= 0.39.1", "< 0.61.0"
+  spec.add_dependency "opentelemetry-exporter-otlp", ">= 0.25", "< 0.29"
+  spec.add_dependency "opentelemetry-instrumentation-all", ">= 0.39.1", "< 0.62.0"
   spec.add_dependency "opentelemetry-sdk", "~> 1.2"
   spec.add_dependency "plek", ">= 4", "< 6"
   spec.add_dependency "prometheus_exporter", "~> 2.0"
@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.10"
   spec.add_development_dependency "rspec-its", "~> 1.3"
-  spec.add_development_dependency "rubocop-govuk", "4.17.1"
+  spec.add_development_dependency "rubocop-govuk", "4.18.0"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "webmock"
 end

data/lib/govuk_app_config/govuk_json_logging.rb

@@ -20,6 +20,8 @@ module GovukJsonLogging
     config = Rails.application.config.logstasher
     if (!config.controller_monkey_patch && config.controller_monkey_patch != false) || config.controller_monkey_patch == true
       require_relative "./govuk_json_logging/rails_ext/action_controller/metal/instrumentation"
+      # Prevent the old monkey patch being applied
+      config.controller_monkey_patch = false
     end
 
     configuration = Configuration.new

data/lib/govuk_app_config/govuk_timezone.rb

@@ -0,0 +1,14 @@
+module GovukTimezone
+  def self.configure(config)
+    case config.time_zone
+    when "UTC"
+      Rails.logger.info "govuk_app_config changing time_zone from UTC (the default) to London"
+    when "London"
+      Rails.logger.info "govuk_app_config always sets time_zone to London - there is no need to set config.time_zone in your app"
+    else
+      raise "govuk_app_config prevents configuring time_zones other than London - config.time_zone was set to #{config.time_zone}"
+    end
+
+    config.time_zone = "London"
+  end
+end

data/lib/govuk_app_config/railtie.rb

@@ -14,6 +14,10 @@ module GovukAppConfig
       end
     end
 
+    initializer "govuk_app_config.configure_timezone", before: "active_support.initialize_time_zone" do |app|
+      GovukTimezone.configure(app.config)
+    end
+
     config.before_initialize do
       GovukJsonLogging.configure if ENV["GOVUK_RAILS_JSON_LOGGING"]
     end

data/lib/govuk_app_config/version.rb

@@ -1,3 +1,3 @@
 module GovukAppConfig
-  VERSION = "9.11.1".freeze
+  VERSION = "9.12.0".freeze
 end

data/lib/govuk_app_config.rb

@@ -9,5 +9,6 @@ require "govuk_app_config/govuk_prometheus_exporter"
 if defined?(Rails)
   require "govuk_app_config/govuk_json_logging"
   require "govuk_app_config/govuk_content_security_policy"
+  require "govuk_app_config/govuk_timezone"
   require "govuk_app_config/railtie"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_app_config
 version: !ruby/object:Gem::Version
-  version: 9.11.1
+  version: 9.12.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-05 00:00:00.000000000 Z
+date: 2024-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstasher
@@ -33,7 +33,7 @@ dependencies:
         version: '0.25'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.27'
+        version: '0.29'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: '0.25'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.27'
+        version: '0.29'
 - !ruby/object:Gem::Dependency
   name: opentelemetry-instrumentation-all
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +53,7 @@ dependencies:
         version: 0.39.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.61.0
+        version: 0.62.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -63,7 +63,7 @@ dependencies:
         version: 0.39.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.61.0
+        version: 0.62.0
 - !ruby/object:Gem::Dependency
   name: opentelemetry-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -292,14 +292,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.17.1
+        version: 4.18.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.17.1
+        version: 4.18.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -372,6 +372,7 @@ files:
 - lib/govuk_app_config/govuk_proxy/static_proxy.rb
 - lib/govuk_app_config/govuk_puma.rb
 - lib/govuk_app_config/govuk_statsd.rb
+- lib/govuk_app_config/govuk_timezone.rb
 - lib/govuk_app_config/railtie.rb
 - lib/govuk_app_config/version.rb
 homepage: https://github.com/alphagov/govuk_app_config
@@ -393,7 +394,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.14
 signing_key: 
 specification_version: 4
 summary: Base configuration for GOV.UK applications