govuk_app_config 9.22.0 → 9.22.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d275418b49c8fde595b6137641c2efc0965cf7e40b5b53ac76776c1b61721922
-  data.tar.gz: 8ef6d11565e3e94b70724695db1467f5fdc72e76b97f50b2beffa4f94489c368
+  metadata.gz: 87a794a2863f46d803e01492bd23f609aaabecb57531fd5140872705e03e93c6
+  data.tar.gz: ae8657c09468fb43fdb975332416967170104e31be1e8895a91e430fbfe0e453
 SHA512:
-  metadata.gz: ca7e388c8e543840291ce5911db20083da18b961cbe373a7cb6b41f826ede5c32f31b6bee5a7c1066086e72b0769d4f112ccd00f73c1e2ca417da52a6354b675
-  data.tar.gz: 9d00d7a7be7958c06445a451c2df5e450a7bf13237897aafafc579607fa08af852ebadeb5ea5dff240c44370e29e1cae6b0bb2e4ebefa14ec5505bf96145432f
+  metadata.gz: 2ff2ba03cc604c87918d7bf66d5e9cc41c02b77060cd6f01124db6ebd11d27517dbf430fd9ccc2df7901aaeaee7899c660519095ab2ef899cf82680b6f897fc4
+  data.tar.gz: eb5f7149ec58a9ce9df18a58c80f2e0829daed548a988366dbab6eb3e2cb1e1464ec3724a6c9609c50d30d27e6758a2485f6de0eb0d859546e68b11350a5dab3

data/.github/workflows/actionlint.yml

@@ -6,7 +6,7 @@ jobs:
   actionlint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
           show-progress: false
       - uses: alphagov/govuk-infrastructure/.github/actions/actionlint@main

data/.github/workflows/ci.yml

@@ -35,10 +35,10 @@ jobs:
         ruby: [3.2, 3.3, 3.4]
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+    - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       with:
         ref: ${{ inputs.ref || github.ref }}
-    - uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25 # v1.267.0
+    - uses: ruby/setup-ruby@8aeb6ff8030dd539317f8e1769a044873b56ea71 # v1.268.0
       with:
         ruby-version: ${{ matrix.ruby }}
         bundler-cache: true

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 9.22.2
+
+* Update dependencies
+
+# 9.22.1
+
+Remove logstasher workaround introduced in 9.20.7
+
 # 9.22.0
 
 * Add extra google analytics domains to content security policy

data/govuk_app_config.gemspec

@@ -22,13 +22,13 @@ Gem::Specification.new do |spec|
 
   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.88.0"
+  spec.add_dependency "opentelemetry-instrumentation-all", ">= 0.39.1", "< 0.89.0"
   spec.add_dependency "opentelemetry-sdk", "~> 1.2"
   spec.add_dependency "plek", ">= 4", "< 6"
   spec.add_dependency "prometheus_exporter", "~> 2.3"
   spec.add_dependency "puma", ">= 5.6", "< 8.0"
   spec.add_dependency "rack-proxy", "~> 0.7"
-  spec.add_dependency "sentry-rails", "~> 5.3"
+  spec.add_dependency "sentry-rails", ">= 5.3", "< 7.0"
   spec.add_dependency "sentry-ruby", "~> 5.3"
   spec.add_dependency "statsd-ruby", "~> 1.5"
 

data/lib/govuk_app_config/railtie.rb

@@ -1,20 +1,5 @@
 require "plek"
 
-# Workaround for Logstasher initializer conflict under Rails 8.1
-begin
-  require "logstasher/railtie"
-
-  if defined?(LogStasher::Railtie)
-    # Remove duplicate initializers that cause cyclic dependency
-    LogStasher::Railtie.initializers.delete_if { |i| i.name == :logstasher }
-
-    # Replace with a single clean initializer
-    LogStasher::Railtie.initializer(:logstasher_fixed, after: :load_config_initializers) {}
-  end
-rescue LoadError, NameError
-  # Skip if Logstasher not present
-end
-
 module GovukAppConfig
   class Railtie < Rails::Railtie
     initializer "govuk_app_config.configure_govuk_proxy" do |app|

data/lib/govuk_app_config/version.rb

@@ -1,3 +1,3 @@
 module GovukAppConfig
-  VERSION = "9.22.0".freeze
+  VERSION = "9.22.2".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_app_config
 version: !ruby/object:Gem::Version
-  version: 9.22.0
+  version: 9.22.2
 platform: ruby
 authors:
 - GOV.UK Dev
@@ -52,7 +52,7 @@ dependencies:
         version: 0.39.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.88.0
+        version: 0.89.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -62,7 +62,7 @@ dependencies:
         version: 0.39.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.88.0
+        version: 0.89.0
 - !ruby/object:Gem::Dependency
   name: opentelemetry-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -149,16 +149,22 @@ dependencies:
   name: sentry-rails
   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: sentry-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -402,7 +408,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 4.0.0
 specification_version: 4
 summary: Base configuration for GOV.UK applications
 test_files: []