newrelic_rpm 3.12.0.288 → 3.12.1.298

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab8bebcd389bae69e6fbac95dd23d18923adc883
-  data.tar.gz: f8270582f1517c086367167d739444c11a01db90
+  metadata.gz: 0798cd154bf943c9a4fc467ef1c36e427b72fa69
+  data.tar.gz: cd97b3eeb7c08207ef647fab453450d9c4e012b2
 SHA512:
-  metadata.gz: 35f890abc5f586c85bcfe9d94830053574ae40523aec910094725627649caece236d2ecba04b6d1da7dee8270b302eb1fb331520d8e728b73c661cbb1855bde3
-  data.tar.gz: 6998f741f755f020c6f8c676e0a8de17e92efaf4d6261fdbb2ab73fe66af51de63c28c084c1a43cfbfb18bb998fa1254a6d59d977933156f62e85d0580b8f873
+  metadata.gz: 1a28882d587c9633022b7f0192d9a309a084abcf9610a3b3a86e506bcb313068db9583839290c4ca367942c2aba89e8aff42fa045b1dae8384e33195e8d8a1e6
+  data.tar.gz: 5055fa5929114caa4fecc07e9e76268dfb7187de30df4551e808254326dfd7e16fbd9a259c03e6c494e30f711d2f63969efb4a895d89700b4021800aed046208

data/CHANGELOG

@@ -1,5 +1,47 @@
 # New Relic Ruby Agent Release Notes #
 
+## v3.12.1 ##
+
+  * More granular Database metrics for ActiveRecord 3 and 4
+
+  Database metrics recorded for non-SELECT operations (UPDATE, INSERT, DELETE,
+  etc.) on ActiveRecord 3 and 4 now include the model name that the query was
+  being executed against, allowing you to view these queries broken down by
+  model on the Datastores page. Thanks to Bill Kayser for reporting this issue!
+
+  * Support for Multiverse testing third party gems
+
+  The Ruby agent has rich support for testing multiple gem versions, but
+  previously that wasn't accessible to third party gems.  Now you can now
+  simply `require 'task/multiverse'` in your Rakefile to access the same
+  test:multiverse task that New Relic uses itself. For more details, see:
+
+  https://docs.newrelic.com/docs/agents/ruby-agent/frameworks/third-party-instrumentation#testing-your-extension
+
+  * Use Sidekiq 3.x's error handler
+
+  Sidekiq 3.x+ provides an error handler for internal and middleware related
+  failures. Failures at these points were previously unseen by the Ruby agent,
+  but now they are properly traced.
+
+  * Better error messages for common configuration problems with Capistrano
+
+  Templating errors in newrelic.yml would result in obscure error messages
+  during Capistrano deployments. These messages now more properly reflect the
+  root cause of the errors.
+
+  * newrelic_ignore methods allow strings
+
+  The newrelic_ignore methods previously only supported passing symbols, and
+  would quietly ignore any strings passed. Now strings can be passed as well
+  to get the intuitive ignoring behavior you'd expect.
+
+  * Replace DNS resolver for Resque jobs with Resolv
+
+  In some circumstances customers with a very high number of short-lived Resque
+  jobs were experiencing deadlocks during DNS resolution. Resolv is an all Ruby
+  DNS resolver that replaces the libc implementation to prevent these deadlocks.
+
 ## v3.12.0 ##
 
   * Flexible capturing of attributes

data/Rakefile

@@ -22,13 +22,13 @@ namespace :test do
 
   agent_home = File.expand_path(File.dirname(__FILE__))
 
-  desc "Run functional test suite for newrelic"
-  task :multiverse, [:suite, :param1, :param2, :param3, :param4] => [] do |t, args|
-    require File.expand_path(File.join(File.dirname(__FILE__), 'test', 'multiverse', 'lib', 'multiverse', 'environment'))
-    opts = Multiverse::Runner.parse_args(args)
-    Multiverse::Runner.run(args.suite, opts)
+  # Agent-specific setup to enforce getting our proper suites directory
+  task :multiverse_setup do
+    ENV["SUITES_DIRECTORY"] = File.expand_path(File.join(File.dirname(__FILE__), 'test', 'multiverse', 'suites'))
   end
 
