newrelic_rpm 3.6.0.74.beta → 3.6.0.78

data.tar.gz.sig

@@ -1,2 +1 @@
-,Ŷ�Ĩ���)�FlќU桚���se���.,�–���\=C9f�1	���b�����cN[w7��F�qm/2)ن���3�'���nY�����2	j2R�tVgp���lO��؜�C�h���?@$�w_���h�3�Bf��
-m���}�s�w��׏���ܮ)`�
uŸ��]q�� ���Zĥ"q�
�h�6��K��^�XT�l�Aʡ��y
+!�3��ԑ#$��q{�+�Ŏt�jC����3�(��O���H6KDHe	��b0��].}�2���`�TrIt��"��Q���}#Ŷ��Pq���w5Z&n��]N�X�)ULxH��e�L-)J��l��>f��1@ͮ18#�t@j�9��u{��38���U�`&*�uaL<�^~a�"��T{;���s$9���U� ~PD���

data/CHANGELOG

@@ -9,6 +9,18 @@
   Sidekiq jobs will automatically show up in the Background tasks on New Relic
   similar to Resque and Delayed::Job tasks.
 
+  * Improved thread safety
+
+  The primary metrics data structures in the Ruby agent are now thread safe.
+  This should provide better reliability for the agent under JRuby and threaded
+  scenarios such as Sidekiq or Puma.
+
+  * More robust environment report
+
+  The agent's analysis of the local environment (e.g. OS, Processors, loaded
+  gems) will now work in a wider variety of app environments, including
+  Sinatra.
+
   * Experimental Rainbows! support
 
   The Ruby agent now automatically detects and instruments the Rainbows! web
@@ -17,6 +29,12 @@
 
   Thanks to Joseph Chen for the contribution.
 
+  * Fix a potential file descriptor leak in Resque instrumentation
+
+  A file descriptor leak that occurred when DontPerform exceptions were used to
+  abort processing of a job has been fixed. This should allow the Resque
+  instrumentation work correctly with the resque-lonely_job gem.
+
 ## v3.5.8 ##
 
   * Key Transactions

data/Gemfile

@@ -1,12 +1,12 @@
 source 'https://rubygems.org'
 
 group :development do
-  # require 0.9.2.2.
+  # require 0.9.6.
   # There's problems with the test task in rake 10
   # https://github.com/jimweirich/rake/issues/144
-  gem 'rake', '0.9.2.2'
+  gem 'rake', '0.9.6'
   if RUBY_VERSION > '1.9.0'
-    gem 'mocha', '~>0.13.0'
+    gem 'mocha', '~>0.13.0', :require => false
   else
     gem 'mocha', '~>0.12.0'
   end

data/Rakefile

@@ -11,6 +11,14 @@ namespace :test do
   desc "Run all tests"
   task :all => %w{newrelic multiverse}
 
+  begin
+    require 'test_bisect'
+    TestBisect::BisectTask.new do |t|
+      t.test_task_name = 'test:newrelic'
+    end
+  rescue LoadError
+  end
+
   agent_home = File.expand_path(File.dirname(__FILE__))
 
   desc "Run functional test suite for newrelic"

data/lib/new_relic/agent/agent.rb

@@ -15,6 +15,7 @@ require 'new_relic/agent/database'
 require 'new_relic/agent/thread_profiler'
 require 'new_relic/agent/event_listener'
 require 'new_relic/agent/cross_app_monitor'
+require 'new_relic/environment_report'
 
 module NewRelic
   module Agent
@@ -44,7 +45,6 @@ module NewRelic
 
         @last_harvest_time = Time.now
         @obfuscator = lambda {|sql| NewRelic::Agent::Database.default_sql_obfuscator(sql) }
-        @forked = false
 
         # FIXME: temporary work around for RUBY-839
         if Agent.config[:monitor_mode]
@@ -183,7 +183,6 @@ module NewRelic
         #   connection, this tells me to only try it once so this method returns
         #   quickly if there is some kind of latency with the server.
         def after_fork(options={})
-          @forked = true
           Agent.config.apply_config(NewRelic::Agent::Configuration::ManualSource.new(options), 1)
 
           if channel_id = options[:report_to_channel]
@@ -213,10 +212,6 @@ module NewRelic
           @stats_engine.start_sampler_thread
         end
 
-        def forked?
-          @forked
-        end
-
         # True if we have initialized and completed 'start'
         def started?
           @started
