govuk_app_config 8.0.0 → 8.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1dd070d1b3a41bd0eb7345fa619c18b3c611d279e6688c8e3565c3dbdc92a2e
-  data.tar.gz: 14e16cb4227f681a38e36abceb7e693d0fec5db388d5d87ec195942be0e325d9
+  metadata.gz: 29a6672c834922901fdc98c77a61b43c12a3455ed1445419e3cc2132a52bd6a0
+  data.tar.gz: b91182c0cb0bd09f95a34703e72271afc71479742e1e5177dd3310d8b7b0439e
 SHA512:
-  metadata.gz: 0c16cc5b73d5ffb2d1c5ec1ed0b6479f32a781b9747864454799f08302a719840bdc816317a78c76c9cbeeb8eec90c79958c3fbd9fac7a008bab828fe4a9a852
-  data.tar.gz: 11b23903b16b594015f04d00f6bfff838ce7e89d1dd25bcc15cea50f65cc2c36dbe910acf1cc0c3cc31786f2059d5560f968a1804546082c6f4c88aba1dca213
+  metadata.gz: 9a54c8f6c22ed6157735dfbbfebdd35b5d5264d9d972bfc705cf73429acb0afa5d60e162bda3202208a6d5f3a278c6a66de8d37ac02aca2b8f90994f58cd8e3a
+  data.tar.gz: 22cc9d0cc5c942ae89f05e55dfcbf0a47f51d0a7c7fd3df7d10fdb255ff2e4e46a7b81f488f91080a2cb5077c0ebc4828a6a49b85083179dfa124408ca6cda57

data/.github/workflows/ci.yml

@@ -1,4 +1,15 @@
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+  workflow_dispatch:
+    inputs:
+      ref:
+        description: 'The branch, tag or SHA to checkout'
+        default: main
+        type: string
+
 jobs:
   # Run the test suite against multiple Ruby and Rails versions
   test_matrix:
@@ -10,6 +21,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
+      with:
+        ref: ${{ inputs.ref || github.ref }}
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
@@ -24,7 +37,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - run: echo "All matrix tests have passed 🚀"
-     
+
   publish:
     needs: test
     if: ${{ github.ref == 'refs/heads/main' }}

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 8.0.2
+
+* Fix the ability to collect Sidekiq metrics in GovukPrometheusExporter. ([#299](https://github.com/alphagov/govuk_app_config/pull/299))
+
+# 8.0.1
+
+* Change the "source" field in Rails logs from logstasher from string representing IP host address to an empty object. 
+
 # 8.0.0
 
 * BREAKING: Content Security Policy forbids the use of inline style attributes.

data/lib/govuk_app_config/govuk_logging.rb

@@ -48,6 +48,10 @@ module GovukLogging
     Rails.application.config.logstasher.view_enabled = false
     Rails.application.config.logstasher.job_enabled = false
 
+    # Elasticsearch index expect source to be an object and logstash defaults
+    # source to be the host IP address causing logs to be dropped.
+    Rails.application.config.logstasher.source = {}
+
     Rails.application.config.logstasher.logger = Logger.new(
       $real_stdout, # rubocop:disable Style/GlobalVars
       level: Rails.logger.level,

data/lib/govuk_app_config/govuk_prometheus_exporter.rb

@@ -20,6 +20,7 @@ module GovukPrometheusExporter
 
     if defined?(Sidekiq)
       Sidekiq.configure_server do |config|
+        require "sidekiq/api"
         require "prometheus_exporter/instrumentation"
         config.server_middleware do |chain|
           chain.add PrometheusExporter::Instrumentation::Sidekiq

data/lib/govuk_app_config/version.rb

@@ -1,3 +1,3 @@
 module GovukAppConfig
-  VERSION = "8.0.0".freeze
+  VERSION = "8.0.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_app_config
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 8.0.2
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-02 00:00:00.000000000 Z
+date: 2023-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstasher
@@ -321,7 +321,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.13
+rubygems_version: 3.4.14
 signing_key: 
 specification_version: 4
 summary: Base configuration for GOV.UK applications