+  task :multiverse => :multiverse_setup
+
   desc "Test the multiverse testing framework by executing tests in test/multiverse/test. Get meta with it."
   task 'multiverse:self', [:suite, :mode] => [] do |t, args|
     args.with_defaults(:suite => "", :mode => "")

data/lib/new_relic/agent.rb

@@ -3,7 +3,6 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require 'forwardable'
-require 'new_relic/control'
 
 # @api public
 module NewRelic
@@ -34,12 +33,10 @@ module NewRelic
     require 'new_relic/noticed_error'
     require 'new_relic/timer_lib'
 
-    require 'new_relic/agent'
     require 'new_relic/agent/stats'
     require 'new_relic/agent/chained_call'
     require 'new_relic/agent/cross_app_monitor'
     require 'new_relic/agent/agent'
-    require 'new_relic/agent/shim_agent'
     require 'new_relic/agent/method_tracer'
     require 'new_relic/agent/worker_loop'
     require 'new_relic/agent/event_loop'
@@ -100,6 +97,7 @@ module NewRelic
     UNKNOWN_METRIC = '(unknown)'.freeze
 
     @agent = nil
+    @logger = nil
 
     # The singleton Agent instance.  Used internally.
     def agent #:nodoc:
@@ -157,6 +155,8 @@ module NewRelic
     #
     # @api public
     def record_metric(metric_name, value) #THREAD_LOCAL_ACCESS
+      return unless agent
+
       if value.is_a?(Hash)
         stats = NewRelic::Agent::Stats.new
 
@@ -180,6 +180,8 @@ module NewRelic
     #
     # @api public
     def increment_metric(metric_name, amount=1) #THREAD_LOCAL_ACCESS
+      return unless agent
+
       agent.stats_engine.tl_record_unscoped_metrics(metric_name) do |stats|
         stats.increment_count(amount)
       end
@@ -316,7 +318,7 @@ module NewRelic
     # @api public
     #
     def after_fork(options={})
-      agent.after_fork(options)
+      agent.after_fork(options) if agent
     end
 
     # Shutdown the agent.  Call this before exiting.  Sends any queued data
@@ -335,7 +337,7 @@ module NewRelic
     #
     # @api public
     def drop_buffered_data
-      agent.drop_buffered_data
+      agent.drop_buffered_data if agent
     end
 
     # Add instrumentation files to the agent.  The argument should be
@@ -422,10 +424,14 @@ module NewRelic
     # @api public
     #
     def disable_all_tracing
-      agent.push_trace_execution_flag(false)
-      yield
-    ensure
-      agent.pop_trace_execution_flag
+      return yield unless agent
+
+      begin
+        agent.push_trace_execution_flag(false)
+        yield
+      ensure
+        agent.pop_trace_execution_flag
+      end
     end
 
     # This method disables the recording of transaction traces in the given
@@ -434,6 +440,8 @@ module NewRelic
     # @api public
     #
     def disable_transaction_tracing
+      return yield unless agent
+
       state = agent.set_record_tt(false)
       begin
         yield
@@ -454,6 +462,8 @@ module NewRelic
     # @api public
     #
     def disable_sql_recording
+      return yield unless agent
+
       state = agent.set_record_sql(false)
       begin
         yield
@@ -557,9 +567,9 @@ module NewRelic
     # @param [String] method the name of the finder method or other method to
     # identify the operation with.
     #
-    def with_database_metric_name(model, method = nil, &block) #THREAD_LOCAL_ACCESS
+    def with_database_metric_name(model, method = nil, product = nil, &block) #THREAD_LOCAL_ACCESS
       if txn = Transaction.tl_current