@@ -695,7 +690,7 @@ module NewRelic
           # Checks whether we should send environment info, and if so,
           # returns the snapshot from the local environment
           def environment_for_connect
-            Agent.config[:send_environment_info] ? Control.instance.local_env.snapshot : []
+            Agent.config[:send_environment_info] ? Array(EnvironmentReport.new) : []
           end
 
           # Initializes the hash of settings that we send to the
@@ -745,7 +740,7 @@ module NewRelic
             end
 
             ::NewRelic::Agent.logger.debug "Server provided config: #{config_data.inspect}"
-            server_config = NewRelic::Agent::Configuration::ServerSource.new(config_data)
+            server_config = NewRelic::Agent::Configuration::ServerSource.new(config_data, Agent.config)
             Agent.config.apply_config(server_config, 1)
             log_connection!(config_data) if @service
 
@@ -1030,7 +1025,7 @@ module NewRelic
           end
           raise e
         ensure
-          NewRelic::Agent::Database.close_connections unless forked?
+          NewRelic::Agent::Database.close_connections
           duration = (Time.now - now).to_f
           @stats_engine.record_metrics('Supportability/Harvest', duration)
         end

data/lib/new_relic/agent/agent_logger.rb

@@ -82,8 +82,7 @@ module NewRelic
       end
 
       def create_null_logger
-        null_path = ["/dev/null", "NUL"].detect{|f| File.exists?(f)}
-        @log = ::Logger.new(null_path)
+        @log = NewRelic::Agent::NullLogger.new
       end
 
       def wants_stdout(config)

data/lib/new_relic/agent/audit_logger.rb

@@ -41,9 +41,13 @@ module NewRelic
 
       def setup_logger
         path = ensure_log_path
-        @log = ::Logger.new(path || "/dev/null")
-        @log.formatter = log_formatter
-        ::NewRelic::Agent.logger.info("Audit log enabled at '#{path}'") if path
+        if path
+          @log = ::Logger.new(path)
+          @log.formatter = log_formatter
+          ::NewRelic::Agent.logger.info("Audit log enabled at '#{path}'")
+        else
+          @log = NewRelic::Agent::NullLogger.new
+        end
       end
 
       def ensure_log_path

data/lib/new_relic/agent/busy_calculator.rb

@@ -18,7 +18,7 @@ module NewRelic
 
       # For testability, add accessors:
       attr_reader :harvest_start, :accumulator
-      
+
       # sets up busy calculations based on the start and end of
       # transactions - used for a rough estimate of what percentage of
       # wall clock time is spent processing requests
@@ -30,7 +30,7 @@ module NewRelic
           @entrypoint_stack.push time
         end
       end
-      
+
       # called when a transaction finishes, to add time to the
       # instance variable accumulator. this is harvested when we send
       # data to the server
@@ -52,7 +52,7 @@ module NewRelic
           end
         end
       end
-      
+
       # this returns the size of the entry point stack, which
       # determines how many transactions are running
       def busy_count

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

@@ -6,7 +6,7 @@ module NewRelic
   module Agent
     module Configuration
       class ServerSource < DottedHash
-        def initialize(hash)
+        def initialize(hash, existing_config={})
           if hash['agent_config']
             if hash['agent_config']['transaction_tracer.transaction_threshold'] =~ /apdex_f/i
               # when value is "apdex_f" remove the config and defer to default
@@ -15,19 +15,32 @@ module NewRelic
             super(hash.delete('agent_config'))
           end
 
-          string_map = [
-             ['collect_traces', 'transaction_tracer.enabled'],
-             ['collect_traces', 'slow_sql.enabled'],
-             ['collect_errors', 'error_collector.enabled']
-          ].each do |pair|
-            hash[pair[1]] = hash[pair[0]] if hash[pair[0]] != nil
-          end
-
           if hash['web_transactions_apdex']
             self[:web_transactions_apdex] = hash.delete('web_transactions_apdex')
           end
+          apply_feature_gates(hash, existing_config)
+
+          super(hash)
+        end
 
-          super
+        # These feature gates are not intended to be bullet-proof, but only to
+        # avoid the overhead of collecting and transmitting additional data if
+        # the user's subscription level precludes its use. The server is the
+        # ultimate authority regarding subscription levels, so we expect it to
+        # do the real enforcement there.
+        def apply_feature_gates(hash, existing_config)
+          gated_features = {
+            :'transaction_tracer.enabled' => 'collect_traces',
+            :'slow_sql.enabled'           => 'collect_traces',
+            :'error_collector.enabled'    => 'collect_errors'
+          }
+          gated_features.each do |feature, gate_key|
+            unless hash[gate_key].nil?
+              existing_value = existing_config[feature]
+              allowed_by_server = hash[gate_key]
+              hash[feature] = (allowed_by_server && existing_value)
+            end
+          end
         end
       end
     end

