govuk_app_config 9.25.1 → 9.25.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95fc9acda7ae41b192adc15f3573a6ffa8f10774a5d37e09179505c99d1a76f9
-  data.tar.gz: 939ff56c631b3c4282630a4eb3bbc4a745a117a80d9032cebfb66cf33396a1ad
+  metadata.gz: 5b841956931f67de565f04af3fa2440caefd247c732bc6367cdb69d32d8908fe
+  data.tar.gz: 04c0cb5e65ecb445b3dec9886c030160123e087d9ec586c813086ea0868b44b2
 SHA512:
-  metadata.gz: f861d6d412ce83b157f3baabed9b991f236e4a6da8939abf626ef1e7bc01ceb86cd21737a08debea63714fbd887db653a50a5265ad0446196603397affe92ad3
-  data.tar.gz: 1085d3176ae751a7da4dda58c1e5dd37ff5148350f26772d94bb163a803b4212dddc5d92249a345ed227463df22b6af35d522ebe5058106f5ce001ec4e4739d3
+  metadata.gz: a351938361b3e76f28c703c356ac55410bdafcc90aa75b07035214b645c492aa6143f6c50488d8af88c4bfbca525598990578354a8e1c2cbee5d4f64e18131ad
+  data.tar.gz: a22769250a398f6f426f303a9867909cf23a4cf952db3cca52babf5e41e4aa2d55209d864c47a91e17db6d4379f20aa858bb67075fa7b0d90c67feee016c1984

data/.github/workflows/actionlint.yml

@@ -6,7 +6,7 @@ jobs:
   actionlint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         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@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+    - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
       with:
         ref: ${{ inputs.ref || github.ref }}
-    - uses: ruby/setup-ruby@89f90524b88a01fe6e0b732220432cc6142926af # v1.313.0
+    - uses: ruby/setup-ruby@9eb537ca036ebaed86729dcb9309076e4c5c3b74 # v1.314.0
       with:
         ruby-version: ${{ matrix.ruby }}
         bundler-cache: true

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 9.25.2
+
+Pass Rails log level through to logstasher
+
 # 9.25.1
 
 * Update dependencies

data/govuk_app_config.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = %w[lib]
 
   spec.add_dependency "connection_pool", "< 4"
-  spec.add_dependency "logstasher", "~> 2.1"
+  spec.add_dependency "logstasher", ">= 2.1", "< 4.0"
   spec.add_dependency "opentelemetry-exporter-otlp", ">= 0.25", "< 0.35"
   spec.add_dependency "opentelemetry-instrumentation-all", ">= 0.39.1", "< 0.95.0"
   spec.add_dependency "opentelemetry-sdk", "~> 1.2"
@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "climate_control"
   spec.add_development_dependency "rack-test", "~> 2.0"
-  spec.add_development_dependency "rails", "~> 7"
+  spec.add_development_dependency "rails", "~> 8"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.10"
   spec.add_development_dependency "rspec-its", "~> 2.0"

data/lib/govuk_app_config/govuk_json_logging.rb

@@ -104,6 +104,10 @@ module GovukJsonLogging
     # 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")
+      # Without this line, logstasher setup falls back to WARN level. Instead,
+      # tell logstasher to use the same log level as Rails.
+      Rails.application.config.logstasher.log_level = Rails.logger.level
+
       LogStasher.setup_before(Rails.application.config.logstasher)
       LogStasher.setup(Rails.application.config.logstasher)
     end

data/lib/govuk_app_config/version.rb

@@ -1,3 +1,3 @@
 module GovukAppConfig
-  VERSION = "9.25.1".freeze
+  VERSION = "9.25.2".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_app_config
 version: !ruby/object:Gem::Version
-  version: 9.25.1
+  version: 9.25.2
 platform: ruby
 authors:
 - GOV.UK Dev
@@ -27,16 +27,22 @@ dependencies:
   name: logstasher
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: opentelemetry-exporter-otlp
   requirement: !ruby/object:Gem::Requirement
@@ -261,14 +267,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -427,7 +433,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.15
+rubygems_version: 4.0.19
 specification_version: 4
 summary: Base configuration for GOV.UK applications
 test_files: []