govuk_app_config 4.2.0 → 4.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1c91ef4af1e3ddee565df434c56247bd49948c2c610a37add40f2f1c9ecfd58
-  data.tar.gz: 653a72692c7fbbe97f5717adac39d282a54834e05b2d934d6c2d5c22a8671000
+  metadata.gz: eb506313e290785cf67cdecc360b8c6ba266094d05b1c2f9dcf855d57f5cb91f
+  data.tar.gz: a35c48a545dcb92963700ef26d2bad0452f9d7aec9f431788d7552a5c26984ac
 SHA512:
-  metadata.gz: ba9588d5172ca683b37ebbe74768fa1fc040c2b7b7aedf7bb7c794f14f15ae5c0b16689293a601ad3d8247d20155fb18f53d8c76aef6ffe6a769549bf1162aca
-  data.tar.gz: b23829fa60d1c5cb50f0ace75d5c26e8dd6daab88344bdb4dfb33e6690fd70c959885e23c3996240474fd27de4b0aa02f11f151570424a5c0b9cd99bdfb666f5
+  metadata.gz: 8cfebe4bfa7484068b432ee2629e65950f22ddba009e004dac325aa453301f40506f5f8194deb9de61a6b610b5d2ceb1945d875ac16230691737f3d6fbb7f2f3
+  data.tar.gz: eac23452670a9b4cee3c613b9e7f9914dd3a4fa5887875add19f92c78676d3edac499e3c31f6f4eeed4d6b18e9f0ce514d1ff4acc8184f52b2c9480b452e311f

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+# 4.4.1
+
+- Fix issue where GovukPrometheusExporter module prevented the gem to load due to missing constant "PrometheusExporter" ([#224](https://github.com/alphagov/govuk_app_config/pull/224)).
+- Lazy load the prometheus_exporter dependency for only apps that use GovukPrometheusExporter ([#224](https://github.com/alphagov/govuk_app_config/pull/224)).
+
+# 4.4.0
+
+- Add GovukPrometheusModule, to allow for export of prometheus metrics ([#223](https://github.com/alphagov/govuk_app_config/pull/223)).
+
+# 4.3.0
+
+- Remove Speedcurve's LUX from the connect-src policy ([#216](https://github.com/alphagov/govuk_app_config/pull/216)).
+
 # 4.2.0
 
 - Add pluralisation rules for Azerbaijani, Persian, Georgian, and Turkish. ([#219](https://github.com/alphagov/govuk_app_config/pull/219))

data/govuk_app_config.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = %w[lib]
 
   spec.add_dependency "logstasher", ">= 1.2.2", "< 2.2.0"
+  spec.add_dependency "prometheus_exporter", "~> 2.0.2"
   spec.add_dependency "puma", "~> 5.0"
   spec.add_dependency "sentry-rails", "~> 4.5.0"
   spec.add_dependency "sentry-ruby", "~> 4.5.0"

data/lib/govuk_app_config/govuk_content_security_policy.rb

@@ -78,13 +78,7 @@ module GovukContentSecurityPolicy
                        # Allow JSON call to klick2contact - HMPO web chat provider
                        "hmpowebchat.klick2contact.com",
                        # Allow connecting to Verify to check whether the user is logged in
-                       "www.signin.service.gov.uk",
-                       # Allow connection to Speedcurve's CDN for LUX - used for
-                       # real user metrics on GOV.UK. This loads using an image
-                       # (see image policy), but returns a JavaScript file -
-                       # which is why this has to be added to the `connect-src`
-                       # policy as well.
-                       "lux.speedcurve.com"
+                       "www.signin.service.gov.uk"
 
     # Disallow all <object>, <embed>, and <applet> elements
     #

data/lib/govuk_app_config/govuk_prometheus_exporter.rb

@@ -0,0 +1,14 @@
+module GovukPrometheusExporter
+  def self.configure
+    unless Rails.env == "test"
+      require "prometheus_exporter"
+      require "prometheus_exporter/server"
+      require "prometheus_exporter/middleware"
+
+      server = PrometheusExporter::Server::WebServer.new bind: "localhost", port: 9394
+      server.start
+
+      Rails.application.middleware.unshift PrometheusExporter::Middleware
+    end
+  end
+end

data/lib/govuk_app_config/version.rb

@@ -1,3 +1,3 @@
 module GovukAppConfig
-  VERSION = "4.2.0".freeze
+  VERSION = "4.4.1".freeze
 end

data/lib/govuk_app_config.rb

@@ -8,6 +8,7 @@ require "govuk_app_config/govuk_i18n"
 require "govuk_app_config/govuk_unicorn"
 
 if defined?(Rails)
+  require "govuk_app_config/govuk_prometheus_exporter"
   require "govuk_app_config/govuk_logging"
   require "govuk_app_config/govuk_content_security_policy"
   require "govuk_app_config/railtie"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_app_config
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.4.1
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-20 00:00:00.000000000 Z
+date: 2022-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstasher
@@ -30,6 +30,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.2.0
+- !ruby/object:Gem::Dependency
+  name: prometheus_exporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -268,6 +282,7 @@ files:
 - lib/govuk_app_config/govuk_healthcheck/sidekiq_redis.rb
 - lib/govuk_app_config/govuk_i18n.rb
 - lib/govuk_app_config/govuk_logging.rb
+- lib/govuk_app_config/govuk_prometheus_exporter.rb
 - lib/govuk_app_config/govuk_puma.rb
 - lib/govuk_app_config/govuk_statsd.rb
 - lib/govuk_app_config/govuk_unicorn.rb