newrelic_rpm 3.6.1.88 → 3.6.2.90.beta

data/test/new_relic/agent/sql_sampler_test.rb

@@ -40,7 +40,7 @@ class NewRelic::Agent::SqlSamplerTest < Test::Unit::TestCase
   def test_notice_sql_truncates_query
     @sampler.notice_first_scope_push nil
     message = 'a' * 17_000
-    @sampler.notice_sql message, "Database/test/select", nil, 1.5
+    @sampler.notice_sql(message, "Database/test/select", nil, 1.5)
     assert_equal('a' * 16_381 + '...', @sampler.transaction_data.sql_data[0].sql)
   end
 
@@ -127,10 +127,17 @@ class NewRelic::Agent::SqlSamplerTest < Test::Unit::TestCase
     data = NewRelic::Agent::TransactionSqlData.new
     data.set_transaction_info("/c/a", {}, 'guid')
     data.set_transaction_name("WebTransaction/Controller/c/a")
+    explainer = NewRelic::Agent::Instrumentation::ActiveRecord::EXPLAINER
     queries = [
-               NewRelic::Agent::SlowSql.new("select * from test", "Database/test/select", {}, 1.5),
-               NewRelic::Agent::SlowSql.new("select * from test", "Database/test/select", {}, 1.2),
-               NewRelic::Agent::SlowSql.new("select * from test2", "Database/test2/select", {}, 1.1)
+               NewRelic::Agent::SlowSql.new("select * from test",
+                                            "Database/test/select", {},
+                                            1.5, nil, &explainer),
+               NewRelic::Agent::SlowSql.new("select * from test",
+                                            "Database/test/select", {},
+                                            1.2, nil, &explainer),
+               NewRelic::Agent::SlowSql.new("select * from test2",
+                                            "Database/test2/select", {},
+                                            1.1, nil, &explainer)
               ]
     data.sql_data.concat(queries)
     @sampler.harvest_slow_sql data
@@ -199,6 +206,22 @@ class NewRelic::Agent::SqlSamplerTest < Test::Unit::TestCase
     end
   end
 
+  def test_can_directly_marshal_traces_for_pipe_transmittal
+    with_config(:'transaction_tracer.explain_enabled' => false) do
+      data = NewRelic::Agent::TransactionSqlData.new
+      explainer = NewRelic::Agent::Instrumentation::ActiveRecord::EXPLAINER
+      data.sql_data.concat([NewRelic::Agent::SlowSql.new("select * from test",
+                                                         "Database/test/select",
+                                                         {}, 1.5, &explainer)])
+      @sampler.harvest_slow_sql(data)
+      sql_traces = @sampler.harvest
+
+      assert_nothing_raised do
+        Marshal.dump(sql_traces)
+      end
+    end
+  end
+
   def test_to_collector_array
     with_config(:'transaction_tracer.explain_enabled' => false) do
       data = NewRelic::Agent::TransactionSqlData.new

data/test/new_relic/agent/transaction_sampler_test.rb

@@ -421,14 +421,14 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
 
   def test_notice_sql_recording_sql
     Thread.current[:record_sql] = true
-    @sampler.expects(:notice_extra_data).with('some sql', 1.0, :sql, 'a config', :connection_config)
-    @sampler.notice_sql('some sql', 'a config', 1.0)
+    @sampler.expects(:notice_extra_data).with('some sql', 1.0, :sql)
+    @sampler.notice_sql('some sql', {:config => 'a config'}, 1.0)
   end
 
   def test_notice_sql_not_recording
     Thread.current[:record_sql] = false
-    @sampler.expects(:notice_extra_data).with('some sql', 1.0, :sql, 'a config', :connection_config).never # <--- important
-    @sampler.notice_sql('some sql', 'a config', 1.0)
+    @sampler.expects(:notice_extra_data).with('some sql', 1.0, :sql).never # <--- important
+    @sampler.notice_sql('some sql', {:config => 'a config'}, 1.0)
   end
 
   def test_notice_nosql
@@ -817,7 +817,7 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
 
     Thread::current[:record_sql] = false
 
-    @sampler.notice_sql("test", nil, 0)
+    @sampler.notice_sql("test", {}, 0)
 
     segment = @sampler.send(:builder).current_segment
 
@@ -827,7 +827,7 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
   def test_stack_trace__sql
     with_config(:'transaction_tracer.stack_trace_threshold' => 0) do
       @sampler.notice_first_scope_push Time.now.to_f
-      @sampler.notice_sql("test", nil, 1)
+      @sampler.notice_sql("test", {}, 1)
       segment = @sampler.send(:builder).current_segment
 
       assert segment[:sql]