-        txn.with_database_metric_name(model, method, &block)
+        txn.with_database_metric_name(model, method, product, &block)
       else
         yield
       end
@@ -596,6 +606,7 @@ module NewRelic
     # @api public
     #
     def browser_timing_header
+      return "" unless agent
       agent.javascript_instrumentor.browser_timing_header
     end
 
@@ -665,6 +676,7 @@ module NewRelic
     # @deprecated
     #
     def get_stats(metric_name, use_scope=false)
+      return unless agent
       agent.stats_engine.get_stats(metric_name, use_scope)
     end
 

data/lib/new_relic/agent/agent.rb

@@ -43,9 +43,10 @@ module NewRelic
       end
 
       def initialize
-        # FIXME: temporary work around for RUBY-839
-        # This should be handled with a configuration callback
-        start_service_if_needed
+        @started = false
+        @event_loop = nil
+
+        @service = NewRelicService.new
 
         @events                = NewRelic::Agent::EventListener.new
         @stats_engine          = NewRelic::Agent::StatsEngine.new
@@ -55,7 +56,6 @@ module NewRelic
         @cross_app_monitor     = NewRelic::Agent::CrossAppMonitor.new(@events)
         @synthetics_monitor    = NewRelic::Agent::SyntheticsMonitor.new(@events)
         @error_collector       = NewRelic::Agent::ErrorCollector.new
-        @utilization_data      = NewRelic::Agent::UtilizationData.new
         @transaction_rules     = NewRelic::Agent::RulesEngine.new
         @harvest_samplers      = NewRelic::Agent::SamplerCollection.new(@events)
         @monotonic_gc_profiler = NewRelic::Agent::VM::MonotonicGCProfiler.new
@@ -71,7 +71,6 @@ module NewRelic
         @connect_attempts   = 0
         @environment_report = nil
 
-        @harvest_lock = Mutex.new
         @obfuscator = lambda {|sql| NewRelic::Agent::Database.default_sql_obfuscator(sql) }
 
         setup_attribute_filter
@@ -134,7 +133,6 @@ module NewRelic
         attr_reader :transaction_rules
         # Responsbile for restarting the harvest thread
         attr_reader :harvester
-        attr_reader :harvest_lock
         # GC::Profiler.total_time is not monotonic so we wrap it.
         attr_reader :monotonic_gc_profiler
         attr_reader :custom_event_aggregator
@@ -398,12 +396,6 @@ module NewRelic
             end
           end
 
-          def start_service_if_needed
-            if Agent.config[:monitor_mode] && !@service
-              @service = NewRelic::Agent::NewRelicService.new
-            end
-          end
-
           # Classy logging of the agent version and the current pid,
           # so we can disambiguate processes in the log file and make
           # sure they're running a reasonable version
@@ -571,7 +563,6 @@ module NewRelic
         # might be holding locks for background thread that aren't there anymore.
         def reset_objects_with_locks
           @stats_engine = NewRelic::Agent::StatsEngine.new
-          reset_harvest_locks
         end
 
         def flush_pipe_data
@@ -587,24 +578,6 @@ module NewRelic
         # start_worker_thread method - this is an artifact of
         # refactoring and can be moved, renamed, etc at will
         module StartWorkerThread
-          # Synchronize with the harvest loop. If the harvest thread has taken
-          # a lock (DNS lookups, backticks, agent-owned locks, etc), and we
-          # fork while locked, this can deadlock child processes. For more
-          # details, see https://github.com/resque/resque/issues/1101
-          def synchronize_with_harvest
-            harvest_lock.synchronize do
-              yield
-            end
-          end
-
-          # Some forking cases (like Resque) end up with harvest lock from the
-          # parent process orphaned in the child. Let it go before we proceed.
-          def reset_harvest_locks
-            return if harvest_lock.nil?
-
-            harvest_lock.unlock if harvest_lock.locked?
-          end
-
           def create_event_loop
             EventLoop.new
           end
