govuk_app_config 1.10.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c62ff2c26e73e0ccd1cba0bef98975ae44bfab904c178b8c21809976e4691ce1
-  data.tar.gz: 20017d561912281a14ee43c33005a52818d93ac22c3978807f14e5230483da48
+  metadata.gz: 3c943fd979fbb5e966e217f83e21a5815657b5b251eee70badb6a09a35611d4b
+  data.tar.gz: bd0f48f895a4b478cbdb9765347624f9eac4ce436946f589dfe318e64c6cece3
 SHA512:
-  metadata.gz: f34561648d21a511d5423487401597f5d5be1404d79f2cfb14118730869b86dce0ba3cbc80990d098177081fe1b09a2f160df5f6831239ff0d3124bb24836a65
-  data.tar.gz: e1fdd04a78bba8a0ac959e05240a83fafe21f3f9187565122495c6a5efc164e34c5c59b390f1cfee960b02811a02c16479585a10ad2d155a58cd2c194e9a95ff
+  metadata.gz: 9090d96be4367e26206666daa7aa7905351e8bb29fea43ed1d373ac4e20afb0f5e290f2af8b76eccb217bcdff12f2c9fbfe269744972a418221364137600eb4c
+  data.tar.gz: 75058dbf38294232c6a34c886dd313ca413da9f6afcf91de104deb239f972bbd2dfbe2c6efa95e1c196b70b5cf78e5094fb1e630ab0a834fe704999eed8e5a54

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.11.0
+
+* Disable X-Ray entirely if the `GOVUK_APP_CONFIG_DISABLE_XRAY`
+  environment variable is set.
+
 # 1.10.0
 
 * Only instrument the `aws_sdk` gem with AWS X-Ray if the

data/lib/govuk_app_config/railtie.rb

@@ -1,8 +1,7 @@
 module GovukAppConfig
   class Railtie < Rails::Railtie
-
     initializer('govuk_app_config') do |app|
-      GovukXRay.initialize(app) if Rails.env.production?
+      GovukXRay.initialize(app) if enable_railtie_for?('xray')
     end
 
     config.before_initialize do
@@ -10,7 +9,11 @@ module GovukAppConfig
     end
 
     config.after_initialize do
-      GovukXRay.start if Rails.env.production?
+      GovukXRay.start if enable_railtie_for?('xray')
+    end
+
+    def self.enable_railtie_for?(name)
+      Rails.env.production? && !ENV.has_key?("GOVUK_APP_CONFIG_DISABLE_#{name.upcase}")
     end
   end
 end

data/lib/govuk_app_config/version.rb

@@ -1,3 +1,3 @@
 module GovukAppConfig
-  VERSION = "1.10.0"
+  VERSION = "1.11.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_app_config
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-04 00:00:00.000000000 Z
+date: 2019-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-xray-sdk