govuk_app_config 9.19.3 → 9.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c17606cdf74ab30adb2a0088f4e2a4055d3ac83a5c506c433076baf4e8cec23f
-  data.tar.gz: cba9f97752cc0059c0890f0a8b8bdf0c3bf414451033fa31643183f2f4a9f1ef
+  metadata.gz: a13ea53fbfc32b0ef45888cb292b196e33f0a4d1e1d05f0130e4e39c96544f56
+  data.tar.gz: fca5f12c056a65341e2f301b616e2c2972dcaf70d50ebc91aee801058cf4a27a
 SHA512:
-  metadata.gz: b8590895a47c90b54e5038a131b6438c85fd4d77f173fb13b93f4716e4ea7e6906239600598164eb8a9c54350b7d33a83ac4b00341e8c22316bd39a28ba581ef
-  data.tar.gz: 202a71e6afe13a689f674b8ecd2b5e06878758faa4c747134523d2bf10a680a44a1e17256e82f7355b0c96f3b6c2ff49c2aa454b3c60dd7545ea5e0c4d884444
+  metadata.gz: d34b5ea64a19ff76018b82947573203c261c8de5addce69d49c1986b85dc1a34e0104c694c2f26dc6e7758a011a3074b7cc5c4f547212bea0202db41d899309a
+  data.tar.gz: f6b6b74f0d5fea239855482d98a2319aab5f9c9c1251b22d68f79100a47ed4452fc97da7e795d96a615cc783a796cf90d8334c7bc3e05cbe389d233660d46282

data/.github/workflows/actionlint.yml

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

data/.github/workflows/ci.yml

@@ -32,13 +32,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [3.1, 3.2, 3.3]
+        ruby: [3.2, 3.3, 3.4]
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       with:
         ref: ${{ inputs.ref || github.ref }}
-    - uses: ruby/setup-ruby@v1
+    - uses: ruby/setup-ruby@44511735964dcb71245e7e55f72539531f7bc0eb # v1.257.0
       with:
         ruby-version: ${{ matrix.ruby }}
         bundler-cache: true

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 9.20.1
+
+* Update dependencies
+
+# 9.20.0
+
+* Update prometheus_exporter and remove patched middleware
+* BREAKING: drop support for ruby 3.1
+* Add support for ruby 3.4
+
 # 9.19.3
 
 * Update dependencies

data/govuk_app_config.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/alphagov/govuk_app_config"
   spec.license       = "MIT"
 
-  spec.required_ruby_version = ">= 3.1.4"
+  spec.required_ruby_version = ">= 3.2.0"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"
@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "opentelemetry-instrumentation-all", ">= 0.39.1", "< 0.81.0"
   spec.add_dependency "opentelemetry-sdk", "~> 1.2"
   spec.add_dependency "plek", ">= 4", "< 6"
-  spec.add_dependency "prometheus_exporter", "~> 2.0"
+  spec.add_dependency "prometheus_exporter", "~> 2.3"
   spec.add_dependency "puma", ">= 5.6", "< 7.0"
   spec.add_dependency "rack-proxy", "~> 0.7"
   spec.add_dependency "sentry-rails", "~> 5.3"

data/lib/govuk_app_config/govuk_prometheus_exporter.rb

@@ -5,30 +5,6 @@ require "prometheus_exporter/middleware"
 
 module GovukPrometheusExporter
   class RailsMiddleware < PrometheusExporter::Middleware
-    #
-    # See https://github.com/discourse/prometheus_exporter/pull/293
-    #
-    # default_labels can be removed and fall through to the base method if
-    # that PR is merged / released
-    #
-    def default_labels(env, _result)
-      controller_instance = env["action_controller.instance"]
-      action = controller = nil
-      if controller_instance
-        action = controller_instance.action_name
-        controller = controller_instance.controller_name
-      elsif (cors = env["rack.cors"]) && cors.respond_to?(:preflight?) && cors.preflight?
-        # if the Rack CORS Middleware identifies the request as a preflight request,
-        # the stack doesn't get to the point where controllers/actions are defined
-        action = "preflight"
-        controller = "preflight"
-      end
-      {
-        action: action || "other",
-        controller: controller || "other",
-      }
-    end
-
     def custom_labels(env)
       env.fetch("govuk.prometheus_labels", {})
     end

data/lib/govuk_app_config/version.rb

@@ -1,3 +1,3 @@
 module GovukAppConfig
-  VERSION = "9.19.3".freeze
+  VERSION = "9.20.1".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_app_config
 version: !ruby/object:Gem::Version
-  version: 9.19.3
+  version: 9.20.1
 platform: ruby
 authors:
 - GOV.UK Dev
@@ -103,14 +103,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -395,7 +395,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.4
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="