govuk_app_config 9.20.7 → 9.22.0

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.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +8 -0
  3. data/govuk_app_config.gemspec +1 -1
  4. data/lib/govuk_app_config/govuk_content_security_policy.rb +3 -1
  5. data/lib/govuk_app_config/govuk_puma.rb +9 -0
  6. data/lib/govuk_app_config/version.rb +1 -1
  7. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 6d890061b1990db044c89f4c31fed65e51d998eed2f04244583d1847ef0ff529
4
- data.tar.gz: d0b005ebc90dff57236d3333c90deb2e1a1109db9fdc13948467e31eab811c46
3
+ metadata.gz: d275418b49c8fde595b6137641c2efc0965cf7e40b5b53ac76776c1b61721922
4
+ data.tar.gz: 8ef6d11565e3e94b70724695db1467f5fdc72e76b97f50b2beffa4f94489c368
5
5
  SHA512:
6
- metadata.gz: a55c37c0f123e51a001b1f565bbf785afa7b9b7ee33ffa92ac3aaf3b976ed3cbbf8e3c181734feb5a0d966662d37a9d2c3692dea73727072c49f2b1bbc64558c
7
- data.tar.gz: 37cf53f1c027503cb0603475c4ea9c46fe421559388f045867fa25233b90353ec6c500b9030dd08d2585c5ed219bc82cdf942f4e27e4847d6ad251c72a00a44d
6
+ metadata.gz: ca7e388c8e543840291ce5911db20083da18b961cbe373a7cb6b41f826ede5c32f31b6bee5a7c1066086e72b0769d4f112ccd00f73c1e2ca417da52a6354b675
7
+ data.tar.gz: 9d00d7a7be7958c06445a451c2df5e450a7bf13237897aafafc579607fa08af852ebadeb5ea5dff240c44370e29e1cae6b0bb2e4ebefa14ec5505bf96145432f
data/CHANGELOG.md CHANGED
@@ -1,3 +1,11 @@
1
+ # 9.22.0
2
+
3
+ * Add extra google analytics domains to content security policy
4
+
5
+ # 9.21.0
6
+
7
+ * Add Prometheus monitoring of Puma processes
8
+
1
9
  # 9.20.7
2
10
 
3
11
  * Implemented workaround for Logstasher initializer conflict under Rails 8.1
data/govuk_app_config.gemspec CHANGED
@@ -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.87.0"
25
+ spec.add_dependency "opentelemetry-instrumentation-all", ">= 0.39.1", "< 0.88.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"
data/lib/govuk_app_config/govuk_content_security_policy.rb CHANGED
@@ -20,7 +20,9 @@ module GovukContentSecurityPolicy
20
20
  stats.g.doubleclick.net
21
21
  www.googletagmanager.com
22
22
  www.region1.google-analytics.com
23
- region1.google-analytics.com].freeze
23
+ region1.google-analytics.com
24
+ region1.analytics.google.com
25
+ www.google.co.uk].freeze
24
26
 
25
27
  GOOGLE_STATIC_DOMAINS = %w[www.gstatic.com].freeze
26
28
 
data/lib/govuk_app_config/govuk_puma.rb CHANGED
@@ -1,3 +1,5 @@
1
+ require "prometheus_exporter/instrumentation"
2
+
1
3
  module GovukPuma
2
4
  def self.configure_rails(config)
3
5
  config.port ENV.fetch("PORT", 3000)
@@ -35,6 +37,13 @@ module GovukPuma
35
37
  ENV["BUNDLE_GEMFILE"] = "#{ENV['GOVUK_APP_ROOT']}/Gemfile"
36
38
  end
37
39
 
40
+ config.after_worker_boot do
41
+ unless PrometheusExporter::Instrumentation::Puma.started?
42
+ PrometheusExporter::Instrumentation::Puma.start
43
+ end
44
+ PrometheusExporter::Instrumentation::Process.start(type: "puma_worker")
45
+ end
46
+
38
47
  # Allow puma to be restarted by `rails restart` command.
39
48
  config.plugin :tmp_restart
40
49
  end
data/lib/govuk_app_config/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module GovukAppConfig
2
- VERSION = "9.20.7".freeze
2
+ VERSION = "9.22.0".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.7
4
+ version: 9.22.0
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.87.0
55
+ version: 0.88.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.87.0
65
+ version: 0.88.0
66
66
  - !ruby/object:Gem::Dependency
67
67
  name: opentelemetry-sdk
68
68
  requirement: !ruby/object:Gem::Requirement