newrelic_rpm 3.12.1.298 → 3.13.0.299

data/test/new_relic/agent/vm/rubinius_vm_test.rb

@@ -45,7 +45,7 @@ if NewRelic::LanguageSupport.rubinius?
     def test_gather_stats_from_metrics_sets_total_allocated_objects
       @vm.gather_stats_from_metrics(@snap)
 
-      refute_nil @snap.total_allocated_object
+      refute_nil @snap.total_allocated_object if @vm.supports?(:total_allocated_object)
     end
 
     def test_gather_stats_from_metrics_sets_method_cache_invalidations

data/test/new_relic/fake_collector.rb

@@ -99,6 +99,11 @@ module NewRelic
       self.mock[method].override(status, {'exception' => exception})
     end
 
+    def stub_wait(method, wait_time, status=200)
+      self.mock[method] ||= default_response
+      self.mock[method].override(status, Proc.new { sleep(wait_time); {'return_value' => ""}})
+    end
+
     def call(env)
       @last_socket = Thread.current[:WEBrickSocket]
 
@@ -313,11 +318,23 @@ module NewRelic
       end
 
       class SubmittedTransactionTraceTree
-        attr_reader :attributes
+        attr_reader :attributes, :nodes, :node_params
 
         def initialize(body, format)
           @body = body
           @attributes = body[4]
+          @nodes = extract_by_index(body[3], 2)
+          @node_params = extract_by_index(body[3], 3)
+        end
+
+        def extract_by_index(current, index)
+          result = [current[index]]
+          if current[4].any?
+            current[4].each do |child|
+              result << extract_by_index(child, index)
+            end
+          end
+          result
         end
       end
 

data/test/new_relic/multiverse_helpers.rb

@@ -156,6 +156,12 @@ module MultiverseHelpers
     $collector.calls_for("analytic_event_data").first.events.first
   end
 
+  def single_metrics_post
+    assert_equal 1, $collector.calls_for("metric_data").length
+
+    $collector.calls_for("metric_data").first
+  end
+
   def single_connect_posted
     assert_equal 1, $collector.calls_for(:connect).size
     $collector.calls_for(:connect).first

data/test/performance/suites/redis.rb

@@ -0,0 +1,45 @@
+# 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.
+
+# Primarily just tests allocations around argument formatting
+class Redis < Performance::TestCase
+  def test_no_args
+    with_config(:'transaction_tracer.record_redis_arguments' => true) do
+      command = ["lonely_command"]
+      measure do
+        NewRelic::Agent::Datastores::Redis.format_command(command)
+      end
+    end
+  end
+
+  def test_args
+    with_config(:'transaction_tracer.record_redis_arguments' => true) do
+      commands = ["argumentative", "commands", "get", "called", "a", "bunch"]
+      measure do
+        NewRelic::Agent::Datastores::Redis.format_command(commands)
+      end
+    end
+  end
+
+  def test_long_args
+    with_config(:'transaction_tracer.record_redis_arguments' => true) do
+      commands = ["loooooong_command", "a" * 100, "b" * 100, "c" * 100]
+      measure do
+        NewRelic::Agent::Datastores::Redis.format_command(commands)
+      end
+    end
+  end
+
+  def test_pipelined
+    with_config(:'transaction_tracer.record_redis_arguments' => true) do
+      pipeline = [
+        ["first", "a" * 100, "b" * 100, "c" * 100],
+        ["second", "a" * 100, "b" * 100, "c" * 100]]
+
+      measure do
+        NewRelic::Agent::Datastores::Redis.format_pipeline_commands(pipeline)
+      end
+    end
+  end
+end

data/ui/views/newrelic/_sql_row.rhtml

@@ -7,7 +7,7 @@
     <div class="sql_statement">
       <small>
         <% if segment[:sql] %>
-          <%= line_wrap_sql(segment[:sql] ) %>
+          <%= line_wrap_sql(segment[:sql].sql ) %>
         <% else %>
           Non-sql query: <%= segment.metric_name %> <%= line_wrap_sql(segment[:key]) %>
         <% end %></small>

data/ui/views/newrelic/explain_sql.rhtml

@@ -9,7 +9,7 @@
 		</th>
 		<td colspan=<%= colspan %>><small>
 			<div class="sql_statement">
