govuk_app_config 1.20.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b1731a99ecfb353b1a6966e1130a9672063bf88860ddba6e138eb293a26bd5f
-  data.tar.gz: a1e6eac2ed3cae975f2d70e4a6cf8f4fa57bc68c30c706d7bf59bb83afaab9eb
+  metadata.gz: d095181af00a273d5c4735c509da18678cfcc86747139d257ba6f88f4857106f
+  data.tar.gz: 74837394f4cd9f10a10dd0ba1b8a6f99d7df183bab0481c68edb8bcd8377bdc0
 SHA512:
-  metadata.gz: 899cc76ce800f97d336c17d773a11f30fdb81f07d40089c4196ce5e679947445a3d2460ca271eeaa21c3c598f0ac1602ee53bc6b803395aa4f3d264c000026d3
-  data.tar.gz: bb9a67f24fec523f852df233304ae6d77c91176c85f25c595598ff7b7a39193c652172682d8cb7fefd868affd89f93a2f4b8423f1f64b1dfc267cf7454d34e72
+  metadata.gz: 0276ab12ade1cbbfc9469830c2fd0d36fba74f9cf96bc67d162adbd749761da96c866207f14a69ca89e0619642ef26bfaee10fd62ff9589a0e151cbb548f847c
+  data.tar.gz: 673b25db9f343d4595db63c757a287f2e0bbbb27a9300cdfdf9ac51acd77654758e5acaa2e5be434f77b80ac04cf1b190e18f9245b34631b2a3dcf8114eaf596

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.0.0
+
+* Remove support for AWS X-Ray.
+
 # 1.20.2
 
 * Fix GdsApi::HTTPIntermittentServer errors no longer being filtered from

data/govuk_app_config.gemspec

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

data/lib/govuk_app_config/railtie.rb

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

data/lib/govuk_app_config/version.rb

@@ -1,3 +1,3 @@
 module GovukAppConfig
-  VERSION = "1.20.2"
+  VERSION = "2.0.0"
 end

data/lib/govuk_app_config.rb

@@ -5,7 +5,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"
 
 if defined?(Rails)

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: govuk_app_config
 version: !ruby/object:Gem::Version
-  version: 1.20.2
+  version: 2.0.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-05 00:00:00.000000000 Z
+date: 2019-08-29 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: logstasher
   requirement: !ruby/object:Gem::Requirement
@@ -232,7 +218,6 @@ 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

data/lib/govuk_app_config/govuk_xray.rb

@@ -1,35 +0,0 @@
-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
-    # patching 'aws_sdk' seem to impose a large memory overhead, so
-    # don't do that by default
-    patch = ENV.has_key?('XRAY_PATCH_AWS_SDK') ?
-               %I[aws_sdk net_http] : %I[net_http]
-
-    # if there isn't a name set, attempting to record a segment will
-    # throw an error
-    govuk_app_name = ENV['GOVUK_APP_NAME']
-    name = govuk_app_name.blank? ? 'xray' : govuk_app_name
-
-    XRay.recorder.configure(
-      name: name,
-      patch: patch,
-      context_missing: 'LOG_ERROR',
-      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