newrelic_rpm 3.12.1.298 → 3.13.0.299

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0798cd154bf943c9a4fc467ef1c36e427b72fa69
-  data.tar.gz: cd97b3eeb7c08207ef647fab453450d9c4e012b2
+  metadata.gz: 6a66f2339d582713549cd887c6c249a1e167060a
+  data.tar.gz: 340be0c604f5a041c013c02118bc1f83bfae2fd1
 SHA512:
-  metadata.gz: 1a28882d587c9633022b7f0192d9a309a084abcf9610a3b3a86e506bcb313068db9583839290c4ca367942c2aba89e8aff42fa045b1dae8384e33195e8d8a1e6
-  data.tar.gz: 5055fa5929114caa4fecc07e9e76268dfb7187de30df4551e808254326dfd7e16fbd9a259c03e6c494e30f711d2f63969efb4a895d89700b4021800aed046208
+  metadata.gz: f09c1d8499f23aa1659c2a7622f7655b94644493cca9401f9ba663c69c8ff6394c06ef9238b7bb0fc8a62f10be9dd099d27a45e80403810d801ab55ade84d5f0
+  data.tar.gz: 6c325a570205de1ce13fe012203255fbd413684f9f387149f3a967d959064965f1284e4c50820f5499d37f29ab8cae39018f3ff60aab0580256283569923f037

data/CHANGELOG

@@ -1,5 +1,42 @@
 # New Relic Ruby Agent Release Notes #
 
+## v3.13.0 ##
+
+  * Bugfix for uninitialized constant NewRelic::Agent::ParameterFiltering
+
+  Users in some environments encountered a NameError: uninitialized constant NewRelic::Agent::ParameterFiltering from the Rails instrumentation while
+  running v3.12.x of the Ruby agent. This issue has been fixed.
+
+  * Rake task instrumentation
+
+  The Ruby agent now provides opt-in tracing for Rake tasks. If you run
+  long jobs via Rake, you can get all the visibility and goodness of New Relic
+  that your other background jobs have. To enable this, see
+  https://docs.newrelic.com/docs/agents/ruby-agent/frameworks/rake
+
+  * Redis instrumentation
+
+  Redis operations will now show up on the Databases tab and in transaction
+  traces. By default, only command names will be captured; to capture command
+  arguments, set `transaction_tracer.record_redis_arguments` to `true` in
+  your configuration.
+
+  * Fix for over-obfuscated SQL Traces and PostgreSQL
+
+  An issue with the agent obfuscating column and table names from Slow SQL
+  Traces when using PostgreSQL has been resolved.
+
+  * Rubinius 2.5.8 VM metric renaming support
+
+  Rubinius 2.5.8 changed some VM metric names and eliminated support for
+  total allocated object counters. The agent has been updated accordingly.
+
+  * Fix agent attributes with a value of false not being stored
+
+  An issue introduced in v3.12.1 prevented attributes (like those added with
+  `add_custom_attributes`) from being stored if their value was false. This has
+  been fixed.
+
 ## v3.12.1 ##
 
   * More granular Database metrics for ActiveRecord 3 and 4

data/GUIDELINES_FOR_CONTRIBUTING.md

@@ -73,7 +73,7 @@ More details are available in
 You are welcome to send pull requests to us - however, by doing so you agree
 that you are granting New Relic a non-exclusive, non-revokable, no-cost license
 to use the code, algorithms, patents, and ideas in that code in our products if
-we so choose. You also agree the code is provided as-is and you provide no
+we so choose. Fortunately, you also agree the code is provided as-is and you provide no
 warranties as to its fitness or correctness for any purpose.
 
 If you have any feedback on how we can make contributing easier, please get in

data/LICENSE

@@ -1,8 +1,8 @@
-This product includes jquery written by John Resig
+This product includes jquery 1.4.2, written by John Resig
 and distributed under an MIT license.
-See https://github.com/jquery/jquery/blob/master/MIT-LICENSE.txt
+See https://github.com/jquery/jquery/blob/1.4.2/MIT-LICENSE.txt
 