@@ -612,7 +585,6 @@ module NewRelic
           # Never allow any data type to be reported more frequently than once
           # per second.
           MIN_ALLOWED_REPORT_PERIOD = 1.0
-          UTILIZATION_REPORT_PERIOD = 30 * 60 # every half hour
 
           def report_period_for(method)
             config_key = "data_report_periods.#{method}".to_sym
@@ -645,14 +617,6 @@ module NewRelic
             @event_loop.fire_every(report_period_for(:analytic_event_data), :report_event_data)
             @event_loop.fire_every(LOG_ONCE_KEYS_RESET_PERIOD,              :reset_log_once_keys)
 
-            if Agent.config[:collect_utilization] && !in_resque_child_process?
-              @event_loop.on(:report_utilization_data) do
-                transmit_utilization_data
-              end
-              @event_loop.fire(:report_utilization_data)
-              @event_loop.fire_every(UTILIZATION_REPORT_PERIOD, :report_utilization_data)
-            end
-
             @event_loop.run
           end
 
@@ -839,7 +803,8 @@ module NewRelic
           # server. Returns a literal hash containing the options
           def connect_settings
             sanitize_environment_report
-            {
+
+            settings = {
               :pid => $$,
               :host => local_host,
               :app_name => Agent.config.app_names,
@@ -850,6 +815,12 @@ module NewRelic
               :settings => Agent.config.to_collector_hash,
               :high_security => Agent.config[:high_security]
             }
+
+            unless Agent.config[:disable_utilization]
+              settings[:utilization] = UtilizationData.new.to_collector_hash
+            end
+
+            settings
           end
 
           # Returns connect data passed back from the server
@@ -878,7 +849,7 @@ module NewRelic
           def finish_setup(config_data)
             return if config_data == nil
 
-            @service.agent_id = config_data['agent_run_id'] if @service
+            @service.agent_id = config_data['agent_run_id']
 
             if config_data['agent_config']
               ::NewRelic::Agent.logger.debug "Using config from server"
@@ -887,7 +858,7 @@ module NewRelic
             ::NewRelic::Agent.logger.debug "Server provided config: #{config_data.inspect}"
             server_config = NewRelic::Agent::Configuration::ServerSource.new(config_data, Agent.config)
             Agent.config.replace_or_add_config(server_config)
-            log_connection!(config_data) if @service
+            log_connection!(config_data)
 
             @transaction_rules = RulesEngine.create_transaction_rules(config_data)
             @stats_engine.metric_rules = RulesEngine.create_metric_rules(config_data)
@@ -1086,10 +1057,6 @@ module NewRelic
           harvest_and_send_from_container(@custom_event_aggregator,      :custom_event_data)
         end
 
-        def harvest_and_send_utilization_data
-          harvest_and_send_from_container(@utilization_data, :utilization_data)
-        end
-
         def check_for_and_handle_agent_commands
           begin
             @agent_command_router.check_for_and_handle_agent_commands
@@ -1108,39 +1075,25 @@ module NewRelic
           NewRelic::Agent.record_metric("Supportability/remote_unavailable/#{endpoint.to_s}", 0.0)
         end
 
-        def transmit_data
-          harvest_lock.synchronize do
-            transmit_data_already_locked
-          end
-        end
-
         def transmit_event_data
           transmit_single_data_type(:harvest_and_send_analytic_event_data, "TransactionEvent")
         end
 
-        def transmit_utilization_data
-          transmit_single_data_type(:harvest_and_send_utilization_data, "UtilizationData")
-        end
-
         def transmit_single_data_type(harvest_method, supportability_name)
           now = Time.now
 
           msg = "Sending #{harvest_method.to_s.gsub("harvest_and_send_", "")} to New Relic Service"
           ::NewRelic::Agent.logger.debug msg
 
-          harvest_lock.synchronize do
-            @service.session do # use http keep-alive
-              self.send(harvest_method)
-            end
+          @service.session do # use http keep-alive
+            self.send(harvest_method)
           end
         ensure
           duration = (Time.now - now).to_f
           NewRelic::Agent.record_metric("Supportability/#{supportability_name}Harvest", duration)
         end
 
-        # This method is expected to only be called with the harvest_lock
-        # already held
-        def transmit_data_already_locked
+        def transmit_data
           now = Time.now
           ::NewRelic::Agent.logger.debug "Sending data to New Relic Service"
 
@@ -1160,8 +1113,6 @@ module NewRelic
           NewRelic::Agent.record_metric('Supportability/Harvest', duration)
         end
 
-        private :transmit_data_already_locked
-
         # This method contacts the server to send remaining data and
         # let the server know that the agent is shutting down - this
         # allows us to do things like accurately set the end of the
@@ -1177,7 +1128,6 @@ module NewRelic
               @events.notify(:before_shutdown)
               transmit_data
               transmit_event_data
-              transmit_utilization_data if NewRelic::Agent.config[:collect_utilization]
 
               if @connected_pid == $$ && !@service.kind_of?(NewRelic::Agent::NewRelicService)
                 ::NewRelic::Agent.logger.debug "Sending New Relic service agent run shutdown message"

data/lib/new_relic/agent/agent_logger.rb

@@ -5,10 +5,12 @@
 require 'thread'
 require 'logger'
 require 'new_relic/agent/hostname'
+require 'new_relic/agent/log_once'
 
 module NewRelic
   module Agent
     class AgentLogger
+      include LogOnce
 
       def initialize(root = "", override_logger=nil)
         @already_logged_lock = Mutex.new
@@ -40,30 +42,6 @@ module NewRelic
         format_and_send(:debug, msgs, &blk)
       end
 
-      NUM_LOG_ONCE_KEYS = 1000
-
-      def log_once(level, key, *msgs)
-        @already_logged_lock.synchronize do
-          return if @already_logged.include?(key)
-
-          if @already_logged.size >= NUM_LOG_ONCE_KEYS && key.kind_of?(String)
-            # The reason for preventing too many keys in `logged` is for
-            # memory concerns.
-            # The reason for checking the type of the key is that we always want
-            # to allow symbols to log, since there are very few of them.
-            # The assumption here is that you would NEVER pass dynamically-created
-            # symbols, because you would never create symbols dynamically in the
-            # first place, as that would already be a memory leak in most Rubies,
-            # even if we didn't hang on to them all here.
-            return
-          end
-
-          @already_logged[key] = true
-        end
-
-        self.send(level, *msgs)
-      end
-
       def is_startup_logger?
         @log.is_a?(NullLogger)
       end
@@ -84,6 +62,12 @@ module NewRelic
         end
       end
 
+      def log_formatter=(formatter)
+        @log.formatter = formatter
+      end
+
+      private
+
       def backtrace_from_exception(e)
         # We've seen that often the backtrace on a SystemStackError is bunk
         # so massage the caller instead at a known depth.
@@ -110,6 +94,7 @@ module NewRelic
           else @log.send(level, item)
           end
         end
+        nil
       end
 
       def create_log(root, override_logger)
@@ -146,12 +131,6 @@ module NewRelic
         @log = ::NewRelic::Agent::NullLogger.new
       end
 
-      def clear_already_logged
-        @already_logged_lock.synchronize do
-          @already_logged = {}
-        end
-      end
-
       def wants_stdout?
         ::NewRelic::Agent.config[:log_file_path].upcase == "STDOUT"
       end
@@ -194,9 +173,6 @@ module NewRelic
         StartupLogger.instance.dump(self)
       end
 
-      def log_formatter=(formatter)
-        @log.formatter = formatter
-      end
     end
 
     # In an effort to not lose messages during startup, we trap them in memory