@@ -849,7 +849,7 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
   def test_nil_stacktrace
     with_config(:'transaction_tracer.stack_trace_threshold' => 2) do
       @sampler.notice_first_scope_push Time.now.to_f
-      @sampler.notice_sql("test", nil, 1)
+      @sampler.notice_sql("test", {}, 1)
       segment = @sampler.send(:builder).current_segment
 
       assert segment[:sql]
@@ -864,7 +864,7 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
 
     len = 0
     while len <= 16384
-      @sampler.notice_sql(sql, nil, 0)
+      @sampler.notice_sql(sql, {}, 0)
       len += sql.length
     end
 
@@ -881,7 +881,7 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
 
     orig_sql = "SELECT * from Jim where id=66"
 
-    @sampler.notice_sql(orig_sql, nil, 0)
+    @sampler.notice_sql(orig_sql, {}, 0)
 
     segment = @sampler.send(:builder).current_segment
 
@@ -909,9 +909,9 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
     with_config(:'transaction_tracer.limit_segments' => 3) do
       run_sample_trace do
         @sampler.notice_push_scope
-        @sampler.notice_sql("SELECT * FROM sandwiches WHERE bread = 'hallah'", nil, 0)
+        @sampler.notice_sql("SELECT * FROM sandwiches WHERE bread = 'hallah'", {}, 0)
         @sampler.notice_push_scope
-        @sampler.notice_sql("SELECT * FROM sandwiches WHERE bread = 'semolina'", nil, 0)
+        @sampler.notice_sql("SELECT * FROM sandwiches WHERE bread = 'semolina'", {}, 0)
         @sampler.notice_pop_scope "a11"
         @sampler.notice_pop_scope "a1"
       end
@@ -963,13 +963,13 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
     @sampler.notice_transaction(nil, {})
     @sampler.notice_first_scope_push start
     @sampler.notice_push_scope
-    @sampler.notice_sql("SELECT * FROM sandwiches WHERE bread = 'wheat'", nil, 0)
+    @sampler.notice_sql("SELECT * FROM sandwiches WHERE bread = 'wheat'", {}, 0)
     @sampler.notice_push_scope
-    @sampler.notice_sql("SELECT * FROM sandwiches WHERE bread = 'white'", nil, 0)
+    @sampler.notice_sql("SELECT * FROM sandwiches WHERE bread = 'white'", {}, 0)
     yield if block_given?
     @sampler.notice_pop_scope "ab"
     @sampler.notice_push_scope
-    @sampler.notice_sql("SELECT * FROM sandwiches WHERE bread = 'french'", nil, 0)
+    @sampler.notice_sql("SELECT * FROM sandwiches WHERE bread = 'french'", {}, 0)
     @sampler.notice_pop_scope "ac"
     @sampler.notice_pop_scope "a"
     @sampler.notice_scope_empty(@txn, (stop || Time.now.to_f))

data/test/new_relic/transaction_sample/segment_test.rb

@@ -376,7 +376,10 @@ class NewRelic::TransactionSample::SegmentTest < Test::Unit::TestCase
   def test_explain_sql_raising_an_error
     s = NewRelic::TransactionSample::Segment.new(Time.now, 'Custom/test/metric', nil)
     config = mock('config')
-    s.params = {:sql => 'SELECT', :connection_config => config}
+    statement = NewRelic::Agent::Database::Statement.new('SELECT')
+    statement.config = config
+    statement.explainer = NewRelic::Agent::Instrumentation::ActiveRecord::EXPLAINER
+    s.params = {:sql => statement}
     connection = mock('connection')
     NewRelic::Agent::Database.expects(:get_connection).with(config).raises(RuntimeError.new("whee"))
     assert_nothing_raised do
@@ -384,6 +387,25 @@ class NewRelic::TransactionSample::SegmentTest < Test::Unit::TestCase
     end
   end
 
+  def test_explain_sql_can_handle_missing_config
+    # If TT segment came over from Resque child, might not be a Statement
+    s = NewRelic::TransactionSample::Segment.new(Time.now, 'Custom/test/metric', nil)
+    s.params = { :sql => "SELECT * FROM galaxy" }
+    assert_nothing_raised do
+      s.explain_sql
+    end
+  end
+
+  def test_explain_sql_can_use_already_existing_plan
+    s = NewRelic::TransactionSample::Segment.new(Time.now, 'Custom/test/metric', nil)
+    s.params = {
+      :sql => "SELECT * FROM galaxy",
+      :explain_plan => "EXPLAIN IT!"
+    }
+
+    assert_equal("EXPLAIN IT!", s.explain_sql)
+  end
+
   def test_params_equal
     s = NewRelic::TransactionSample::Segment.new(Time.now, 'Custom/test/metric', nil)
     assert_equal(nil, s.instance_eval { @params })
