govuk_app_config 9.15.7 → 9.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2e92d1d7fbd4a8f68a6b3578ca08f165b01cf0e401784c0b96f074c4d492138
-  data.tar.gz: 5c536656d6d23bbe98d3ae53d3bc73df3c54d6bbbf5263ed1da35a85c8e911b0
+  metadata.gz: fb44777e2f99d4cd18095e308a9f907bd870292c2c500f30ba36c4c3e23730ea
+  data.tar.gz: 8578bbd300c3febc4453c5ca199477aa15dfd014c16151980b9d052768601aa6
 SHA512:
-  metadata.gz: aed319bdbffe453d45ad4bba1496ff258f591f3fd37f1595e5fa923b520c35f3688ef66a8d3a026bdcadc8cf61e1758ee02cc56e363d24ef5b3f489e02d8d109
-  data.tar.gz: 3b190ce2851417736cee98e68373334be12b41f542d106ced0c53e5b1c1fbd1b59bdc503a870db8a6eca96c23e01fdc1767d656a039105594c3eb7b34a7563e4
+  metadata.gz: 42b060b29d1138587a0c7078d2be9150c37238b06f158256e28c84054faf48e3aed652821d92a200440a6322da9b11dee666ed078c8df5d68891dff76d139551
+  data.tar.gz: 62145bed7d6c5a2235abae4f5f69c7b6eaa6b11f939975001e8f97231fbbf2c694c40bb982fb8597d6cae9e90678eb719bb1c2126cef72acb6a349438608343f

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 9.16.0
+
+* GovukPrometheus - custom labels from rack env ([#424](https://github.com/alphagov/govuk_app_config/pull/424))
+
+# 9.15.8
+
+* Update dependencies
+
 # 9.15.7
 
 * 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.71.0"
+  spec.add_dependency "opentelemetry-instrumentation-all", ">= 0.39.1", "< 0.72.0"
   spec.add_dependency "opentelemetry-sdk", "~> 1.2"
   spec.add_dependency "plek", ">= 4", "< 6"
   spec.add_dependency "prometheus_exporter", "~> 2.0"

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.7".freeze
+  VERSION = "9.16.0".freeze
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: govuk_app_config
 version: !ruby/object:Gem::Version
-  version: 9.15.7
+  version: 9.16.0
 platform: ruby
 authors:
 - GOV.UK Dev
 bindir: exe
 cert_chain: []
-date: 2025-01-02 00:00:00.000000000 Z
+date: 2025-01-15 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.71.0
+        version: 0.72.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.71.0
+        version: 0.72.0
 - !ruby/object:Gem::Dependency
   name: opentelemetry-sdk
   requirement: !ruby/object:Gem::Requirement