Remove X-Ray

alphagov · Aug 29, 2019 · f16fd46 · f16fd46
1 parent 79f08e8
commit f16fd46
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 45 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,5 @@
+* Remove support for AWS X-Ray.
+
 # 1.20.2
 
 * Fix GdsApi::HTTPIntermittentServer errors no longer being filtered from

diff --git a/govuk_app_config.gemspec b/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"

diff --git a/lib/govuk_app_config.rb b/lib/govuk_app_config.rb
@@ -5,7 +5,6 @@
 # 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)

diff --git a/lib/govuk_app_config/govuk_xray.rb b/lib/govuk_app_config/govuk_xray.rb
diff --git a/lib/govuk_app_config/railtie.rb b/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