diff --git a/Gemfile b/Gemfile index 93b697bd..9d81bedc 100644 --- a/Gemfile +++ b/Gemfile @@ -70,6 +70,7 @@ gem 'blacklight', '6.14.1' gem 'blacklight-spotlight', github: 'projectblacklight/spotlight', branch: "master" gem 'solr_wrapper' gem 'rsolr', '~> 1.0.6' +gem 'ddtrace' gem 'devise' gem 'devise-guests', '~> 0.3' gem 'friendly_id', github: 'norman/friendly_id' @@ -79,6 +80,7 @@ gem 'blacklight-oembed' gem 'devise_invitable' gem 'iso-639' gem 'iiif-presentation' +gem 'rails_semantic_logger' gem 'omniauth-cas' gem 'sneakers' gem 'open_uri_redirections' @@ -95,7 +97,6 @@ gem 'riiif' # PUL Assets gem 'pul-assets', github: 'pulibrary/pul_assets' # gem 'spotlight-resources-iiif', github: 'pulibrary/spotlight-resources-iiif', branch: 'default_vocab' -gem 'newrelic_rpm' gem 'dalli' gem 'ruby-prof', require: false gem 'honeybadger', '~> 2.0' diff --git a/Gemfile.lock b/Gemfile.lock index 3c4a841d..5f2adb4b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -213,6 +213,8 @@ GEM crass (1.0.3) dalli (2.7.6) database_cleaner (1.5.3) + ddtrace (0.11.2) + msgpack debug_inspector (0.0.2) declarative (0.0.10) declarative-option (0.1.0) @@ -301,12 +303,12 @@ GEM mini_portile2 (2.3.0) minitest (5.11.3) modernizr-rails (2.7.1) + msgpack (1.2.4) multi_json (1.12.1) multipart-post (2.0.0) net-scp (1.2.1) net-ssh (>= 2.6.5) net-ssh (3.2.0) - newrelic_rpm (3.17.2.327) nio4r (2.2.0) nokogiri (1.8.2) mini_portile2 (~> 2.3.0) @@ -373,6 +375,9 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.0.3) loofah (~> 2.0) + rails_semantic_logger (4.2.0) + rails (>= 3.2) + semantic_logger (~> 4.1) railties (5.0.6) actionpack (= 5.0.6) activesupport (= 5.0.6) @@ -450,6 +455,8 @@ GEM sdoc (0.4.2) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) + semantic_logger (4.2.0) + concurrent-ruby (~> 1.0) serverengine (1.5.11) sigdump (~> 0.2.2) sidekiq (4.2.2) @@ -573,6 +580,7 @@ DEPENDENCIES coveralls dalli database_cleaner + ddtrace devise devise-guests (~> 0.3) devise_invitable @@ -583,7 +591,6 @@ DEPENDENCIES iso-639 jbuilder (~> 2.0) jquery-rails - newrelic_rpm nokogiri (~> 1.8.1) omniauth-cas open_uri_redirections @@ -595,6 +602,7 @@ DEPENDENCIES pul_uv_rails! rails (~> 5.0) rails-controller-testing + rails_semantic_logger redis-namespace riiif rsolr (~> 1.0.6) diff --git a/config/application.rb b/config/application.rb index 001dd533..406f7a02 100644 --- a/config/application.rb +++ b/config/application.rb @@ -26,5 +26,10 @@ class Application < Rails::Application # config.i18n.default_locale = :de config.autoload_paths += %W(#{Rails.root}/app/workers) + config.semantic_logger.backtrace_level = :info + config.rails_semantic_logger.quiet_assets = true + config.rails_semantic_logger.format = :json + config.rails_semantic_logger.rendered = false + config.semantic_logger.application = 'DPUL' end end diff --git a/config/initializers/datadog.rb b/config/initializers/datadog.rb index becdee5b..93e7cf30 100644 --- a/config/initializers/datadog.rb +++ b/config/initializers/datadog.rb @@ -1,23 +1,18 @@ -require 'net/http' -require 'redis' +# frozen_string_literal: true +Datadog.configure do |c| + c.tracer(enabled: false) unless Rails.env.production? + # Rails + c.use :rails -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 + # Redis + c.use :redis + + # Net::HTTP + c.use :http + + # Sidekiq + c.use :sidekiq + + # Faraday + c.use :faraday end