@@ -393,7 +415,7 @@ class NewRelic::TransactionSample::SegmentTest < Test::Unit::TestCase
     s.params = params
     assert_equal(params, s.instance_eval { @params })
   end
-  
+
   def test_obfuscated_sql
     sql = 'select * from table where id = 1'
     s = NewRelic::TransactionSample::Segment.new(Time.now, 'Custom/test/metric', nil)

data/test/new_relic/transaction_sample_test.rb

@@ -183,7 +183,7 @@ class NewRelic::TransactionSampleTest < Test::Unit::TestCase
       sampler.notice_push_scope "level0"
       sampler.notice_push_scope "level-1"
       sampler.notice_push_scope "level-2"
-      sampler.notice_sql(::SQL_STATEMENT, nil, 0)
+      sampler.notice_sql(::SQL_STATEMENT, {}, 0)
       sampler.notice_pop_scope "level-2"
       sampler.notice_pop_scope "level-1"
       sampler.notice_pop_scope "level0"

data/test/test_helper.rb

@@ -264,6 +264,20 @@ def with_config(config_hash, opts={})
   end
 end
 
+
+def with_verbose_logging
+  orig_logger = NewRelic::Agent.logger
+  $stderr.puts '', '---', ''
+  new_logger = NewRelic::Agent::AgentLogger.new( {:log_level => 'debug'}, '', Logger.new($stderr) )
+  NewRelic::Agent.logger = new_logger
+
+  yield
+
+ensure
+  NewRelic::Agent.logger = orig_logger
+end
+
+
 # Need to be a bit sloppy when testing against the logging--let everything
 # through, but check we (at least) get our particular message we care about
 def expects_logging(level, *with_params)
@@ -356,8 +370,8 @@ module TransactionSampleTestHelper
     sampler.notice_first_scope_push Time.now.to_f
     sampler.notice_transaction(nil, :jim => "cool")
     sampler.notice_push_scope "a"
-    sql.each {|sql_statement| sampler.notice_sql(sql_statement, {:adapter => "test"}, 0 ) }
-
+    explainer = NewRelic::Agent::Instrumentation::ActiveRecord::EXPLAINER
+    sql.each {|sql_statement| sampler.notice_sql(sql_statement, {:adapter => "test"}, 0, &explainer) }
     sleep 0.02
     yield if block_given?
     sampler.notice_pop_scope "a"
@@ -370,13 +384,13 @@ module TransactionSampleTestHelper
     sampler.notice_first_scope_push Time.now.to_f
     sampler.notice_transaction(path, {})
     sampler.notice_push_scope "Controller/sandwiches/index"
-    sampler.notice_sql("SELECT * FROM sandwiches WHERE bread = 'wheat'", nil, 0)
+    sampler.notice_sql("SELECT * FROM sandwiches WHERE bread = 'wheat'", {}, 0)
     sampler.notice_push_scope "ab"
-    sampler.notice_sql("SELECT * FROM sandwiches WHERE bread = 'white'", nil, 0)
+    sampler.notice_sql("SELECT * FROM sandwiches WHERE bread = 'white'", {}, 0)
     yield sampler if block_given?
     sampler.notice_pop_scope "ab"
     sampler.notice_push_scope "lew"
-    sampler.notice_sql("SELECT * FROM sandwiches WHERE bread = 'french'", nil, 0)
+    sampler.notice_sql("SELECT * FROM sandwiches WHERE bread = 'french'", {}, 0)
     sampler.notice_pop_scope "lew"
     sampler.notice_pop_scope "Controller/sandwiches/index"
     sampler.notice_scope_empty(stub('txn', :name => path, :custom_parameters => {}))

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.6.1.88
-  prerelease: 
+  version: 3.6.2.90.beta
+  prerelease: 9
 platform: ruby
 authors:
 - Jason Clark
@@ -41,7 +41,7 @@ cert_chain:
   cHUySWFQWE92bTNUOEc0TzZxWnZobkxoL1VpZW4rK0RqOGVGQmVjVFBvTThw
   VmpLM3BoNQpuL0V3dVpDY0U2Z2h0Q0NNCi0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2013-04-29 00:00:00.000000000 Z
+date: 2013-05-06 00:00:00.000000000 Z
 dependencies: []
 description: ! 'New Relic is a performance management system, developed by New Relic,
 