-				<%= line_wrap_sql(@sql) %>
+				<%= line_wrap_sql(@sql.sql) %>
 			</div>
 		</small></td>
 	</tr>

metadata

@@ -1,18 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.12.1.298
+  version: 3.13.0.299
 platform: ruby
 authors:
-- Jason Clark
 - Tim Krajcar
-- Jonan Scheffler
 - Matthew Wear
-- Ben Weintraub
+- Katherine Wu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2015-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -263,6 +261,7 @@ files:
 - lib/new_relic/agent/datastores/mongo/metric_translator.rb
 - lib/new_relic/agent/datastores/mongo/obfuscator.rb
 - lib/new_relic/agent/datastores/mongo/statement_formatter.rb
+- lib/new_relic/agent/datastores/redis.rb
 - lib/new_relic/agent/deprecator.rb
 - lib/new_relic/agent/encoding_normalizer.rb
 - lib/new_relic/agent/error_collector.rb
@@ -323,6 +322,8 @@ files:
 - lib/new_relic/agent/instrumentation/rails4/errors.rb
 - lib/new_relic/agent/instrumentation/rails_middleware.rb
 - lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb
+- lib/new_relic/agent/instrumentation/rake.rb
+- lib/new_relic/agent/instrumentation/redis.rb
 - lib/new_relic/agent/instrumentation/resque.rb
 - lib/new_relic/agent/instrumentation/rubyprof.rb
 - lib/new_relic/agent/instrumentation/sequel.rb
@@ -454,6 +455,7 @@ files:
 - lib/tasks/install.rake
 - lib/tasks/multiverse.rake
 - lib/tasks/multiverse.rb
+- lib/tasks/newrelic.rb
 - lib/tasks/tests.rake
 - lib/tasks/versions.html.erb
 - lib/tasks/versions.rake
@@ -765,6 +767,7 @@ files:
 - test/multiverse/suites/agent_only/script/loading.rb
 - test/multiverse/suites/agent_only/script/public_api_when_disabled.rb
 - test/multiverse/suites/agent_only/script/symbol_env.rb
+- test/multiverse/suites/agent_only/script/warnings.rb
 - test/multiverse/suites/agent_only/service_timeout_test.rb
 - test/multiverse/suites/agent_only/set_transaction_name_test.rb
 - test/multiverse/suites/agent_only/ssl_test.rb
@@ -892,6 +895,17 @@ files:
 - test/multiverse/suites/rails/request_statistics_test.rb
 - test/multiverse/suites/rails/transaction_ignoring_test.rb
 - test/multiverse/suites/rails/view_instrumentation_test.rb
+- test/multiverse/suites/rake/Envfile
+- test/multiverse/suites/rake/Rakefile
+- test/multiverse/suites/rake/config/newrelic.yml
+- test/multiverse/suites/rake/multitask_test.rb
+- test/multiverse/suites/rake/rake_test.rb
+- test/multiverse/suites/rake/rake_test_helper.rb
+- test/multiverse/suites/rake/unsupported_rake_test.rb
+- test/multiverse/suites/redis/Envfile
+- test/multiverse/suites/redis/config/newrelic.yml
+- test/multiverse/suites/redis/redis_instrumentation_test.rb
+- test/multiverse/suites/redis/redis_unsupported_version_test.rb
 - test/multiverse/suites/resque/Envfile
 - test/multiverse/suites/resque/Rakefile
 - test/multiverse/suites/resque/config/newrelic.yml
@@ -979,6 +993,7 @@ files:
 - test/new_relic/agent/datastores/mongo/metric_translator_test.rb
 - test/new_relic/agent/datastores/mongo/obfuscator_test.rb
 - test/new_relic/agent/datastores/mongo/statement_formatter_test.rb
+- test/new_relic/agent/datastores/redis_test.rb
 - test/new_relic/agent/datastores_test.rb
 - test/new_relic/agent/deprecator_test.rb
 - test/new_relic/agent/encoding_normalizer_test.rb
@@ -1144,6 +1159,7 @@ files:
 - test/performance/suites/marshalling.rb
 - test/performance/suites/queue_time.rb
 - test/performance/suites/rack_middleware.rb
+- test/performance/suites/redis.rb
 - test/performance/suites/rum_autoinsertion.rb
 - test/performance/suites/sql_obfuscation.rb
 - test/performance/suites/startup.rb