From 72bbbe9f1c0faa7e7cd2c428a76268dad278f25d Mon Sep 17 00:00:00 2001 From: Trey Pendragon Date: Wed, 13 Dec 2017 14:57:24 -0800 Subject: [PATCH] No more datadog. --- Gemfile | 1 - Gemfile.lock | 4 ---- config/initializers/datadog.rb | 36 +++++++++++++++++----------------- 3 files changed, 18 insertions(+), 23 deletions(-) diff --git a/Gemfile b/Gemfile index aa8e6bbf..220c19f0 100644 --- a/Gemfile +++ b/Gemfile @@ -98,5 +98,4 @@ gem 'spotlight-resources-iiif', github: 'pulibrary/spotlight-resources-iiif', br gem 'newrelic_rpm' gem 'dalli' gem 'ruby-prof', require: false -gem 'ddtrace' gem 'honeybadger', '~> 2.0' diff --git a/Gemfile.lock b/Gemfile.lock index ffd1f6e3..c1dd0d6f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -220,8 +220,6 @@ GEM safe_yaml (~> 1.0.0) dalli (2.7.6) database_cleaner (1.5.3) - ddtrace (0.5.0) - msgpack debug_inspector (0.0.2) declarative (0.0.9) declarative-option (0.1.0) @@ -304,7 +302,6 @@ GEM mini_portile2 (2.1.0) minitest (5.10.1) modernizr-rails (2.7.1) - msgpack (1.0.3) multi_json (1.12.1) multi_xml (0.6.0) multipart-post (2.0.0) @@ -580,7 +577,6 @@ DEPENDENCIES coveralls dalli database_cleaner - ddtrace devise devise-guests (~> 0.3) devise_invitable diff --git a/config/initializers/datadog.rb b/config/initializers/datadog.rb index ecd1b428..becdee5b 100644 --- a/config/initializers/datadog.rb +++ b/config/initializers/datadog.rb @@ -2,22 +2,22 @@ require 'redis' if Rails.env.staging? || Rails.env.production? - require 'sidekiq' - require 'ddtrace' - require 'ddtrace/contrib/sidekiq/tracer' - Rails.configuration.datadog_trace = { - auto_instrument: true, - auto_instrument_redis: true, - default_service: "Plum (#{Rails.env})" - } - - Sidekiq.configure_server do |config| - config.server_middleware do |chain| - chain.add( - Datadog::Contrib::Sidekiq::Tracer, - sidekiq_service: 'sidekiq' - ) - end - end - Datadog::Monkey.patch_all + # require 'sidekiq' + # require 'ddtrace' + # require 'ddtrace/contrib/sidekiq/tracer' + # Rails.configuration.datadog_trace = { + # auto_instrument: true, + # auto_instrument_redis: true, + # default_service: "Plum (#{Rails.env})" + # } + # + # Sidekiq.configure_server do |config| + # config.server_middleware do |chain| + # chain.add( + # Datadog::Contrib::Sidekiq::Tracer, + # sidekiq_service: 'sidekiq' + # ) + # end + # end + # Datadog::Monkey.patch_all end