newrelic_rpm 3.15.0.314 → 3.15.1.316

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 391d2537bee4bdb7f87f25c7d20d017876638851
-  data.tar.gz: 974e57e947784e5cba3caf6b802e5d62fd5d8cf3
+  metadata.gz: 1bc3b5920b3b7ea0c2997962168a45b01127ea75
+  data.tar.gz: e48ce51b1f0bb6847fa09ab23dfa005a3f068311
 SHA512:
-  metadata.gz: 50197fcecbff1272846495f6ac2948f274d6c3cca935d34d26aa024c8606bff4b3fb47c59a54a915904a419e227e2a3ab9445d245200f6b2d38a25d8cb2208c0
-  data.tar.gz: 56a7a8be8c4e01941baf2dd8c03395debab36e5311ca4e92b4c704d73945a5176f1629a7937b08636de570cf9ef5c7cfcadb830232fb62f32b67b69aacec38cd
+  metadata.gz: 47057832e75c7c3319433fb03ee49475136c1e8c284fa3b238d5e591d185f6f5222cfb7b8c3f6696b0aa99bcbfae827ea964beb7712a0b15954dea8b72b69033
+  data.tar.gz: 6428ef632749929082e53b93e74df3239c41430bf7688ab6c28822dcf3889cf23b1e17501f1f2eb75ee186327231ca3fbd77f6ca1963f97f8c6041ed7c6aef0e

data/.travis.yml

@@ -36,6 +36,11 @@ branches:
     - dev
     - release
 
+notifications:
+  webhooks: http://notifitron.herokuapp.com/
+  on_success: always
+  on_failure: always
+
 rvm:
   # Run slowest builds first to try and optimize overall cycle time.
   - jruby-1.7.23
@@ -54,7 +59,7 @@ env:
     - CI_BUNDLE_PATH=/home/travis/bundle
     - BUNDLE_PATH=/home/travis/bundle
     - MONGODB=2.6.11
-    - JAVA_OPTS="-XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Xmx512m"
+    - JAVA_OPTS="-XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Xmx640m"
     - JRUBY_OPTS="-Xcompile.invokedynamic=false -J-Djruby.compile.mode=OFF"
     - RBXOPT="-Xcompiler.no_rbc -Xint"
     - SERIALIZE=1

data/.yardopts

@@ -18,4 +18,4 @@ lib/new_relic/rack.rb
 -
 LICENSE
 CHANGELOG
-GUIDELINES_FOR_CONTRIBUTING.md
+CONTRIBUTING.md

data/CHANGELOG

@@ -1,5 +1,55 @@
 # New Relic Ruby Agent Release Notes #
 
+## v3.15.1 ##
+  * Rack 2 alpha support
+
+  This release includes experimental support for Rack 2 as of 2.0.0.alpha.
+  Rack 2 is still in development, but the agent should work as expected for
+  those who are experimenting with Rack 2.
+
+  * Rails 5 beta 3 support
+
+  We've tweaked our Action View instrumentation to accommodate changes introduced
+  in Rails v5.0.0.beta3.
+
+  * Defer referencing ::ActiveRecord::Base to avoid triggering its autoloading
+  too soon
+
+  In 3.12.1 and later versions of the agent, the agent references (and
+  therefore loads) ActiveRecord::Base earlier on in the Rails loading process.
+  This could jump ahead of initializers that should be run first. We now wait
+  until ActiveRecord::Base is loaded elsewhere.
+
+  * Fix explain plans for non-parameterized queries with single quote literals
+
+  The agent does not run explain plans for queries still containing parameters
+  (such as `SELECT * FROM UNICORNS WHERE ID = $1 LIMIT 1`). This check was
+  unfortunately mutating the query to be obfuscated, causing an inability to
+  collect an explain plan. This has now been fixed.
+
+  * Fix default metric name for tracing class methods
+
+  When using `add_method_tracer` on a class method but without passing in a
+  `metric_name_code`, the default metric name will now look like
+  `Custom/ClassName/Class/method_name`. We also addressed default
+  metric names for anonymous classes and modules.
+
+  * Fix issue when rendering SQL strings in developer mode
+
+  When we obfuscate SQL statements, we rewrite the Statement objects as
+  SQL strings inline in our sample buffers at harvest time. However, in
+  developer mode, we also read out of these buffers when rendering pages.
+  Depending on whether a harvest has run yet, the buffer will contain either
+  Statement objects, SQL strings, or a mix. Now, developer mode can handle
+  them all!
+
+  * Fix DelayedJob Sampler reporting incorrect counts in Active Record 3 and below
+
+  When fixing various deprecation warnings on ActiveRecord 4, we introduced
+  a regression in our DelayedJob sampler which caused us to incorrectly report
+  failed and locked job counts in ActiveRecord 3 and below. This is now fixed.
+  Thanks Rangel Dokov for the contribution!
+
 ## v3.15.0 ##
 
   * Rails 5 support