data/lib/new_relic/agent/cross_app_monitor.rb

@@ -47,6 +47,7 @@ module NewRelic
           key = key.bytes.to_a if key.respond_to?( :bytes )
 
           encoded = ""
+          encoded.force_encoding('binary') if encoded.respond_to?( :force_encoding )
           index = 0
           text.each_byte do |byte|
             encoded.concat((byte ^ key[index % key.length].to_i))

data/lib/new_relic/agent/database.rb

@@ -87,7 +87,9 @@ module NewRelic
           connection = get_connection(config)
           plan = nil
           if connection
+            start = Time.now
             plan = process_resultset(connection.execute("EXPLAIN #{statement}"))
+            ::NewRelic::Agent.record_metric("Supportability/Database/execute_explain_plan", Time.now - start)
           end
           return plan
         end

data/lib/new_relic/agent/error_collector.rb

@@ -44,7 +44,7 @@ module NewRelic
           initialize_ignored_errors(ignore_errors)
         end
       end
-      
+
       def initialize_ignored_errors(ignore_errors)
         @ignore.clear
         ignore_errors = ignore_errors.split(",") if ignore_errors.is_a? String

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

@@ -15,16 +15,16 @@ module NewRelic
             end
           end
         end
-                
+
         def log_with_newrelic_instrumentation(*args, &block)
           if !NewRelic::Agent.is_execution_traced?
             return log_without_newrelic_instrumentation(*args, &block)
           end
-          
+
           sql, name, binds = args
           metric = metric_for_name(NewRelic::Helper.correctly_encoded(name)) ||
             metric_for_sql(NewRelic::Helper.correctly_encoded(sql))
-          
+
           if !metric
             log_without_newrelic_instrumentation(*args, &block)
           else
@@ -44,15 +44,15 @@ module NewRelic
             end
           end
         end
-        
+
         def remote_service_metric
           if @config && @config[:adapter]
             type = @config[:adapter].sub(/\d*/, '')
             host = @config[:host] || 'localhost'
             "RemoteService/sql/#{type}/#{host}"
-          end                      
+          end
         end
-        
+
         def metric_for_name(name)
           if name && (parts = name.split " ") && parts.size == 2
             model = parts.first
@@ -85,7 +85,7 @@ module NewRelic
           end
           metric
         end
-        
+
         def rollup_metrics_for(metric)
           metrics = ["ActiveRecord/all"]
           metrics << "ActiveRecord/#{$1}" if metric =~ /ActiveRecord\/\w+\/(\w+)/
@@ -98,19 +98,20 @@ end
 
 DependencyDetection.defer do
   @name = :active_record
-  
+
   depends_on do
-    defined?(ActiveRecord) && defined?(ActiveRecord::Base)
+    defined?(::ActiveRecord) && (!defined?(::ActiveRecord::VERSION) ||
+      ::ActiveRecord::VERSION::MAJOR.to_i <= 3)
   end
 
   depends_on do
     !NewRelic::Agent.config[:disable_activerecord_instrumentation]
   end
-  
+
   executes do
     ::NewRelic::Agent.logger.info 'Installing ActiveRecord instrumentation'
   end
-  
+
   executes do
     if defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i == 3
       Rails.configuration.after_initialize do
@@ -125,7 +126,7 @@ DependencyDetection.defer do
     ActiveRecord::ConnectionAdapters::AbstractAdapter.module_eval do
       include ::NewRelic::Agent::Instrumentation::ActiveRecord
     end
