govuk_app_config 9.23.7 → 9.23.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4ecfad2cef7d2b3b5997c6033f5392db9b96d6af192ddf37cee007057192a0e
-  data.tar.gz: adbf2dee86d8ddde7a8b1c21528c09c53223c30489c991d68640b86439dd00a2
+  metadata.gz: 8f051f8f922ce9d488a41fec6fadb061481325266a2b6e8f2cb66e2b604b3316
+  data.tar.gz: 245e669207f16f32cd0a810904c7040e06215e096eaa6c04615452fcf8bd843e
 SHA512:
-  metadata.gz: 9df67907927e9598504d86cfcbab91ca84c2b86c2337a033c55b5d4be4690f1142db6b37369a1f4f6391da69310599e75c9bc480ffc0f8d4091527236e7c0c34
-  data.tar.gz: e8cb71ed93f917e7be8a077bd96883f33cee2d75ec0add53f24af52c357f3dd2099bc37d7a492ea416e743d502539d1ccf2421c1fcd663e40bcbc80673c31b7e
+  metadata.gz: 5e670b32b2d4d86b1ccda4f5ff6c76dfe0b70aeb4b6f5812fbe3d5b52fe21e3de270f9b3526e8812f556cb54edd6c74b7428130b38dfde595f942b1b3b00501c
+  data.tar.gz: 857dec3b9eb73e61a641f434c1e86e38471ac009974bc33b2aa66ee0ffb6af6b340dd0f632d1599a8f26acaa9e248b7522b08dd40a1f733ee73cb3aa41b634c5

data/.github/workflows/ci.yml

@@ -38,7 +38,7 @@ jobs:
     - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       with:
         ref: ${{ inputs.ref || github.ref }}
-    - uses: ruby/setup-ruby@c984c1a20bb35a1cbda04477c816cea024418be9 # v1.294.0
+    - uses: ruby/setup-ruby@4c56a21280b36d862b5fc31348f463d60bdc55d5 # v1.301.0
       with:
         ruby-version: ${{ matrix.ruby }}
         bundler-cache: true

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 9.23.9
+
+* Fix Logstasher JSON logger initialisation problems in Rails apps
+
+# 9.23.8
+
+* Fix Google Analytics CSP errors
+
 # 9.23.7
 
 * Remove single consent domains from connect_src CSP configuration

data/govuk_app_config.gemspec

@@ -22,8 +22,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "connection_pool", "< 3"
   spec.add_dependency "logstasher", "~> 2.1"
-  spec.add_dependency "opentelemetry-exporter-otlp", ">= 0.25", "< 0.32"
-  spec.add_dependency "opentelemetry-instrumentation-all", ">= 0.39.1", "< 0.91.0"
+  spec.add_dependency "opentelemetry-exporter-otlp", ">= 0.25", "< 0.34"
+  spec.add_dependency "opentelemetry-instrumentation-all", ">= 0.39.1", "< 0.92.0"
   spec.add_dependency "opentelemetry-sdk", "~> 1.2"
   spec.add_dependency "plek", ">= 4", "< 6"
   spec.add_dependency "prometheus_exporter", "~> 2.3"

data/lib/govuk_app_config/govuk_content_security_policy.rb

@@ -21,8 +21,10 @@ module GovukContentSecurityPolicy
                                 www.googletagmanager.com
                                 www.region1.google-analytics.com
                                 region1.google-analytics.com
-                                region1.analytics.google.com
-                                www.google.co.uk].freeze
+                                www.google.co.uk
+                                analytics.google.com
+                                *.analytics.google.com
+                                www.google.com].freeze
 
   GOOGLE_STATIC_DOMAINS = %w[www.gstatic.com].freeze
 

data/lib/govuk_app_config/govuk_json_logging.rb

@@ -95,5 +95,12 @@ module GovukJsonLogging
       # the responses it gets, so direct this to the logstasher logger.
       GdsApi::Base.default_options[:logger] = Rails.application.config.logstasher.logger
     end
+
+    # On Rails 8.1+, the default LogStasher initializer is removed to prevent a boot
+    # crash (see railtie.rb). We call setup explicitly here, after all config is applied.
+    if defined?(LogStasher) && Gem::Version.new(Rails::VERSION::STRING) >= Gem::Version.new("8.1")
+      LogStasher.setup_before(Rails.application.config.logstasher)
+      LogStasher.setup(Rails.application.config.logstasher)
+    end
   end
 end

data/lib/govuk_app_config/railtie.rb

@@ -7,13 +7,10 @@ begin
   # 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
+    # Remove the default initializer to fix a cyclic dependency boot crash on Rails 8.1.
+    # LogStasher.setup is instead called explicitly in GovukJsonLogging.configure (after_initialize),
+    # once logstasher.enabled has been set to true.
     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

data/lib/govuk_app_config/version.rb

@@ -1,3 +1,3 @@
 module GovukAppConfig
-  VERSION = "9.23.7".freeze
+  VERSION = "9.23.9".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_app_config
 version: !ruby/object:Gem::Version
-  version: 9.23.7
+  version: 9.23.9
 platform: ruby
 authors:
 - GOV.UK Dev
@@ -46,7 +46,7 @@ dependencies:
         version: '0.25'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.32'
+        version: '0.34'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -56,7 +56,7 @@ dependencies:
         version: '0.25'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.32'
+        version: '0.34'
 - !ruby/object:Gem::Dependency
   name: opentelemetry-instrumentation-all
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
         version: 0.39.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.91.0
+        version: 0.92.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -76,7 +76,7 @@ dependencies:
         version: 0.39.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.91.0
+        version: 0.92.0
 - !ruby/object:Gem::Dependency
   name: opentelemetry-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -427,7 +427,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.8
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Base configuration for GOV.UK applications
 test_files: []