govuk_app_config 9.9.2 → 9.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd5ab24be74e10e455ab5037df2b7db8dd2d9415391a0cf18c09b50085164901
-  data.tar.gz: e16f29b41ecb3289088302a01bdc543c86bf133f7616aa9bff4f79459c44b492
+  metadata.gz: 3bf6ae30aec5a886810a0b912444c0b97ea69e939cd8923f7fae4d1a29083f22
+  data.tar.gz: 7651211aa7ec14d12260e75d3d979fe706c2541d87d3d2ff58dae8cb8b6f61c5
 SHA512:
-  metadata.gz: 369842d9fc8db71caf3b1593743d630466d4c798d5f410bdd67d9e1a87f685fbdaf14ba8ad95bed7da8517966bd27eb49553edadf319211a43fdb1d29f05ba2b
-  data.tar.gz: 0c2973e3a19077624e010b55a7043d82c14ff2a60f2652dfc2895275b9413c5a0892d1cc5abb7a01b133077e92ac4c45fb055b47d6d18134aa9b7a2057320745
+  metadata.gz: 50113bab587d2bbe40d045020871943cf090a9503c26c100faf642c43f06d3baeeda8f98220622f2fb8fec4c29c4ca51d181d2ff449f7a736efc3dc57ff7fb57
+  data.tar.gz: e94c092a17c03154d43f0d226f5897c88b2fcc8aefe9b3f3ffca7b0377d7b08328d474024e0d3d8c666a48d21b5b9775c4170a1f25c76f8926bfe4d148ecb0d4

data/.github/workflows/autorelease.yml

@@ -0,0 +1,10 @@
+on:
+  workflow_dispatch: {}
+  schedule:
+    - cron: '00 13 * * 2'
+
+jobs:
+  autorelease:
+    uses: alphagov/govuk-infrastructure/.github/workflows/autorelease-rubygem.yml@main
+    secrets:
+      GH_TOKEN: ${{ secrets.GOVUK_CI_GITHUB_API_TOKEN }}

data/.github/workflows/ci.yml

@@ -14,7 +14,13 @@ jobs:
   snyk-security:
     name: SNYK security analysis
     uses: alphagov/govuk-infrastructure/.github/workflows/snyk-security.yml@main
+    with:
+      skip_sca: true
     secrets: inherit
+    permissions:
+      contents: read
+      security-events: write
+      actions: read
   
   codeql-sast:
     name: CodeQL SAST scan

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 9.10.0
+
+* Simplify the logic for deciding whether to initialize `GovukPrometheusExporter`. `GovukPrometheusExporter` provides the `/metrics` webserver and "exporter" process for aggregating counters in multi-process apps. govuk_app_config will now always attempt to initialize GovukPrometheusExporter except when running under `rails console`. The `GOVUK_PROMETHEUS_EXPORTER` environment variable no longer has any effect.
+
 # 9.9.2
 
 * Add single cookie consent api URLs ([#355](https://github.com/alphagov/govuk_app_config/pull/355))

data/govuk_app_config.gemspec

@@ -39,6 +39,6 @@ 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", "~> 1.3"
-  spec.add_development_dependency "rubocop-govuk", "4.14.0"
+  spec.add_development_dependency "rubocop-govuk", "4.16.1"
   spec.add_development_dependency "webmock"
 end

data/lib/govuk_app_config/govuk_prometheus_exporter.rb

@@ -42,15 +42,7 @@ module GovukPrometheusExporter
   end
 
   def self.should_configure
-    # Allow us to force the Prometheus Exporter for persistent Rake tasks...
-    if ENV["GOVUK_PROMETHEUS_EXPORTER"] == "force"
-      true
-    elsif File.basename($PROGRAM_NAME) == "rake" ||
-        defined?(Rails) && (Rails.const_defined?("Console") || Rails.env == "test")
-      false
-    else
-      ENV["GOVUK_PROMETHEUS_EXPORTER"] == "true"
-    end
+    !(defined?(Rails) && Rails.const_defined?("Console"))
   end
 
   def self.configure(collectors: [], default_aggregation: PrometheusExporter::Metric::Histogram)
@@ -81,9 +73,7 @@ module GovukPrometheusExporter
 
     begin
       server = PrometheusExporter::Server::WebServer.new bind: "0.0.0.0", port: 9394
-
-      collectors.each { |collector| server.collector.register_collector(collector.new) }
-
+      collectors.each { |c| server.collector.register_collector(c.new) }
       server.start
 
       if defined?(Rails)
@@ -94,7 +84,7 @@ module GovukPrometheusExporter
         Sinatra.use SinatraMiddleware
       end
     rescue Errno::EADDRINUSE
-      warn "Could not start Prometheus metrics server as address already in use."
+      warn "not starting Prometheus metrics server: address already in use"
     end
   end
 end

data/lib/govuk_app_config/version.rb

@@ -1,3 +1,3 @@
 module GovukAppConfig
-  VERSION = "9.9.2".freeze
+  VERSION = "9.10.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_app_config
 version: !ruby/object:Gem::Version
-  version: 9.9.2
+  version: 9.10.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-03-05 00:00:00.000000000 Z
+date: 2024-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstasher
@@ -292,14 +292,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.14.0
+        version: 4.16.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.14.0
+        version: 4.16.1
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -322,6 +322,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/dependabot.yml"
+- ".github/workflows/autorelease.yml"
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - ".govuk_dependabot_merger.yml"
@@ -376,7 +377,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.5.7
 signing_key: 
 specification_version: 4
 summary: Base configuration for GOV.UK applications