govuk_app_config 9.20.5 → 9.20.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a984cae6a3e912f05a3401daad61575f085397dd96fe4a03e764b5f6ca5e708e
4
- data.tar.gz: e1033e6ae1a0229c6c07cf4335e871e192e3d6672a840d3ecf2ac7d35f0508b2
3
+ metadata.gz: 6d890061b1990db044c89f4c31fed65e51d998eed2f04244583d1847ef0ff529
4
+ data.tar.gz: d0b005ebc90dff57236d3333c90deb2e1a1109db9fdc13948467e31eab811c46
5
5
  SHA512:
6
- metadata.gz: 07231d921b82731363b300460fb88f80a4c38ddde1cd1f0b05bf302576fc04a95ab3af02fa2b6e0c1200279250991df396ef60285424d1b3d65909b55f62d357
7
- data.tar.gz: dd4f6856199a3fbbba636e561ec498fbb06b16576711aa17646c38672b42e55e0a127feb7016f2ab3167fe2986c63d2fbb31f40f66071430b6138262c56399ba
6
+ metadata.gz: a55c37c0f123e51a001b1f565bbf785afa7b9b7ee33ffa92ac3aaf3b976ed3cbbf8e3c181734feb5a0d966662d37a9d2c3692dea73727072c49f2b1bbc64558c
7
+ data.tar.gz: 37cf53f1c027503cb0603475c4ea9c46fe421559388f045867fa25233b90353ec6c500b9030dd08d2585c5ed219bc82cdf942f4e27e4847d6ad251c72a00a44d
@@ -38,7 +38,7 @@ jobs:
38
38
  - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
39
39
  with:
40
40
  ref: ${{ inputs.ref || github.ref }}
41
- - uses: ruby/setup-ruby@ab177d40ee5483edb974554986f56b33477e21d0 # v1.265.0
41
+ - uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25 # v1.267.0
42
42
  with:
43
43
  ruby-version: ${{ matrix.ruby }}
44
44
  bundler-cache: true
data/CHANGELOG.md CHANGED
@@ -1,3 +1,11 @@
1
+ # 9.20.7
2
+
3
+ * Implemented workaround for Logstasher initializer conflict under Rails 8.1
4
+
5
+ # 9.20.6
6
+
7
+ * Update dependencies
8
+
1
9
  # 9.20.5
2
10
 
3
11
  * Update dependencies
@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
22
22
 
23
23
  spec.add_dependency "logstasher", "~> 2.1"
24
24
  spec.add_dependency "opentelemetry-exporter-otlp", ">= 0.25", "< 0.32"
25
- spec.add_dependency "opentelemetry-instrumentation-all", ">= 0.39.1", "< 0.86.0"
25
+ spec.add_dependency "opentelemetry-instrumentation-all", ">= 0.39.1", "< 0.87.0"
26
26
  spec.add_dependency "opentelemetry-sdk", "~> 1.2"
27
27
  spec.add_dependency "plek", ">= 4", "< 6"
28
28
  spec.add_dependency "prometheus_exporter", "~> 2.3"
@@ -1,5 +1,20 @@
1
1
  require "plek"
2
2
 
3
+ # Workaround for Logstasher initializer conflict under Rails 8.1
4
+ begin
5
+ require "logstasher/railtie"
6
+
7
+ if defined?(LogStasher::Railtie)
8
+ # Remove duplicate initializers that cause cyclic dependency
9
+ LogStasher::Railtie.initializers.delete_if { |i| i.name == :logstasher }
10
+
11
+ # Replace with a single clean initializer
12
+ LogStasher::Railtie.initializer(:logstasher_fixed, after: :load_config_initializers) {}
13
+ end
14
+ rescue LoadError, NameError
15
+ # Skip if Logstasher not present
16
+ end
17
+
3
18
  module GovukAppConfig
4
19
  class Railtie < Rails::Railtie
5
20
  initializer "govuk_app_config.configure_govuk_proxy" do |app|
@@ -1,3 +1,3 @@
1
1
  module GovukAppConfig
2
- VERSION = "9.20.5".freeze
2
+ VERSION = "9.20.7".freeze
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: govuk_app_config
3
3
  version: !ruby/object:Gem::Version
4
- version: 9.20.5
4
+ version: 9.20.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - GOV.UK Dev
@@ -52,7 +52,7 @@ dependencies:
52
52
  version: 0.39.1
53
53
  - - "<"
54
54
  - !ruby/object:Gem::Version
55
- version: 0.86.0
55
+ version: 0.87.0
56
56
  type: :runtime
57
57
  prerelease: false
58
58
  version_requirements: !ruby/object:Gem::Requirement
@@ -62,7 +62,7 @@ dependencies:
62
62
  version: 0.39.1
63
63
  - - "<"
64
64
  - !ruby/object:Gem::Version
65
- version: 0.86.0
65
+ version: 0.87.0
66
66
  - !ruby/object:Gem::Dependency
67
67
  name: opentelemetry-sdk
68
68
  requirement: !ruby/object:Gem::Requirement