diff --git a/Gemfile.lock b/Gemfile.lock index 6050f13c..d218472b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -69,7 +69,6 @@ PATH travis-api (0.0.1) backports (~> 2.5) memcachier - newrelic_rpm (~> 3.6.6) pg (~> 0.13.2) rack-contrib (~> 1.1) rack-ssl (~> 1.3, >= 1.3.3) @@ -175,7 +174,6 @@ GEM multipart-post (2.0.0) net-http-persistent (2.9.4) net-http-pipeline (1.0.1) - newrelic_rpm (3.6.9.171) pg (0.13.2) polyglot (0.3.4) proxies (0.2.1) diff --git a/config/newrelic.yml b/config/newrelic.yml deleted file mode 100644 index d1ab9cd0..00000000 --- a/config/newrelic.yml +++ /dev/null @@ -1,39 +0,0 @@ ---- -staging: - error_collector: - capture_source: true - enabled: true - ignore_errors: ActionController::RoutingError - apdex_t: 0.5 - ssl: false - monitor_mode: true - license_key: <%= ENV["NEW_RELIC_LICENSE_KEY"] %> - developer_mode: false - app_name: <%= ENV["NEW_RELIC_APP_NAME"] %> - transaction_tracer: - record_sql: obfuscated - enabled: true - stack_trace_threshold: 0.5 - transaction_threshold: apdex_f - capture_params: false - log_level: info - -production: - error_collector: - capture_source: true - enabled: true - ignore_errors: ActionController::RoutingError - apdex_t: 0.5 - ssl: false - monitor_mode: true - license_key: <%= ENV["NEW_RELIC_LICENSE_KEY"] %> - developer_mode: false - app_name: <%= ENV["NEW_RELIC_APP_NAME"] %> - transaction_tracer: - record_sql: obfuscated - enabled: true - stack_trace_threshold: 0.5 - transaction_threshold: apdex_f - capture_params: false - log_level: info - diff --git a/lib/travis/api/app/base.rb b/lib/travis/api/app/base.rb index 99f0518d..e197bfe6 100644 --- a/lib/travis/api/app/base.rb +++ b/lib/travis/api/app/base.rb @@ -7,12 +7,6 @@ class Travis::Api::App class Base < Sinatra::Base register Extensions::SmartConstants - configure :production do - require 'newrelic_rpm' - ::NewRelic::Agent.manual_start() - ::NewRelic::Agent.after_fork(:force_reconnect => true) - end - error NotImplementedError do content_type :txt status 501 diff --git a/script/console b/script/console index 3d9291dd..fd1fd99c 100755 --- a/script/console +++ b/script/console @@ -1,8 +1,6 @@ #!/usr/bin/env ruby # encoding: UTF-8 -ENV["NEWRELIC_ENABLE"] = "false" - require 'bundler/setup' require 'travis/api/app' require 'pry' diff --git a/travis-api.gemspec b/travis-api.gemspec index 58460613..43570731 100644 --- a/travis-api.gemspec +++ b/travis-api.gemspec @@ -55,7 +55,6 @@ Gem::Specification.new do |s| "bin/start-nginx", "config.ru", "config/database.yml", - "config/newrelic.yml", "config/nginx.conf.erb", "config/puma-config.rb", "config/unicorn.rb", @@ -174,7 +173,6 @@ Gem::Specification.new do |s| s.add_dependency 'backports', '~> 2.5' s.add_dependency 'pg', '~> 0.13.2' - s.add_dependency 'newrelic_rpm', '~> 3.6.6' s.add_dependency 'thin', '~> 1.4' s.add_dependency 'sinatra', '~> 1.3' s.add_dependency 'sinatra-contrib', '~> 1.3'