govuk_app_config 9.15.8 → 9.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bed42866988f8750e1f1712d1c0c2dbdd721fe7f6fdb5f361d83ddebbedec6fa
-  data.tar.gz: 3986ed5d06766b356da975a177772d4a148349ff84631498d1bde09b8d68322c
+  metadata.gz: 9523a9a179539e5a8819632472c4978c0121dacf61d55cff136c9d4332dc6c8f
+  data.tar.gz: b2016590e7979ae31f8cada134a8ec714604ca8534d614579bde6025c2884861
 SHA512:
-  metadata.gz: c6bee275e972ecee41b8a1e006b0395d639c42620f0cb0598f6bf81dedb343b2a117e7eb2210d6ea3255d19900b1b65162f9385bb2c4f746d67d11aa9552c51d
-  data.tar.gz: 94f618290095a93ca1d005bd5046177eed6c3ab655b1a061594ea3317476591a9283841f72f901068faa019a3ae41f1da6ad8bfc269d142b0f84b1b8952438a8
+  metadata.gz: 87725c6f3692a970ae7e1010491af1d1fea3b47a44035a5dcd0ca3bf416df3383149aeefdf028d9f48d64af993f9ecefb0329619870b7e50ebe36cc99f4ae0e4
+  data.tar.gz: e62783994c4d67e8dc6325cfedf3721dae263116037b336eb1adea5f098832893d8c2d16ea8abda35f4a79a9ef27883457446c1073a9f213de3a6422757d4df0

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 9.16.1
+
+* Update dependencies
+
+# 9.16.0
+
+* GovukPrometheus - custom labels from rack env ([#424](https://github.com/alphagov/govuk_app_config/pull/424))
+
 # 9.15.8
 
 * Update dependencies

data/govuk_app_config.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "logstasher", "~> 2.1"
   spec.add_dependency "opentelemetry-exporter-otlp", ">= 0.25", "< 0.30"
-  spec.add_dependency "opentelemetry-instrumentation-all", ">= 0.39.1", "< 0.72.0"
+  spec.add_dependency "opentelemetry-instrumentation-all", ">= 0.39.1", "< 0.73.0"
   spec.add_dependency "opentelemetry-sdk", "~> 1.2"
   spec.add_dependency "plek", ">= 4", "< 6"
   spec.add_dependency "prometheus_exporter", "~> 2.0"
@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.10"
   spec.add_development_dependency "rspec-its", "~> 2.0"
-  spec.add_development_dependency "rubocop-govuk", "5.0.7"
+  spec.add_development_dependency "rubocop-govuk", "5.0.8"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "webmock"
 end

data/lib/govuk_app_config/govuk_prometheus_exporter.rb

@@ -4,13 +4,13 @@ require "prometheus_exporter/server"
 require "prometheus_exporter/middleware"
 
 module GovukPrometheusExporter
-  #
-  # See https://github.com/discourse/prometheus_exporter/pull/293
-  #
-  # RailsMiddleware can be removed and replaced with the default middleware if
-  # that PR is merged / released
-  #
   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
@@ -28,6 +28,10 @@ module GovukPrometheusExporter
         controller: controller || "other",
       }
     end
+
+    def custom_labels(env)
+      env.fetch("govuk.prometheus_labels", {})
+    end
   end
 
   class SinatraMiddleware < PrometheusExporter::Middleware
@@ -39,6 +43,10 @@ module GovukPrometheusExporter
       # the application / pod and don't provide any other labels
       {}
     end
+
+    def custom_labels(env)
+      env.fetch("govuk.prometheus_labels", {})
+    end
   end
 
   def self.should_configure

data/lib/govuk_app_config/version.rb

@@ -1,3 +1,3 @@
 module GovukAppConfig
-  VERSION = "9.15.8".freeze
+  VERSION = "9.16.1".freeze
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: govuk_app_config
 version: !ruby/object:Gem::Version
-  version: 9.15.8
+  version: 9.16.1
 platform: ruby
 authors:
 - GOV.UK Dev
 bindir: exe
 cert_chain: []
-date: 2025-01-15 00:00:00.000000000 Z
+date: 2025-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstasher
@@ -52,7 +52,7 @@ dependencies:
         version: 0.39.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.72.0
+        version: 0.73.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.72.0
+        version: 0.73.0
 - !ruby/object:Gem::Dependency
   name: opentelemetry-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -291,14 +291,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.7
+        version: 5.0.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.7
+        version: 5.0.8
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -393,7 +393,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.3
 specification_version: 4
 summary: Base configuration for GOV.UK applications
 test_files: []