govuk_app_config 9.23.0 → 9.23.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7281de94bb3b8ad471321c08e8eb827af6569ddefcd22dce31ae19302252762
-  data.tar.gz: 2d7b0d73a80eff775af154d79e6e85f52dc75440cb2601c106dbd2042110c04a
+  metadata.gz: c38ac458e8f9a487fe3474b2eea286497051e62618fb8ca9d90d52e82f60fc41
+  data.tar.gz: fbe86aba2f645474a17377768f18c7a127bf44a6de23d7e3855bf31b8aac7345
 SHA512:
-  metadata.gz: 56a02fd4221ec8d62348ceb96db5591e8691f9a7b7badf0f6c2172cfd2c3f17ea49841ba746dc2074b5e3ee4494618e9314136195d66f0ce7a5772fe7b501419
-  data.tar.gz: 56e2a25b6422b38722009c0d5d96d8a1d45e8adb2fe126d636ee96c4dbd014a36985d9b848bddf5ea2f253ed05bd4200fb99b8040af52dc013dc260f053482ce
+  metadata.gz: 1f01217c32079264ebdb686615893131d5f6d8acc164f1975bc5702fff6f39691f757b35382ec72460bf43f5e1188ca8722b3c2e6599dcf589b7c0ccd90fa4cf
+  data.tar.gz: 1b3e22b4ca8c36caf1a41576e68cd9a5984553244866b49c5750728736fe9039d2b09dc986317a770c7c5cf01597c0f3207ec344e23c7e40a1b92d2a0737ab1e

data/.github/workflows/ci.yml

@@ -38,7 +38,7 @@ jobs:
     - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       with:
         ref: ${{ inputs.ref || github.ref }}
-    - uses: ruby/setup-ruby@d5f787ce339eb0767271bc01d922e85644c2c8ab # v1.280.0
+    - uses: ruby/setup-ruby@4fc31e1c823882afd7ef55985266a526c589de90 # v1.282.0
       with:
         ruby-version: ${{ matrix.ruby }}
         bundler-cache: true

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 9.23.2
+
+* Allow sentry-ruby 6.x
+
+# 9.23.1
+
+* Restore compatibility with Rails 8.1+ by fixing the boot cycle and ensuring structured logging is enabled. This allows Rails 8.1 apps to upgrade to the latest govuk_app_config.
+
 # 9.23.0
 
 * Remove StaticProxy middleware now that Static is no longer in use

data/govuk_app_config.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "puma", ">= 5.6", "< 8.0"
   spec.add_dependency "rack-proxy", "~> 0.7"
   spec.add_dependency "sentry-rails", ">= 5.3", "< 7.0"
-  spec.add_dependency "sentry-ruby", "~> 5.3"
+  spec.add_dependency "sentry-ruby", ">= 5.3", "< 7.0"
   spec.add_dependency "statsd-ruby", "~> 1.5"
 
   spec.add_development_dependency "byebug"

data/lib/govuk_app_config/railtie.rb

@@ -1,5 +1,24 @@
 require "plek"
 
+# Workaround for Logstasher initializer conflict under Rails 8.1
+begin
+  require "logstasher/railtie"
+
+  # Only apply this workaround for Rails 8.1+ where the boot cycle issue exists.
+  # This prevents any potential regressions for apps on older Rails versions.
+  if defined?(LogStasher::Railtie) && Gem::Version.new(Rails::VERSION::STRING) >= Gem::Version.new("8.1")
+    # Remove duplicate initializers that cause cyclic dependency
+    LogStasher::Railtie.initializers.delete_if { |i| i.name == :logstasher }
+
+    # Replace with a single clean initializer that actually sets up LogStasher
+    LogStasher::Railtie.initializer(:logstasher_govuk_fix, after: :load_config_initializers) do |app|
+      LogStasher.setup(app) if app.config.logstasher.enabled
+    end
+  end
+rescue LoadError, NameError
+  # Skip if Logstasher not present
+end
+
 module GovukAppConfig
   class Railtie < Rails::Railtie
     initializer "govuk_app_config.configure_open_telemetry" do |app|

data/lib/govuk_app_config/version.rb

@@ -1,3 +1,3 @@
 module GovukAppConfig
-  VERSION = "9.23.0".freeze
+  VERSION = "9.23.2".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_app_config
 version: !ruby/object:Gem::Version
-  version: 9.23.0
+  version: 9.23.2
 platform: ruby
 authors:
 - GOV.UK Dev
@@ -183,16 +183,22 @@ dependencies:
   name: sentry-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: statsd-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -421,7 +427,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.4
 specification_version: 4
 summary: Base configuration for GOV.UK applications
 test_files: []