data/README.md

@@ -31,7 +31,7 @@ Environments" section under "Getting Started".
 
 We welcome code contributions (in the form of pull requests) from our user
 community.  Before submitting a pull request please review
-[GUIDELINES_FOR_CONTRIBUTING](https://github.com/newrelic/rpm/blob/master/GUIDELINES_FOR_CONTRIBUTING.md).
+[these guidelines](https://github.com/newrelic/rpm/blob/master/CONTRIBUTING.md).
 
 Following these helps us efficiently review and incorporate your contribution
 and avoid breaking your code with future changes to the agent.

data/lib/new_relic/agent/autostart.rb

@@ -13,7 +13,7 @@ module NewRelic
     # the console during interactive sessions.
     #
     # It should be possible to override Autostart logic with an explicit
-    # configuration, for example the NEWRELIC_AGENT_ENABLED environment variable or
+    # configuration, for example the NEW_RELIC_AGENT_ENABLED environment variable or
     # agent_enabled key in newrelic.yml
     module Autostart
       extend self

data/lib/new_relic/agent/database/obfuscation_helpers.rb

@@ -50,7 +50,8 @@ module NewRelic
         FAILED_TO_OBFUSCATE_MESSAGE = "Failed to obfuscate SQL query - quote characters remained after obfuscation".freeze
 
         def obfuscate_single_quote_literals(sql)
-          sql.gsub!(COMPONENTS_REGEX_MAP[:single_quotes], PLACEHOLDER) || sql
+          return sql unless sql =~ COMPONENTS_REGEX_MAP[:single_quotes]
+          sql.gsub(COMPONENTS_REGEX_MAP[:single_quotes], PLACEHOLDER)
         end
 
         def self.generate_regex(dialect)

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

@@ -44,6 +44,11 @@ module NewRelic
         end
 
         class RenderEvent < Event
+
+          RENDER_TEMPLATE_EVENT_NAME   = 'render_template.action_view'.freeze
+          RENDER_PARTIAL_EVENT_NAME    = 'render_partial.action_view'.freeze
+          RENDER_COLLECTION_EVENT_NAME = 'render_collection.action_view'.freeze
+
           # Nearly every "render_blah.action_view" event has a child
           # in the form of "!render_blah.action_view".  The children
           # are the ones we want to record.  There are a couple
@@ -65,16 +70,18 @@ module NewRelic
             end
 
             # memoize
-            @metric_name ||= "View/#{metric_path(identifier)}/#{metric_action(name)}"
+            @metric_name ||= "View/#{metric_path(name, identifier)}/#{metric_action(name)}"
             @metric_name
           end
 
-          def metric_path(identifier)
-            if identifier == nil
+          def metric_path(name, identifier)
+            # Rails 5 sets identifier to nil for empty collections,
+            # so do not mistake rendering a collection for rendering a file.
+            if identifier == nil && name != RENDER_COLLECTION_EVENT_NAME
               'file'
             elsif identifier =~ /template$/
               identifier
-            elsif (parts = identifier.split('/')).size > 1
+            elsif identifier && (parts = identifier.split('/')).size > 1
               parts[-2..-1].join('/')
             else
               ::NewRelic::Agent::UNKNOWN_METRIC
@@ -83,9 +90,9 @@ module NewRelic
 
           def metric_action(name)
             case name
-            when /render_template.action_view$/  then 'Rendering'
-            when 'render_partial.action_view'    then 'Partial'
-            when 'render_collection.action_view' then 'Partial'
+            when /#{RENDER_TEMPLATE_EVENT_NAME}$/ then 'Rendering'
+            when RENDER_PARTIAL_EVENT_NAME        then 'Partial'
+            when RENDER_COLLECTION_EVENT_NAME     then 'Partial'
             end
           end
         end

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

@@ -24,6 +24,9 @@ DependencyDetection.defer do
   executes do
     ActiveSupport::Notifications.subscribe('sql.active_record',
       NewRelic::Agent::Instrumentation::ActiveRecordSubscriber.new)
-    ::NewRelic::Agent::Instrumentation::ActiveRecordHelper.instrument_additional_methods
+
+    ActiveSupport.on_load(:active_record) do
+      ::NewRelic::Agent::Instrumentation::ActiveRecordHelper.instrument_additional_methods
+    end
   end
 end

data/lib/new_relic/agent/method_tracer.rb

@@ -202,7 +202,7 @@ module NewRelic
           # Example:
           #  Foo.default_metric_name_code('bar') #=> "Custom/#{Foo.name}/bar"
           def default_metric_name_code(method_name)
-            "Custom/#{self.name}/#{method_name.to_s}"
+            "Custom/#{class_name}/#{method_name}"
           end
 
           # Checks to see if the method we are attempting to trace
@@ -210,7 +210,7 @@ module NewRelic
           # anything if the method doesn't exist.
           def newrelic_method_exists?(method_name)
             exists = method_defined?(method_name) || private_method_defined?(method_name)
-            ::NewRelic::Agent.logger.error("Did not trace #{self.name}##{method_name} because that method does not exist") unless exists
+            ::NewRelic::Agent.logger.error("Did not trace #{class_name}##{method_name} because that method does not exist") unless exists
             exists
           end
 
@@ -345,7 +345,7 @@ module NewRelic
           alias_method method_name, _traced_method_name(method_name, metric_name_code)
           send visibility, method_name
           send visibility, _traced_method_name(method_name, metric_name_code)
-          ::NewRelic::Agent.logger.debug("Traced method: class = #{self.name},"+
+          ::NewRelic::Agent.logger.debug("Traced method: class = #{class_name},"+
                     "method = #{method_name}, "+
                     "metric = '#{metric_name_code}'")
         end
@@ -383,6 +383,21 @@ module NewRelic
         def _sanitize_name(name)
           name.to_s.tr_s('^a-zA-Z0-9', '_')
         end
+
+        def class_name
+          return self.name if self.name && !self.name.empty?
+          return "AnonymousModule" if self.to_s.start_with?("#<Module:")
+
+          # trying to get the "MyClass" portion of "#<Class:MyClass>"
+          name = self.to_s[/^#<Class:(.+)>$/, 1]
+          if name.start_with?("0x")
+            "AnonymousClass"
+          elsif name.start_with?("#<Class:")
+            "AnonymousClass/Class"
+          else
+            "#{name}/Class"
+          end
+        end
       end
 
       # @!parse extend ClassMethods

data/lib/new_relic/agent/samplers/delayed_job_sampler.rb

@@ -51,7 +51,7 @@ module NewRelic
 
         def count(query)
           if ::ActiveRecord::VERSION::MAJOR.to_i < 4
-            ::Delayed::Job.count(query)
+            ::Delayed::Job.count(:conditions => query)
           else
             ::Delayed::Job.where(query).count
           end

data/lib/new_relic/control/instance_methods.rb

@@ -87,7 +87,7 @@ module NewRelic
                              "The agent will continue running in #{@started_in_env.inspect}. To alter this, ensure the desired environment is set before the agent starts.")
         else
           Agent.logger.info("Starting the New Relic agent in #{env.inspect} environment.",
-                            "To prevent agent startup add a NEWRELIC_AGENT_ENABLED=false environment variable or modify the #{env.inspect} section of your newrelic.yml.")
+                            "To prevent agent startup add a NEW_RELIC_AGENT_ENABLED=false environment variable or modify the #{env.inspect} section of your newrelic.yml.")
         end
 
         env

data/lib/new_relic/version.rb

@@ -12,7 +12,7 @@ module NewRelic
 
     MAJOR = 3
     MINOR = 15
-    TINY  = 0
+    TINY  = 1
 
     begin
       require File.join(File.dirname(__FILE__), 'build')

data/lib/tasks/versions.html.erb

@@ -11,14 +11,13 @@
   <tbody>
   <% for version in versions %>
     <tr>
-      <td><b><%= version.name %></b></td>
+      <td rowspan=<%= if version.notes; 2; else; 1; end %>><b><%= version.name %></b></td>
       <td><%= CGI.escapeHTML(version_list(version.supported)) %></td>
       <td><%= CGI.escapeHTML(version_list(version.deprecated)) %></td>
       <td><%= CGI.escapeHTML(version_list(version.experimental)) %></td>
     </tr>
     <% if version.notes %>
     <tr>
-      <td></td>
       <td colspan="3">
         <%= version.notes.join("<br />") %>
       </td>

data/newrelic_rpm.gemspec

@@ -27,7 +27,7 @@ EOS
     "CHANGELOG",
     "LICENSE",
     "README.md",
-    "GUIDELINES_FOR_CONTRIBUTING.md",
+    "CONTRIBUTING.md",
     "newrelic.yml"
   ]
 

data/test/environments/rails21/Gemfile

@@ -23,3 +23,5 @@ end
 
 gem 'pry', '~> 0.9.12'
 gem 'hometown', '~> 0.2.5'
+
+gem 'git', '< 1.3' if RUBY_VERSION < '1.9' # git 1.3.0 requires Ruby version >= 1.9

data/test/environments/rails22/Gemfile

@@ -23,3 +23,5 @@ end
 
 gem 'pry', '~> 0.9.12'
 gem 'hometown', '~> 0.2.5'
+
+gem 'git', '< 1.3' if RUBY_VERSION < '1.9' # git 1.3.0 requires Ruby version >= 1.9

data/test/environments/rails32/Gemfile

@@ -1,11 +1,6 @@
 source 'https://rubygems.org'
 
-if RUBY_VERSION < '1.9.3' # Rails 3.2.22.1 is incompatible with MRI 1.8.7 / ree
-  gem 'rails', '3.2.22'
-else
-  gem 'rails', '~>3.2.20'
-end
-
+gem 'rails', '~>3.2.20'
 gem 'i18n', '0.6.11'
 
 gem 'rake', '~>10.1.1'

data/test/environments/rails40/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rake'
+gem 'rake', '< 11'
 
 gem 'rails', '~>4.0.13'
 

data/test/environments/rails41/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rake'
+gem 'rake', '< 11'
 
 gem 'rails', '~>4.1.10'
 

data/test/environments/rails42/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rake'
+gem 'rake', '< 11'
 
 gem 'rails', '~>4.2.1'
 

data/test/environments/rails50/Gemfile

@@ -1,8 +1,8 @@
 source 'https://rubygems.org'
 
-gem 'rake'
+gem 'rake', '< 11'
 
-gem 'rails', '~>5.0.0beta2'
+gem 'rails', '5.0.0beta3'
 
 gem 'minitest', '5.2.3'
 gem 'mocha', :require => false

data/test/multiverse/lib/multiverse/suite.rb

@@ -174,6 +174,7 @@ module Multiverse
         f.puts newrelic_gemfile_line unless gemfile_text =~ /^\s*gem .newrelic_rpm./
         f.puts jruby_openssl_line unless gemfile_text =~ /^\s*gem .jruby-openssl./ || (defined?(JRUBY_VERSION) && JRUBY_VERSION > '1.7')
         f.puts minitest_line unless gemfile_text =~ /^\s*gem .minitest[^_]./
+        f.puts rake_line unless gemfile_text =~ /^\s*gem .rake[^_]./ || suite == 'rake'
         if RUBY_VERSION == "1.8.7"
           f.puts "gem 'json'" unless gemfile_text =~ /^\s.*gem .json./
         end
@@ -222,6 +223,15 @@ module Multiverse
       "gem 'minitest', '~> 4.7.5', :require => false"
     end
 
+    # rake 11 dropped support for ruby < 1.9.3
+    def rake_line
+      if RUBY_VERSION < '1.9.3'
+        "gem 'rake', '< 11'"
+      else
+        "gem 'rake'"
+      end
+    end
+
     def print_environment
       puts yellow("Environment loaded with:") if verbose?
       gems = Bundler.definition.specs.inject([]) do |m, s|

data/test/multiverse/suites/active_record/Envfile

@@ -1,6 +1,5 @@
 boilerplate_gems = <<-BOILERPLATE
   gem 'rack'
-  gem 'rake'
   gem 'i18n', '< 0.7.0' if RUBY_VERSION < '1.9.3' # i18n >= 0.7.0 only works on Ruby 1.9.3 and newer
 
   if RUBY_PLATFORM == 'java'
@@ -14,7 +13,7 @@ BOILERPLATE
 
 if RUBY_VERSION >= '2.2.2' && RUBY_PLATFORM != 'java'
   gemfile <<-RB
-    gem 'activerecord', '~> 5.0.0beta2'
+    gem 'activerecord', '~> 5.0.0beta3'
     gem 'minitest', '~> 5.2.3'
     #{boilerplate_gems}
   RB

data/test/multiverse/suites/capistrano/Envfile

@@ -3,6 +3,7 @@ suite_condition("Capistrano 3 not supported in 1.8.7 and flaky on JRuby") do
 end
 
 boilerplate = <<-BOILERPLATE
+  gem 'sshkit', '~> 1.8.1'
   gem 'rack'
   gem 'net-ssh', '2.9.2' if RUBY_VERSION <= '1.9.3'
   gem 'i18n', '< 0.7.0' if RUBY_VERSION < '1.9.3'

data/test/multiverse/suites/rack/Envfile

@@ -8,6 +8,23 @@ gemfile <<-RB
   gem 'rack-test'
 RB
 
+gemfile <<-RB
+  gem 'puma', '~>2.12.3'
+RB
+
+if RUBY_VERSION >= '2.2.2'
+  gemfile <<-RB
+    gem 'puma', '~>2.12.3'
+    gem 'rack', '2.0.0.alpha'
+    gem 'rack-test'
+  RB
+
+  gemfile <<-RB
+    gem 'rack', '2.0.0.alpha'
+    gem 'rack-test'
+  RB
+end
+
 gemfile <<-RB
   gem 'rack', '~>1.6.0'
   gem 'rack-test'

data/test/multiverse/suites/rails/Envfile

@@ -1,6 +1,6 @@
 if RUBY_VERSION >= '2.2.2' && RUBY_PLATFORM != 'java'
   gemfile <<-RB
-    gem 'rails', '~>5.0.0beta2'
+    gem 'rails', '5.0.0beta3'
     gem 'haml', :require => false
     gem 'minitest', '5.2.3'
   RB
@@ -30,11 +30,7 @@ if RUBY_VERSION >= '1.9.3'
 end
 
 gemfile <<-RB
-  if RUBY_VERSION < '1.9.3' # Rails 3.2.22.1 is incompatible with MRI 1.8.7 / ree
-    gem 'rails', '3.2.22'
-  else
-    gem 'rails', '~>3.2.20'
-  end
+  gem 'rails', '~>3.2.20'
   gem 'i18n', '~>0.6.11'
   gem 'haml', '4.0.2'   # Getting load issues with haml 4.0.3
   gem 'minitest_tu_shim', :require => false
@@ -42,11 +38,7 @@ gemfile <<-RB
 RB
 
 gemfile <<-RB
-  if RUBY_VERSION < '1.9.3' # Rails 3.2.22.1 is incompatible with MRI 1.8.7 / ree
-    gem 'rails', '3.2.22'
-  else
-    gem 'rails', '~>3.2.20'
-  end
+  gem 'rails', '~>3.2.20'
   gem 'i18n', '~>0.6.11'
   gem 'sinatra', '~> 1.4.5'
   gem 'haml', '4.0.2'   # Getting load issues with haml 4.0.3

data/test/multiverse/suites/rake/Envfile

@@ -1,3 +1,10 @@
+if RUBY_VERSION >= '1.9.3'
+  gemfile <<-RB
+    gem 'rack'
+    gem 'rake', '~> 11.1.0'
+  RB
+end
+
 gemfile <<-RB
   gem 'rack'
   gem 'rake', '~> 10.4'

data/test/multiverse/suites/resque/Envfile

@@ -1,11 +1,9 @@
 gemfile <<-RB
   gem 'resque', '1.23.0'
   gem 'json'
-  gem 'rake'
 RB
 
 gemfile <<-RB
   gem 'resque', '~>1.25.1'
   gem 'json'
-  gem 'rake'
 RB

data/test/new_relic/agent/database_test.rb

@@ -242,10 +242,11 @@ class NewRelic::Agent::DatabaseTest < Minitest::Test
     config.default('val')
     connection = mock('literal connection')
     plan = [{"QUERY PLAN"=>"Some Jazz"}]
-    connection.stubs(:execute).returns(plan)
+    sql = "SELECT * FROM table WHERE id = 'noise $11'"
+    confirm_sql = Proc.new {|query| query.include?(sql) }
+    connection.expects(:execute).with(&confirm_sql).returns(plan)
     NewRelic::Agent::Database.stubs(:get_connection).with(config).returns(connection)
 
-    sql = "SELECT * FROM table WHERE id = 'noise $11'"
     assert_equal([['QUERY PLAN'], [["Some Jazz"]]],
                  NewRelic::Agent::Database.explain_sql(sql, config, @explainer))
   end

data/test/new_relic/agent/instrumentation/action_view_subscriber_test.rb

@@ -232,6 +232,17 @@ class NewRelic::Agent::Instrumentation::ActionViewSubscriberTest < Minitest::Tes
     assert_equal('View/model/_list.html.erb/Partial',
                  partial_nodes[0].metric_name)
   end
+
+  def test_metric_path_identifies_file_render_event
+    render_event = NewRelic::Agent::Instrumentation::ActionViewSubscriber::RenderEvent.new('foo', 0, 0, 'bar', {} )
+    assert_equal('file', render_event.metric_path('baz', nil) )
+  end
+
+  def test_metric_path_cannot_identify_empty_collection_render_event
+    render_event = NewRelic::Agent::Instrumentation::ActionViewSubscriber::RenderEvent.new('foo', 0, 0, 'bar', {} )
+    assert_equal('(unknown)', render_event.metric_path('render_collection.action_view', nil) )
+  end
+
 end if ::Rails::VERSION::MAJOR.to_i >= 4
 
 else

data/test/new_relic/agent/method_tracer_test.rb

@@ -57,6 +57,16 @@ module TestModuleWithLog
   add_method_tracer :other_method, 'Custom/foo/bar'
 end
 
+class MyClass
+  def self.class_method
+  end
+
+  class << self
+    include NewRelic::Agent::MethodTracer
+    add_method_tracer :class_method
+  end
+end
+
 class NewRelic::Agent::MethodTracerTest < Minitest::Test
   attr_reader :stats_engine
 
@@ -181,6 +191,25 @@ class NewRelic::Agent::MethodTracerTest < Minitest::Test
     assert stats.call_count == 1
   end
 
+  def test_add_class_method_tracer
+    MyClass.class_method
+    stats = @stats_engine.get_stats("Custom/MyClass/Class/class_method")
+    assert stats.call_count == 1
+  end
+
+  def test_add_anonymous_class_method_tracer
+    cls = Class.new do
+      def instance_method; end
+      include NewRelic::Agent::MethodTracer
+      add_method_tracer :instance_method
+    end
+
+    cls.new.instance_method
+    # require 'pry'; binding.pry
+    stats = @stats_engine.get_stats("Custom/AnonymousClass/instance_method")
+    assert stats.call_count == 1
+  end
+
   def test_add_method_tracer__reentry
     self.class.add_method_tracer :simple_method
     self.class.add_method_tracer :simple_method

data/ui/views/newrelic/_sql_row.rhtml

@@ -7,7 +7,7 @@
     <div class="sql_statement">
       <small>
         <% if segment[:sql] %>
-          <%= line_wrap_sql(segment[:sql].sql ) %>
+          <%= line_wrap_sql(segment[:sql].respond_to?(:sql) ? segment[:sql].sql : segment[: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.sql) %>
+				<%= line_wrap_sql(@sql.respond_to?(:sql) ? @sql.sql : @sql) %>
 			</div>
 		</small></td>
 	</tr>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.15.0.314
+  version: 3.15.1.316
 platform: ruby
 authors:
 - Tim Krajcar
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-11 00:00:00.000000000 Z
+date: 2016-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -199,7 +199,7 @@ extra_rdoc_files:
 - CHANGELOG
 - LICENSE
 - README.md
-- GUIDELINES_FOR_CONTRIBUTING.md
+- CONTRIBUTING.md
 - newrelic.yml
 files:
 - ".gitignore"
@@ -207,7 +207,7 @@ files:
 - ".travis.yml"
 - ".yardopts"
 - CHANGELOG
-- GUIDELINES_FOR_CONTRIBUTING.md
+- CONTRIBUTING.md
 - Gemfile
 - Guardfile
 - LICENSE