-    Copyright (c) 2011 John Resig, http://jquery.com/
+    Copyright (c) 2010 John Resig, http://jquery.com/
 
     Permission is hereby granted, free of charge, to any person obtaining
     a copy of this software and associated documentation files (the
@@ -112,7 +112,7 @@ the software.
 
 
 All other components of this product are
-Copyright (c) 2008-2014 New Relic, Inc.  All rights reserved.
+Copyright (c) 2008-2015 New Relic, Inc.  All rights reserved.
 
 Certain inventions disclosed in this file may be claimed within
 patents owned or patent applications filed by New Relic, Inc. or third

data/README.md

@@ -59,8 +59,8 @@ To monitor your applications in production, create an account at
 http://newrelic.com/ .  There you can
 sign up for a free Lite account or one of our paid subscriptions.
 
-Once you receive the welcome e-mail with a license key and
-`newrelic.yml` file. You can copy the `newrelic.yml` file into your app config
+Once you receive the welcome email with a license key and
+`newrelic.yml` file, you can copy the `newrelic.yml` file into your app config
 directory OR can generate the file manually with command:
 
     newrelic install --license_key="YOUR_KEY" "My application"
@@ -193,7 +193,7 @@ Also available is community support on IRC: we generally use #newrelic
 on irc.freenode.net
 
 Find a bug? Contact us via [support.newrelic.com](http://support.newrelic.com/),
-or e-mail support @ newrelic.com.
+or email support@newrelic.com.
 
 Thank you, and may your application scale to infinity plus one.
 

data/lib/new_relic/agent/agent.rb

@@ -71,6 +71,8 @@ module NewRelic
         @connect_attempts   = 0
         @environment_report = nil
 
+        @wait_on_connect_reader, @wait_on_connect_writer = IO.pipe
+
         @obfuscator = lambda {|sql| NewRelic::Agent::Database.default_sql_obfuscator(sql) }
 
         setup_attribute_filter
@@ -867,6 +869,30 @@ module NewRelic
             # use Agent.instance.events.subscribe(:finished_configuring) callback instead!
           end
 
+          class WaitOnConnectTimeout < StandardError
+          end
+
+          # Used for testing to let us know we've actually started to wait
+          def waited_on_connect?
+            @waited_on_connect
+          end
+
+          def signal_connected
+            @wait_on_connect_writer << "."
+          end
+
+          def wait_on_connect(timeout)
+            return if connected?
+
+            @waited_on_connect = true
+            NewRelic::Agent.logger.debug("Waiting on connect to complete.")
+            IO.select([@wait_on_connect_reader], nil, nil, timeout)
+
+            unless connected?
+              raise WaitOnConnectTimeout, "Agent was unable to connect in #{timeout} seconds."
+            end
+          end
+
           # Logs when we connect to the server, for debugging purposes
           # - makes sure we know if an agent has not connected
           def log_connection!(config_data)
@@ -936,6 +962,7 @@ module NewRelic
           query_server_for_configuration
           @connected_pid = $$
           @connect_state = :connected
+          signal_connected
         rescue NewRelic::Agent::ForceDisconnectException => e
           handle_force_disconnect(e)
         rescue NewRelic::Agent::LicenseException => e

data/lib/new_relic/agent/commands/thread_profiler_session.rb

@@ -14,6 +14,8 @@ module NewRelic
 
         def initialize(backtrace_service)
           @backtrace_service = backtrace_service
+          @started_at = nil
+          @finished_profile = nil
         end
 
         def handle_start_command(agent_command)

data/lib/new_relic/agent/configuration/default_source.rb

@@ -409,6 +409,35 @@ module NewRelic
           :allowed_from_server => false,
           :description => 'Defines a comma-delimited list of rake tasks that should not be instrumented by the agent (e.g. \'assets:precompile,db:migrate\').'
         },
+        :disable_rake => {
+          :default => false,
+          :public => true,
+          :type => Boolean,
+          :allowed_from_server => false,
+          :description => 'Enable or disable rake instrumentation.'
+        },
+        :disable_rake_instrumentation => {
+          :default => false,
+          :public => false,
+          :type => Boolean,
+          :allowed_from_server => false,
+          :description => 'Enable or disable rake instrumentation. Preferred key is `disable_rake`'
+        },
+        :'rake.tasks' => {
+          :default => [],
+          :public => true,
+          :type => Array,
+          :allowed_from_server => false,
+          :transform => DefaultSource.method(:convert_to_regexp_list),
+          :description => 'List of Rake tasks to automatically instrument'
+        },
+        :'rake.connect_timeout' => {
+          :default => 10,
+          :public => true,
+          :type => Fixnum,
+          :allowed_from_server => false,
+          :description => 'Timeout for waiting on connect to complete before a rake task'
+        },
         :'profiling.available' => {
           :default => DefaultSource.profiling_available,
           :public => false,
@@ -762,6 +791,13 @@ module NewRelic
           :allowed_from_server => true,
           :description => 'Obfuscation level for SQL queries reported in transaction trace nodes. Valid options are <code>obfuscated</code>, <code>raw</code>, <code>none</code>.'
         },
+        :'transaction_tracer.record_redis_arguments' => {
+          :default => false,
+          :public => true,
+          :type => Boolean,
+          :allowed_from_server => false,
+          :description => 'Determines whether Redis command arguments should be recorded within Transaction Traces'
+        },
         :'transaction_tracer.capture_attributes' => {
           :default => true,
           :public => true,
@@ -821,6 +857,20 @@ module NewRelic
           :dynamic_name => true,
           :description  => 'Defines whether the agent will install <a href="/docs/agents/ruby-agent/frameworks/mongo-instrumentation">instrumentation for the Mongo gem</a>.'
         },
+        :disable_redis => {
+          :default      => false,
+          :public       => true,
+          :type         => Boolean,
+          :allowed_from_server => false,
+          :description  => 'Defines whether the agent will install <a href="/docs/agents/ruby-agent/frameworks/redis-instrumentation">instrumentation for Redis</a>.'
+        },
+        :disable_redis_instrumentation => {
+          :default      => false,
+          :public       => false,
+          :type         => Boolean,
+          :allowed_from_server => false,
+          :description  => 'Disables installation of Redis instrumentation. Standard key to use is disable_redis.'
+        },
         :'slow_sql.enabled' => {
           :default => value_of(:'transaction_tracer.enabled'),
           :public => true,
@@ -1309,7 +1359,7 @@ module NewRelic
         },
         :disable_grape_instrumentation => {
           :default      => false,
-          :public       => true,
+          :public       => false,
           :type         => Boolean,
           :allowed_from_server => false,
           :description  => 'Disables installation of Grape instrumentation.'

data/lib/new_relic/agent/configuration/high_security_source.rb

@@ -19,6 +19,7 @@ module NewRelic
             :'transaction_tracer.record_sql' => record_sql_setting(local_settings, :'transaction_tracer.record_sql'),
             :'slow_sql.record_sql'           => record_sql_setting(local_settings, :'slow_sql.record_sql'),
             :'mongo.obfuscate_queries'       => true,
+            :'transaction_tracer.record_redis_arguments' => false,
 
             :'custom_insights_events.enabled'   => false,
             :'strip_exception_messages.enabled' => true

data/lib/new_relic/agent/database.rb

@@ -317,8 +317,18 @@ module NewRelic
         end
       end
 
-      class Statement < String
-        attr_accessor :adapter, :config, :explainer
+      class Statement
+        attr_accessor :sql, :config, :explainer
+
+        def initialize(sql, config={}, explainer=nil)
+          @sql = Database.capture_query(sql)
+          @config = config
+          @explainer = explainer
+        end
+
+        def adapter
+          config && config[:adapter]
+        end
       end
     end
   end

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

@@ -48,14 +48,15 @@ module NewRelic
         end
 
         def default_sql_obfuscator(sql)
-          if sql[-3,3] == '...'
+          stmt = sql.kind_of?(Statement) ? sql : Statement.new(sql)
+
+          if stmt.sql[-3,3] == '...'
             return QUERY_TOO_LARGE_MESSAGE
           end
 
-          stmt = sql.kind_of?(Statement) ? sql : Statement.new(sql)
           obfuscate_double_quotes = stmt.adapter.to_s !~ /postgres|sqlite/
 
-          obfuscated = obfuscate_numeric_literals(stmt)
+          obfuscated = obfuscate_numeric_literals(stmt.sql)
 
           if obfuscate_double_quotes
             obfuscated = obfuscate_quoted_literals(obfuscated)

data/lib/new_relic/agent/datastores.rb

@@ -106,7 +106,7 @@ module NewRelic
         metrics = MetricHelper.metrics_for(product, operation, collection)
         scoped_metric = metrics.first
         NewRelic::Agent::MethodTracer.trace_execution_scoped(metrics) do
-          t0 = Time.now
+          t0 = Time.now if callback
           begin
             result = yield
           ensure

data/lib/new_relic/agent/datastores/redis.rb

@@ -0,0 +1,131 @@
+# 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.
+
+module NewRelic
+  module Agent
+    module Datastores
+      module Redis
+        MULTI_OPERATION = 'multi'
+        PIPELINE_OPERATION = 'pipeline'
+        BINARY_DATA_PLACEHOLDER = "<binary data>"
+        PRODUCT_NAME = 'Redis'
+        CONNECT = 'connect'
+
+        MAXIMUM_COMMAND_LENGTH = 1000
+        MAXIMUM_ARGUMENT_LENGTH = 64
+        CHUNK_SIZE   = (MAXIMUM_ARGUMENT_LENGTH - 5) / 2
+        PREFIX_RANGE = (0...CHUNK_SIZE)
+        SUFFIX_RANGE = (-CHUNK_SIZE..-1)
+
+        OBFUSCATE_ARGS = ' ?'
+        ELLIPSES = '...'
+        NEWLINE = "\n"
+        SPACE = ' '
+        QUOTE = '"'
+        ALL_BUT_FIRST = (1..-1)
+
+        STRINGS_SUPPORT_ENCODING = SPACE.respond_to?(:encoding)
+
+        def self.format_command(command_with_args)
+          if Agent.config[:'transaction_tracer.record_redis_arguments']
+            result = ""
+
+            append_command_with_args(result, command_with_args)
+
+            trim_result(result) if result.length >= MAXIMUM_COMMAND_LENGTH
+            result.strip!
+            result
+          else
+            nil
+          end
+        end
+
+        def self.format_pipeline_commands(commands_with_args)
+          result = ""
+
+          commands_with_args.each do |command|
+            if result.length >= MAXIMUM_COMMAND_LENGTH
+              trim_result(result)
+              break
+            end
+
+            append_pipeline_command(result, command)
+            result << NEWLINE
+          end
+
+          result.strip!
+          result
+        end
+
+        def self.append_pipeline_command(result, command_with_args)
+          if Agent.config[:'transaction_tracer.record_redis_arguments']
+            append_command_with_args(result, command_with_args)
+          else
+            append_command_with_no_args(result, command_with_args)
+          end
+
+          result
+        end
+
+        def self.append_command_with_args(result, command_with_args)
+          result << command_with_args.first.to_s
+
+          if command_with_args.size > 1
+            command_with_args[ALL_BUT_FIRST].each do |arg|
+              ellipsize(result, arg)
+
+              break if result.length >= MAXIMUM_COMMAND_LENGTH
+            end
+          end
+
+          result
+        end
+
+        def self.append_command_with_no_args(result, command_with_args)
+          result << command_with_args.first.to_s
+          result << OBFUSCATE_ARGS if command_with_args.size > 1
+          result
+        end
+
+        def self.is_supported_version?
+          ::NewRelic::VersionNumber.new(::Redis::VERSION) >= ::NewRelic::VersionNumber.new("3.0.0")
+        end
+
+        def self.ellipsize(result, string)
+          result << SPACE
+          if !string.is_a?(String)
+            result << string.to_s
+          elsif STRINGS_SUPPORT_ENCODING && string.encoding == Encoding::ASCII_8BIT
+            result << BINARY_DATA_PLACEHOLDER
+          elsif string.length > MAXIMUM_ARGUMENT_LENGTH
+            result << QUOTE
+            result << string[PREFIX_RANGE]
+            result << ELLIPSES
+            result << string[SUFFIX_RANGE]
+            result << QUOTE
+          else
+            result << QUOTE
+            result << string
+            result << QUOTE
+          end
+        end
+
+        def self.safe_from_third_party_gem?
+          if NewRelic::LanguageSupport.bundled_gem?("newrelic-redis")
+            ::NewRelic::Agent.logger.info("Not installing New Relic supported Redis instrumentation because the third party newrelic-redis gem is present")
+            false
+          else
+            true
+          end
+        end
+
+        def self.trim_result(result)
+          result.slice!((MAXIMUM_COMMAND_LENGTH-ELLIPSES.length)..-1)
+          result.strip!
+          result << ELLIPSES
+        end
+      end
+    end
+  end
+end

data/lib/new_relic/agent/error_collector.rb

@@ -70,7 +70,7 @@ module NewRelic
         if block
           define_method(:ignore_filter_proc, &block)
         elsif method_defined?(:ignore_filter_proc)
-          undef :ignore_filter_proc
+          remove_method :ignore_filter_proc
         end
         @ignore_filter
       end
@@ -121,7 +121,7 @@ module NewRelic
 
       def exception_tagged?(exception)
         return false if exception_is_java_object?(exception)
-        exception.instance_variable_get(EXCEPTION_TAG_IVAR)
+        exception.instance_variable_defined?(EXCEPTION_TAG_IVAR)
       end
 
       def tag_exception(exception)