-    
+
     ActiveRecord::Base.class_eval do
       class << self
         add_method_tracer(:find_by_sql, 'ActiveRecord/#{self.name}/find_by_sql',
@@ -133,6 +134,6 @@ DependencyDetection.defer do
         add_method_tracer(:transaction, 'ActiveRecord/#{self.name}/transaction',
                           :metric => false)
       end
-    end          
+    end
   end
 end

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

@@ -0,0 +1,72 @@
+# 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 Instrumentation
+      module ActiveRecordHelper
+        module_function
+
+        def metric_for_name(name)
+          return unless name
+          parts = name.split(' ')
+          if parts.size == 2
+            model = parts.first
+            operation = parts.last.downcase
+            case operation
+            when 'load', 'count', 'exists'
+              op_name = 'find'
+            when 'indexes', 'columns'
+              op_name = nil # fall back to DirectSQL
+            when 'destroy', 'find', 'save', 'create'
+              op_name = operation
+            when 'update'
+              op_name = 'save'
+            else
+              if model == 'Join'
+                op_name = operation
+              end
+            end
+            "ActiveRecord/#{model}/#{op_name}" if op_name
+          end
+        end
+
+        def metric_for_sql(sql)
+          metric = NewRelic::Agent::Instrumentation::MetricFrame.database_metric_name
+          if metric.nil?
+            if sql =~ /^(select|update|insert|delete|show)/i
+              # Could not determine the model/operation so let's find a better
+              # metric.  If it doesn't match the regex, it's probably a show
+              # command or some DDL which we'll ignore.
+              metric = "Database/SQL/#{$1.downcase}"
+            else
+              metric = "Database/SQL/other"
+            end
+          end
+          metric
+        end
+
+        # Given a metric name such as "ActiveRecord/model/action" this
+        # returns an array of rollup metrics:
+        # [ "ActiveRecord/all", "ActiveRecord/action" ]
+        # If the metric name is in the form of "ActiveRecord/action"
+        # this returns merely: [ "ActiveRecord/all" ]
+        def rollup_metrics_for(metric)
+          metrics = ["ActiveRecord/all"]
+          metrics << "ActiveRecord/#{$1}" if metric =~ /ActiveRecord\/[\w|\:]+\/(\w+)/
+          metrics
+        end
+
+        # Given a database adapter name and a database server host
+        # this returns a metric name in the form:
+        # "RemoteService/sql/adapter/host"
+        # Host defaults to "localhost".
+        def remote_service_metric(adapter, host)
+          host ||= 'localhost'
+          type = adapter.sub(/\d*/, '')
+          "RemoteService/sql/#{type}/#{host}"
+        end
+      end
+    end
+  end
+end

data/lib/new_relic/agent/instrumentation/rails4/action_controller.rb

@@ -40,31 +40,6 @@ module NewRelic
           end
 
         end
-
-        module ActionView
-          module NewRelic
-            extend self
-            def template_metric(identifier, options = {})
-              if options[:file]
-                "file"
-              elsif identifier.nil?
-                "(unknown)"
-              elsif identifier.include? '/' # this is a filepath
-                identifier.split('/')[-2..-1].join('/')
-              else
-                identifier
-              end
-            end
-            def render_type(file_path)
-              file = File.basename(file_path)
-              if file.starts_with?('_')
-                return 'Partial'
-              else
-                return 'Rendering'
-              end
-            end
-          end
-        end
       end
     end
   end
@@ -92,54 +67,3 @@ DependencyDetection.defer do
     end
   end
 end
-
-DependencyDetection.defer do
-  @name = :rails40_view
-
-  depends_on do
-    defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i == 4
-  end
-
-  depends_on do
-    !NewRelic::Agent.config[:disable_view_instrumentation]
-  end
-
-  executes do
-    ::NewRelic::Agent.logger.info 'Installing Rails 4 view instrumentation'
-  end
-
-  executes do
-    ActionView::TemplateRenderer.class_eval do
-      include NewRelic::Agent::MethodTracer
-      # namespaced helper methods
-
-      def render_with_newrelic(context, options)
-        @details = extract_details(options) if respond_to? :extract_details, true
-        identifier = determine_template(options) ? determine_template(options).identifier : nil
-        str = "View/#{NewRelic::Agent::Instrumentation::Rails4::ActionView::NewRelic.template_metric(identifier, options)}/Rendering"
-        trace_execution_scoped str do
-          render_without_newrelic(context, options)
-        end
-      end
-
-      alias_method :render_without_newrelic, :render
-      alias_method :render, :render_with_newrelic
-    end
-
-    ActionView::PartialRenderer.class_eval do
-      include NewRelic::Agent::MethodTracer
-
-      def render_with_newrelic(*args, &block)
-        setup(*args, &block)
-        identifier = find_partial ? find_partial.identifier : nil
-        str = "View/#{NewRelic::Agent::Instrumentation::Rails4::ActionView::NewRelic.template_metric(identifier)}/Partial"
-        trace_execution_scoped str do
-          render_without_newrelic(*args, &block)
-        end
-      end
-
-      alias_method :render_without_newrelic, :render
-      alias_method :render, :render_with_newrelic
-    end
-  end
-end