govuk_app_config 9.25.1 → 9.25.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95fc9acda7ae41b192adc15f3573a6ffa8f10774a5d37e09179505c99d1a76f9
-  data.tar.gz: 939ff56c631b3c4282630a4eb3bbc4a745a117a80d9032cebfb66cf33396a1ad
+  metadata.gz: 69374414c0d453cdabe4232de81cf6119d5cef69bbb3d709fa4f887d4db3bd56
+  data.tar.gz: e5c708e9c49c6892fc097391ef01ad1f4079fea99cc44d8aba368f975bdfaa6f
 SHA512:
-  metadata.gz: f861d6d412ce83b157f3baabed9b991f236e4a6da8939abf626ef1e7bc01ceb86cd21737a08debea63714fbd887db653a50a5265ad0446196603397affe92ad3
-  data.tar.gz: 1085d3176ae751a7da4dda58c1e5dd37ff5148350f26772d94bb163a803b4212dddc5d92249a345ed227463df22b6af35d522ebe5058106f5ce001ec4e4739d3
+  metadata.gz: 675229091be0f339534102f828f845f9eb6b6fdec79c6bf5fb0f339edb4beaafd30c2d3fcf5c5ba3a3735080abafa05b1d728607a0f76b08f5ae8d16bb3b7ec3
+  data.tar.gz: 342715aabae59ba1c20b58146b34f9d7cc6ed98723c44c221546dd99870e9aef320229b45ae546ba0901fde6cee8b17f584f0249439e040c7989adb08b43e645

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@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.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@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+    - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       with:
         ref: ${{ inputs.ref || github.ref }}
-    - uses: ruby/setup-ruby@89f90524b88a01fe6e0b732220432cc6142926af # v1.313.0
+    - uses: ruby/setup-ruby@95ef2b042f9d7a56d8268cba8559e2842e2ad01b # v1.321.0
       with:
         ruby-version: ${{ matrix.ruby }}
         bundler-cache: true

data/CHANGELOG.md

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

data/govuk_app_config.gemspec

@@ -21,14 +21,14 @@ 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-instrumentation-all", ">= 0.39.1", "< 0.97.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", "< 9.0"
-  spec.add_dependency "rack-proxy", "~> 0.7"
+  spec.add_dependency "rack-proxy", ">= 0.7", "< 2.0"
   spec.add_dependency "sentry-rails", ">= 5.3", "< 7.0"
   spec.add_dependency "sentry-ruby", ">= 5.3", "< 7.0"
   spec.add_dependency "statsd-ruby", "~> 1.5"
@@ -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.3".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.3
 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
@@ -66,7 +72,7 @@ dependencies:
         version: 0.39.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.95.0
+        version: 0.97.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -76,7 +82,7 @@ dependencies:
         version: 0.39.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.95.0
+        version: 0.97.0
 - !ruby/object:Gem::Dependency
   name: opentelemetry-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -149,16 +155,22 @@ dependencies:
   name: rack-proxy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: sentry-rails
   requirement: !ruby/object:Gem::Requirement
@@ -261,14 +273,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 +439,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.15
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Base configuration for GOV.UK applications
 test_files: []