govuk_app_config 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3756aa3c504162388cd3edb39b03affb14615298d6ed92fe2080e4b77309722f
-  data.tar.gz: 9d52a0f64638b08eb1f0707515e2c8fcb157576324bee1923bfe5c3eced0c694
+  metadata.gz: 0eb703d633019c261beacc5297b8620227a7c1e2948e469f88662ecab13fe440
+  data.tar.gz: 04a12ed7107d261d406897952c1fb66953497d52d2b3ee41658d75373f9961f9
 SHA512:
-  metadata.gz: d805891e750f29125b84ad101bb7d1d26fdc5eaae602cd56d2f2001a613617f578c216b984bc4be9df2f4a99bcbd60d866ad7e82b4e026e37f5e42d49afdea08
-  data.tar.gz: ff802243682c4934a2fe97fe37c1cb46a0c0abc5d8b4ae76d7b98e1a96e625b13c358b07a5508fcb9915c8fea73b81a9d8a1030b7872471bc9a0ae5be6ac75bb
+  metadata.gz: 11bcd19aa0c4de45d061f6a3ef084854a0e05c66cc609ae6e58a0b04fc5a125cb9df7979aa8e00c98e33ff08c7cc8055982c7c7c22f9aaf6740bdaad0bda8f0b
+  data.tar.gz: fe634e1aeb3efe7f75773ea9a5a081288b55fa4868359d51cd05e23c57f828d53f4c7469a933ff970093e7698baa47e6e483dbdb585f230200b7f15d32fcb939

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.9.0
+
+* Record 1% of requests with AWS X-Ray.
+
 # 1.8.0
 
 * Handle a health check which raises an exception.

data/govuk_app_config.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "aws-xray-sdk", "~> 0.10.0"
   spec.add_dependency "statsd-ruby", "~> 1.4.0"
   spec.add_dependency "logstasher", "~> 1.2.2"
   spec.add_dependency "sentry-raven", "~> 2.7.1"

data/lib/govuk_app_config/govuk_xray.rb

@@ -0,0 +1,28 @@
+require 'aws-xray-sdk/facets/rack'
+require 'aws-xray-sdk/facets/rails/ex_middleware'
+
+module GovukXRay
+  def self.initialize(app)
+    app.middleware.insert 0, XRay::Rack::Middleware
+    app.middleware.use XRay::Rails::ExceptionMiddleware
+  end
+
+  def self.start
+    # if aws-sdk is loaded, we want to instrument that too
+    patch = Gem.loaded_specs.has_key?('aws-sdk-core') ?
+              %I[aws_sdk net_http] : %I[net_http]
+
+    XRay.recorder.configure(
+      name: ENV['GOVUK_APP_NAME'].to_s,
+      patch: patch,
+      sampling_rules: {
+        version: 1,
+        default: {
+          'fixed_target': ENV.fetch('XRAY_SAMPLE_TARGET', 0).to_i,
+          'rate': ENV.fetch('XRAY_SAMPLE_RATE', 0.01).to_f,
+        },
+        rules: [],
+      },
+    )
+  end
+end

data/lib/govuk_app_config/railtie.rb

@@ -1,7 +1,16 @@
 module GovukAppConfig
   class Railtie < Rails::Railtie
+
+    initializer('govuk_app_config') do |app|
+      GovukXRay.initialize(app) if Rails.env.production?
+    end
+
     config.before_initialize do
       GovukLogging.configure if Rails.env.production?
     end
+
+    config.after_initialize do
+      GovukXRay.start if Rails.env.production?
+    end
   end
 end

data/lib/govuk_app_config/version.rb

@@ -1,3 +1,3 @@
 module GovukAppConfig
-  VERSION = "1.8.0"
+  VERSION = "1.9.0"
 end

data/lib/govuk_app_config.rb

@@ -6,5 +6,6 @@ require "govuk_app_config/govuk_healthcheck"
 # 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_xray"
 require "govuk_app_config/configure"
 require "govuk_app_config/railtie" if defined?(Rails)

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: govuk_app_config
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-06 00:00:00.000000000 Z
+date: 2018-09-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: aws-xray-sdk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: statsd-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -199,6 +213,7 @@ files:
 - lib/govuk_app_config/govuk_logging.rb
 - lib/govuk_app_config/govuk_statsd.rb
 - lib/govuk_app_config/govuk_unicorn.rb
+- lib/govuk_app_config/govuk_xray.rb
 - lib/govuk_app_config/railtie.rb
 - lib/govuk_app_config/version.rb
 homepage: https://github.com/alphagov/govuk_app_config