govuk_app_config 9.19.2 → 9.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f36c0ed38ef87d5ed65e3be624ffd04ebca06ed3284eaf73f3d9d09e3e98852
-  data.tar.gz: 56fa24350ce9edf59eaf567074d23b7d4c2a57afb19e756a8fda9adb8bdf2a7d
+  metadata.gz: 5ed9ccaea10d2cd9f8a026539dda909186b4f4cce0a1ec4726249c9c7a7308d0
+  data.tar.gz: 7bb26b771496680b02dc8f2310af813d6bf596d242af0058b1627fd5a5a6c77e
 SHA512:
-  metadata.gz: b148ba64b0f4ff075ddbee99ca2d4e0b344cfc2e65d9d964d39ec05a91b3c86bced98d448872da6eccdd1da898947a9fcfa2ebe2997e52b20bfa0c9364429fe1
-  data.tar.gz: 2a2e80673246cfdc035b1e520f6f33c1549d8c40d015389c2d9eb88f37436b75c51a7a38b153d0ccc11b5f7c5dac5f9d99a555cc94955f0939e0431664be3438
+  metadata.gz: 36638219ddaa26312e67ecea0c464fc79c1e08e9b31aa1328e70eec6f4b7f725daeb9e1eaaba399546caaabc6f2876a5dff2e0e133485b2905a2901662c351fa
+  data.tar.gz: 8727676c587263a8115a6017e43f7bd6e84aa2c279a602ae0ca640417f4dd618f48193bf7c818c2f37081822efdda2688a7be2a0d8d8b38900d28c06581bf3be

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@efbf473cab83af4468e8606cc33eca9281bb213f # v1.256.0
       with:
         ruby-version: ${{ matrix.ruby }}
         bundler-cache: true

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 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
+
 # 9.19.2
 
 * 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"
@@ -22,10 +22,10 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "logstasher", "~> 2.1"
   spec.add_dependency "opentelemetry-exporter-otlp", ">= 0.25", "< 0.31"
-  spec.add_dependency "opentelemetry-instrumentation-all", ">= 0.39.1", "< 0.79.0"
+  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.2".freeze
+  VERSION = "9.20.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_app_config
 version: !ruby/object:Gem::Version
-  version: 9.19.2
+  version: 9.20.0
 platform: ruby
 authors:
 - GOV.UK Dev
@@ -52,7 +52,7 @@ dependencies:
         version: 0.39.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: 0.81.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.79.0
+        version: 0.81.0
 - !ruby/object:Gem::Dependency
   name: opentelemetry-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -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:
   - - ">="