govuk_app_config 4.6.2 → 4.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f3849d5bf53877e6244bcda92162ec86e9a37c5788a491e1f436af79da3433e
-  data.tar.gz: 8d198f89774cf5962ae877e5437bff4025123c102645ac7d4a2b81b2525ef0c3
+  metadata.gz: 4980a3e44e9119b3542865caa4e07b57078c535e0eca7f3b6fb9952cf602080a
+  data.tar.gz: 8bcd1e8e02392e09241501dd23936a959d883833683aa1c9087938fbe095548d
 SHA512:
-  metadata.gz: e5c4e6173b2c7b41ff37430b603bb1d04dcc108fd24c4b374f2d4731512ce780fb1dd43d7bdd13a0bdc4e0948be48f4a6a6913cabb337ff1afe5a3110213d650
-  data.tar.gz: 3a810d79466ce2780c3e19b77da1edaf3a98546cc0ddbb28f6e10deb20558bc8a2eac44e1777af90be739138059176401535d75ff1bb918362e855fccb7ce1ca
+  metadata.gz: bd601933a5242b4e06135e36c5254b78002336cdac975726a4bde1eabb205827d797b175b5a50b52d5b0ef9536b5f74e1e9d56cda42910b8f144cea27bb5df63
+  data.tar.gz: 003c1505e61831f46160a768a4f990811b0513f94dce388d4cdc00242df74cf2812e3e1ff70a405d2e4d0c24d2ebb1694d0e8b6edef3d971523125cd8ceedc58

data/.github/workflows/ci.yml

@@ -24,33 +24,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - run: echo "All matrix tests have passed 🚀"
-
-  release:
+     
+  publish:
     needs: test
-    runs-on: ubuntu-latest
     if: ${{ github.ref == 'refs/heads/main' }}
     permissions:
       contents: write
-    steps:
-    - uses: actions/checkout@v3
-    - uses: ruby/setup-ruby@v1
-      with:
-        rubygems: latest
-    - env:
-        GEM_HOST_API_KEY: ${{ secrets.ALPHAGOV_RUBYGEMS_API_KEY }}
-        GEM_NAME: govuk_app_config
-      run: |
-        VERSION=$(ruby -e "puts eval(File.read('$GEM_NAME.gemspec')).version")
-        GEM_VERSION=$(gem list --exact --remote $GEM_NAME)
-
-        # Publish to RubyGems.org
-        if [ "${GEM_VERSION}" != "$GEM_NAME (${VERSION})" ]; then
-          gem build $GEM_NAME.gemspec
-          gem push "$GEM_NAME-${VERSION}.gem"
-        fi
-
-        # Create a release tag
-        if ! git ls-remote --tags --exit-code origin v${VERSION}; then
-          git tag v${VERSION}
-          git push --tags
-        fi
+    uses: alphagov/govuk-infrastructure/.github/workflows/publish-rubygem.yaml@main
+    secrets:
+      GEM_HOST_API_KEY: ${{ secrets.ALPHAGOV_RUBYGEMS_API_KEY }}

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 4.7.0
+
+- Adds Prometheus Sidekiq monitoring ([#255](https://github.com/alphagov/govuk_app_config/pull/255))
+
+# 4.6.3
+
+- Adds `region1.google-analytics.com` to the security policy for GA ([#250](https://github.com/alphagov/govuk_app_config/pull/250))
+
 # 4.6.2
 
 - Adds a new domain to the security policy for GA ([#248](https://https://github.com/alphagov/govuk_app_config/pull/248))

data/govuk_app_config.gemspec

@@ -30,11 +30,11 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "climate_control"
-  spec.add_development_dependency "rack-test", "~> 1.1"
+  spec.add_development_dependency "rack-test", "~> 2.0"
   spec.add_development_dependency "rails", "~> 7"
   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.4.0"
+  spec.add_development_dependency "rubocop-govuk", "4.6.0"
   spec.add_development_dependency "webmock"
 end

data/lib/govuk_app_config/govuk_content_security_policy.rb

@@ -19,7 +19,8 @@ module GovukContentSecurityPolicy
                                 ssl.google-analytics.com
                                 stats.g.doubleclick.net
                                 www.googletagmanager.com
-                                www.region1.google-analytics.com].freeze
+                                www.region1.google-analytics.com
+                                region1.google-analytics.com].freeze
 
   GOOGLE_STATIC_DOMAINS = %w[www.gstatic.com].freeze
 

data/lib/govuk_app_config/govuk_prometheus_exporter.rb

@@ -1,13 +1,40 @@
 module GovukPrometheusExporter
+  def self.should_configure
+    if File.basename($PROGRAM_NAME) == "rake" ||
+        defined?(Rails) && (Rails.const_defined?("Console") || Rails.env == "test")
+      false
+    else
+      ENV["GOVUK_PROMETHEUS_EXPORTER"] == "true"
+    end
+  end
+
   def self.configure
-    unless Rails.env == "test" || (ENV["GOVUK_PROMETHEUS_EXPORTER"]) != "true"
-      require "prometheus_exporter"
-      require "prometheus_exporter/server"
-      require "prometheus_exporter/middleware"
+    return unless should_configure
+
+    require "prometheus_exporter"
+    require "prometheus_exporter/server"
+    require "prometheus_exporter/middleware"
+
+    if defined?(Sidekiq)
+      Sidekiq.configure_server do |config|
+        require "prometheus_exporter/instrumentation"
+        config.server_middleware do |chain|
+          chain.add PrometheusExporter::Instrumentation::Sidekiq
+        end
+        config.death_handlers << PrometheusExporter::Instrumentation::Sidekiq.death_handler
+        config.on :startup do
+          PrometheusExporter::Instrumentation::Process.start(type: "sidekiq")
+          PrometheusExporter::Instrumentation::SidekiqProcess.start
+          PrometheusExporter::Instrumentation::SidekiqQueue.start
+          PrometheusExporter::Instrumentation::SidekiqStats.start
+        end
+      end
+    end
 
-      server = PrometheusExporter::Server::WebServer.new bind: "0.0.0.0", port: 9394
-      server.start
+    server = PrometheusExporter::Server::WebServer.new bind: "0.0.0.0", port: 9394
+    server.start
 
+    if defined?(Rails)
       Rails.application.middleware.unshift PrometheusExporter::Middleware
     end
   end

data/lib/govuk_app_config/version.rb

@@ -1,3 +1,3 @@
 module GovukAppConfig
-  VERSION = "4.6.2".freeze
+  VERSION = "4.7.1".freeze
 end

data/lib/govuk_app_config.rb

@@ -6,9 +6,9 @@ require "govuk_app_config/govuk_i18n"
 # This require is deprecated and should be removed on next major version bump
 # and should be required by applications directly.
 require "govuk_app_config/govuk_unicorn"
+require "govuk_app_config/govuk_prometheus_exporter"
 
 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.6.2
+  version: 4.7.1
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-17 00:00:00.000000000 Z
+date: 2022-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstasher
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -212,14 +212,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: 4.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: 4.6.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -296,7 +296,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.16
+rubygems_version: 3.3.20
 signing_key: 
 specification_version: 4
 summary: Base configuration for GOV.UK applications