@@ -145,6 +145,7 @@ files:
 - lib/new_relic/agent/instrumentation/rails4/errors.rb
 - lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb
 - lib/new_relic/agent/instrumentation/resque.rb
+- lib/new_relic/agent/instrumentation/sequel.rb
 - lib/new_relic/agent/instrumentation/sidekiq.rb
 - lib/new_relic/agent/instrumentation/sinatra.rb
 - lib/new_relic/agent/instrumentation/sunspot.rb
@@ -227,6 +228,8 @@ files:
 - lib/new_relic/url_rule.rb
 - lib/new_relic/version.rb
 - lib/newrelic_rpm.rb
+- lib/sequel/extensions/newrelic_instrumentation.rb
+- lib/sequel/plugins/newrelic_instrumentation.rb
 - lib/tasks/all.rb
 - lib/tasks/install.rake
 - lib/tasks/tests.rake
@@ -355,6 +358,7 @@ files:
 - test/new_relic/agent/instrumentation/net_instrumentation_test.rb
 - test/new_relic/agent/instrumentation/queue_time_test.rb
 - test/new_relic/agent/instrumentation/rack_test.rb
+- test/new_relic/agent/instrumentation/sequel_test.rb
 - test/new_relic/agent/instrumentation/sinatra_test.rb
 - test/new_relic/agent/instrumentation/task_instrumentation_test.rb
 - test/new_relic/agent/memcache_instrumentation_test.rb
@@ -508,29 +512,16 @@ files:
 - lib/new_relic/build.rb
 homepage: http://www.github.com/newrelic/rpm
 licenses: []
-post_install_message: ! "\n# New Relic Ruby Agent Release Notes #\n\n## v3.6.1 ##\n\n*
-  Full URIs for HTTP requests are recorded in transaction traces\n\n  When recording
-  a transaction trace node for an outgoing HTTP call via\n  Net::HTTP, the agent will
-  now save the full URI (instead of just the hostname)\n  for the request. Embedded
-  credentials, the query string, and the fragment will\n  be stripped from the URI
-  before it is saved.\n\n* Simplify Agent Autostart Logic\n\n  Previously the agent
-  would only start when it detected a supported\n  \"Dispatcher\", meaning a known
-  web server or background task framework.  This\n  was problematic for customers
-  using webservers that the agent was not\n  configured to detect (e.g. Puma).  Now
-  the agent will attempt to report any\n  time it detects it is running in a monitored
-  environment (e.g. production).\n  There are two exceptions to this.  The agent will
-  not autostart in a rails\n  console or irb session or when the process was invoked
-  by a rake task (e.g.\n  rake assets:precompile).  The NEWRELIC_ENABLE environment
-  variable can be set\n  to true or false to force the agent to start or not start.\n\n*
-  Don't attempt to resolve collector hostname when proxy is in use\n\n  When a proxy
-  is configured, the agent will not attempt to lookup and cache the\n  IP address
-  of New Relic server to which it is sending data, since DNS may not\n  be available
-  in some environments. Thanks to Bill Kirtley for the contribution\n\n* Added NewRelic::Agent.set_transaction_name
-  and NewRelic::Agent.get_transaction_name\n\n  Ordinarily the name of your transaction
-  is defined up-front, but if you'd like to \n  change the name of a transaction while
-  it is still running you can use \n  **NewRelic::Agent.set_transaction_name()**.
-  \ Similarly, if you need to know the name\n  of the currently running transaction,
-  you can use **NewRelic::Agent.get_transaction_name()**.\n\nSee https://github.com/newrelic/rpm/blob/master/CHANGELOG
+post_install_message: ! "\n# New Relic Ruby Agent Release Notes #\n\n## v3.6.2 ##\n\n*
+  Sequel support\n\n  The Ruby agent now supports Sequel, a database toolkit for Ruby.
+  This\n  includes capturing SQL calls and model operations in transaction traces,
+  and\n  recording slow SQL calls. See https://newrelic.com/docs/ruby/sequel-instrumentation\n
+  \ for full details.\n\n* Fix for over-counted Net::HTTP calls\n\n  Under some circumstances,
+  calls into Net::HTTP were being counted twice in\n  metrics and transaction traces.
+  This has been fixed.\n\n* Missing traced errors for Resque applications\n\n  Traced
+  errors weren't displaying for some Resque workers, although the errors\n  were factored
+  into the overall count graphs. This has been fixed, and traced\n  errors should
+  be available again after upgrading the agent.\n\nSee https://github.com/newrelic/rpm/blob/master/CHANGELOG
   for a full list of\nchanges.\n"
 rdoc_options:
 - --line-numbers