newrelic_rpm 3.6.3.106 → 3.6.3.111

data/lib/new_relic/agent/instrumentation/sequel.rb

@@ -13,26 +13,40 @@ DependencyDetection.defer do
   end
 
   depends_on do
-    !NewRelic::Agent.config[:disable_activerecord_instrumentation] &&
+    !NewRelic::Agent.config[:disable_sequel_instrumentation] &&
     !NewRelic::Agent.config[:disable_database_instrumentation]
   end
 
+  def supported_sequel_version?
+    Sequel.const_defined?( :MAJOR ) &&
+      ( Sequel::MAJOR > 3 ||
+        Sequel::MAJOR == 3 && Sequel::MINOR >= 37 )
+  end
+
   executes do
-    ::NewRelic::Agent.logger.info 'Installing Sequel instrumentation'
+    if supported_sequel_version?
+
+      ::NewRelic::Agent.logger.info 'Installing Sequel instrumentation'
+
+      if Sequel::Database.respond_to?( :extension )
+        Sequel::Database.extension :newrelic_instrumentation
+      else
+        NewRelic::Agent.logger.info "Detected Sequel version %s." % [ Sequel::VERSION ]
+        NewRelic::Agent.logger.info "Please see additional documentation: " +
+          "https://newrelic.com/docs/ruby/sequel-instrumentation"
+      end
+
+      Sequel.synchronize{Sequel::DATABASES.dup}.each do |db|
+        db.extension :newrelic_instrumentation
+      end
+
+      Sequel::Model.plugin :newrelic_instrumentation
 
-    if Sequel::Database.respond_to?( :extension )
-      Sequel::Database.extension :newrelic_instrumentation
     else
-      NewRelic::Agent.logger.info "Detected Sequel version %s." % [ Sequel::VERSION ]
-      NewRelic::Agent.logger.info "Please see additional documentation: " +
-        "https://newrelic.com/docs/ruby/sequel-instrumentation"
-    end
 
-    Sequel.synchronize{Sequel::DATABASES.dup}.each do |db|
-      db.extension :newrelic_instrumentation
-    end
+      NewRelic::Agent.logger.info "Sequel instrumentation requires at least version 3.37.0."
 
-    Sequel::Model.plugin :newrelic_instrumentation
+    end
 
   end
 

data/test/multiverse/suites/sequel/Envfile

@@ -0,0 +1,34 @@
+suite_condition("Sequel not supported in 1.8.6") do
+  RUBY_VERSION != '1.8.6'
+end
+
+
+gemfile <<-RB
+  gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../')
+  gem 'jdbc-sqlite3', '3.7.2', :platform => :jruby
+  gem 'sqlite3', '1.3.7', :platform => :ruby
+  gem 'sequel', '2.9.0'
+RB
+
+gemfile <<-RB
+  gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../')
+  gem 'jdbc-sqlite3', '3.7.2', :platform => :jruby
+  gem 'sqlite3', '1.3.7', :platform => :ruby
+  gem 'sequel', '3.34.0'
+RB
+
+gemfile <<-RB
+  gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../')
+  gem 'jdbc-sqlite3', '3.7.2', :platform => :jruby
+  gem 'sqlite3', '1.3.7', :platform => :ruby
+  gem 'sequel', '3.36.1'
+RB
+
+gemfile <<-RB
+  gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../')
+  gem 'jdbc-sqlite3', '3.7.2', :platform => :jruby
+  gem 'sqlite3', '1.3.7', :platform => :ruby
+  gem 'sequel', '3.47.0'
+RB
+
+

data/test/multiverse/suites/sequel/config/newrelic.yml

@@ -0,0 +1,22 @@
+---
+development:
+  error_collector:
+    capture_source: true
+    enabled: true
+  apdex_t: 0.5
+  ssl: false
+  monitor_mode: true
+  license_key: bootstrap_newrelic_admin_license_key_000
+  developer_mode: false
+  app_name: test
+  host: 127.0.0.1
+  api_host: 127.0.0.1
+  port: <%= 30_000 + ($$ % 10_000) %>
+  transaction_tracer:
+    record_sql: obfuscated
+    enabled: true
+    stack_trace_threshold: 0.5
+    transaction_threshold: 1.0
+  capture_params: false
+  log_level: debug
+  log_file_path: agent.log

data/test/multiverse/suites/sequel/sequel_test.rb

@@ -0,0 +1,35 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
+# https://newrelic.atlassian.net/browse/RUBY-1123
+# https://support.newrelic.com/tickets/42515
+
+require 'sequel'
+require 'test/unit'
+
+if defined?(JRuby)
+  DB = Sequel.connect('jdbc:sqlite::memory:')
+else
+  DB = Sequel.sqlite
+end
+
+DB.create_table( :users ) do
+  primary_key :uid
+  string :login
+  string :firstname
+  string :lastname
+end
+class User < Sequel::Model; end
+
+class SequelTest < Test::Unit::TestCase
+
+  def test_it_doesnt_blow_up
+    require 'newrelic_rpm'
+
+    u = User.create( :login => 'jrandom', :firstname => 'J. Random', :lastname => 'Hacquer' )
+    assert u.is_a?( User ), "#{u} isn't a User"
+  end
+
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.6.3.106
+  version: 3.6.3.111
   prerelease: 
 platform: ruby
 authors:
@@ -41,7 +41,7 @@ cert_chain:
   cHUySWFQWE92bTNUOEc0TzZxWnZobkxoL1VpZW4rK0RqOGVGQmVjVFBvTThw
   VmpLM3BoNQpuL0V3dVpDY0U2Z2h0Q0NNCi0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2013-06-04 00:00:00.000000000 Z
+date: 2013-06-06 00:00:00.000000000 Z
 dependencies: []
 description: ! 'New Relic is a performance management system, developed by New Relic,
 
@@ -310,6 +310,9 @@ files:
 - test/multiverse/suites/resque/config/newrelic.yml
 - test/multiverse/suites/resque/instrumentation_test.rb
 - test/multiverse/suites/resque/resque_setup.rb
+- test/multiverse/suites/sequel/Envfile
+- test/multiverse/suites/sequel/config/newrelic.yml
+- test/multiverse/suites/sequel/sequel_test.rb
 - test/multiverse/suites/sidekiq/Envfile
 - test/multiverse/suites/sidekiq/app.rb
 - test/multiverse/suites/sidekiq/config/newrelic.yml