newrelic_rpm 3.7.0.174.beta → 3.7.0.177

data/lib/new_relic/agent/agent_logger.rb

@@ -8,9 +8,9 @@ module NewRelic
   module Agent
     class AgentLogger
 
-      def initialize(config, root = "", override_logger=nil)
-        create_log(config, root, override_logger)
-        set_log_level!(config)
+      def initialize(root = "", override_logger=nil)
+        create_log(root, override_logger)
+        set_log_level!
         set_log_format!
 
         gather_startup_logs
@@ -36,6 +36,13 @@ module NewRelic
         format_and_send(:debug, msgs)
       end
 
+      def log_once(level, key, *msgs)
+        return if already_logged.include?(key)
+
+        already_logged[key] = true
+        self.send(level, *msgs)
+      end
+
       def is_startup_logger?
         false
       end
@@ -66,27 +73,27 @@ module NewRelic
         end
       end
 
-      def create_log(config, root, override_logger)
+      def create_log(root, override_logger)
         if !override_logger.nil?
           @log = override_logger
-        elsif config[:agent_enabled] == false
+        elsif ::NewRelic::Agent.config[:agent_enabled] == false
           create_null_logger
         else
-          if wants_stdout(config)
+          if wants_stdout?
             @log = ::Logger.new(STDOUT)
           else
-            create_log_to_file(config, root)
+            create_log_to_file(root)
           end
         end
       end
 
-      def create_log_to_file(config, root)
-        path = find_or_create_file_path(config[:log_file_path], root)
+      def create_log_to_file(root)
+        path = find_or_create_file_path(::NewRelic::Agent.config[:log_file_path], root)
         if path.nil?
           @log = ::Logger.new(STDOUT)
-          warn("Error creating log directory #{config[:log_file_path]}, using standard out for logging.")
+          warn("Error creating log directory #{::NewRelic::Agent.config[:log_file_path]}, using standard out for logging.")
         else
-          file_path = "#{path}/#{config[:log_file_name]}"
+          file_path = "#{path}/#{::NewRelic::Agent.config[:log_file_name]}"
           begin
             @log = ::Logger.new(file_path)
           rescue => e
@@ -97,11 +104,16 @@ module NewRelic
       end
 
       def create_null_logger
-        @log = NewRelic::Agent::NullLogger.new
+        @log = ::NewRelic::Agent::NullLogger.new
+      end
+
+      def already_logged
+        @already_logged ||= {}
+        @already_logged
       end
 
-      def wants_stdout(config)
-        config[:log_file_path].upcase == "STDOUT"
+      def wants_stdout?
+        ::NewRelic::Agent.config[:log_file_path].upcase == "STDOUT"
       end
 
       def find_or_create_file_path(path_setting, root)
@@ -114,8 +126,8 @@ module NewRelic
         nil
       end
 
-      def set_log_level!(config)
-        @log.level = AgentLogger.log_level_for(config.fetch(:log_level))
+      def set_log_level!
+        @log.level = AgentLogger.log_level_for(::NewRelic::Agent.config[:log_level])
       end
 
       LOG_LEVELS = {

data/lib/new_relic/agent/audit_logger.rb

@@ -8,9 +8,8 @@ require 'fileutils'
 module NewRelic
   module Agent
     class AuditLogger
-      def initialize(config)
-        @config = config
-        @enabled = @config[:'audit_log.enabled']
+      def initialize
+        @enabled = NewRelic::Agent.config[:'audit_log.enabled']
         @encoder = NewRelic::Agent::NewRelicService::Encoders::Identity
       end
 
@@ -51,7 +50,7 @@ module NewRelic
       end
 
       def ensure_log_path
-        path = File.expand_path(@config[:'audit_log.path'])
+        path = File.expand_path(NewRelic::Agent.config[:'audit_log.path'])
         log_dir = File.dirname(path)
 
         begin

data/lib/new_relic/agent/autostart.rb

@@ -19,16 +19,28 @@ module NewRelic
       extend self
 
 
-      # The constants, execuatables (i.e. $0) and rake tasks used can be
+      # The constants, executables (i.e. $0) and rake tasks used can be
       # configured with the config keys 'autostart.blacklisted_constants',
       # 'autostart.blacklisted_executables' and
       # 'autostart.blacklisted_rake_tasks'
       def agent_should_start?
-          !blacklisted?('autostart.blacklisted_constants') { |name| constant_is_defined?(name) } &&
-          !blacklisted?('autostart.blacklisted_executables') { |bin| File.basename($0) == bin } &&
+          !blacklisted_constants? &&
+          !blacklisted_executables? &&
           !in_blacklisted_rake_task?
       end
 
+      def blacklisted_constants?
+        blacklisted?(NewRelic::Agent.config[:'autostart.blacklisted_constants']) do |name|
+          constant_is_defined?(name)
+        end
+      end
+
+      def blacklisted_executables?
+        blacklisted?(NewRelic::Agent.config[:'autostart.blacklisted_executables']) do |bin|
+          File.basename($0) == bin
+        end
+      end
+
       # Lookup whether namespaced constants (e.g. ::Foo::Bar::Baz) are in the
       # environment.
       def constant_is_defined?(const_name)
@@ -52,18 +64,18 @@ module NewRelic
         end
       end
 
-      def blacklisted?(key, &block)
-        ::NewRelic::Agent.config[key].split(/\s*,\s*/).any?(&block)
+      def blacklisted?(value, &block)
+        value.split(/\s*,\s*/).any?(&block)
       end
 
       def in_blacklisted_rake_task?
         tasks = begin
-            ::Rake.application.top_level_tasks
-          rescue => e
+                  ::Rake.application.top_level_tasks
+                rescue => e
             ::NewRelic::Agent.logger.debug("Not in Rake environment so skipping blacklisted_rake_tasks check: #{e}")
             []
           end
-        !(tasks & ::NewRelic::Agent.config['autostart.blacklisted_rake_tasks'].split(/\s*,\s*/)).empty?
+        !(tasks & ::NewRelic::Agent.config[:'autostart.blacklisted_rake_tasks'].split(/\s*,\s*/)).empty?
       end
     end
   end

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

@@ -32,6 +32,10 @@ module NewRelic
           @handlers['start_profiler'] = Proc.new { |cmd| thread_profiler_session.handle_start_command(cmd) }
           @handlers['stop_profiler']  = Proc.new { |cmd| thread_profiler_session.handle_stop_command(cmd) }
           @handlers['active_xray_sessions'] = Proc.new { |cmd| xray_session_collection.handle_active_xray_sessions(cmd) }
+
+          if event_listener
+            event_listener.subscribe(:before_shutdown, &method(:on_before_shutdown))
+          end
         end
 
         def new_relic_service
@@ -55,22 +59,33 @@ module NewRelic
           commands.any? {|command| command.name == 'active_xray_sessions'}
         end
 
-        NO_PROFILES_TO_SEND = {}.freeze
+        def on_before_shutdown(*args)
+          if self.thread_profiler_session.running?
+            self.thread_profiler_session.stop(true)
+          end
+        end
 
-        def harvest_data_to_send(disconnecting)
+        def harvest!
           profiles = []
           profiles += harvest_from_xray_session_collection
-          profiles += harvest_from_thread_profiler_session(disconnecting)
-
-          format_harvest_data(profiles)
+          profiles += harvest_from_thread_profiler_session
+          log_profiles(profiles)
+          profiles
         end
 
+        # We don't currently support merging thread profiles that failed to send
+        # back into the AgentCommandRouter, so we just no-op this method.
+        # Same with reset! - we don't support asynchronous cancellation of a
+        # running thread profile or X-Ray session currently.
+        def merge!(*args); end
+        def reset!; end
+
         def harvest_from_xray_session_collection
           self.xray_session_collection.harvest_thread_profiles
         end
 
-        def harvest_from_thread_profiler_session(disconnecting)
-          if self.thread_profiler_session.ready_to_harvest?(disconnecting)
+        def harvest_from_thread_profiler_session
+          if self.thread_profiler_session.ready_to_harvest?
             self.thread_profiler_session.stop(true)
             [self.thread_profiler_session.harvest]
           else
@@ -78,21 +93,15 @@ module NewRelic
           end
         end
 
-        def format_harvest_data(profiles)
+        def log_profiles(profiles)
           if profiles.empty?
-            NewRelic::Agent.logger.debug "No thread profiles with data found to send."
-            NO_PROFILES_TO_SEND
+            ::NewRelic::Agent.logger.debug "No thread profiles with data found to send."
           else
-            log_profiles(profiles)
-            {:profile_data => profiles}
+            profile_descriptions = profiles.map { |p| p.to_log_description }
+            ::NewRelic::Agent.logger.debug "Sending thread profiles [#{profile_descriptions.join(", ")}]"
           end
         end
 
-        def log_profiles(profiles)
-          profile_descriptions = profiles.map { |p| p.to_log_description }
-          ::NewRelic::Agent.logger.debug "Sending thread profiles [#{profile_descriptions.join(", ")}]"
-        end
-
         def get_agent_commands
           commands = new_relic_service.get_agent_commands
           NewRelic::Agent.logger.debug "Received get_agent_commands = #{commands.inspect}"

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

@@ -64,8 +64,8 @@ module NewRelic
           @backtrace_service.subscribed?(NewRelic::Agent::Threading::BacktraceService::ALL_TRANSACTIONS)
         end
 
-        def ready_to_harvest?(disconnecting=false)
-          (running? && disconnecting) || past_time? || stopped?
+        def ready_to_harvest?
+          past_time? || stopped?
         end
 
         def past_time?

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

@@ -68,13 +68,15 @@ module NewRelic
 
         def self.agent_enabled
           Proc.new {
-            self[:enabled] && (self[:developer_mode] || self[:monitor_mode] || self[:monitor_daemons]) && ::NewRelic::Agent::Autostart.agent_should_start?
+            NewRelic::Agent.config[:enabled] &&
+            (NewRelic::Agent.config[:developer_mode] || NewRelic::Agent.config[:monitor_mode] || NewRelic::Agent.config[:monitor_daemons]) &&
+            NewRelic::Agent::Autostart.agent_should_start?
           }
         end
 
         def self.audit_log_path
           Proc.new {
-            File.join(self[:log_file_path], 'newrelic_audit.log')
+            File.join(NewRelic::Agent.config[:log_file_path], 'newrelic_audit.log')
           }
         end
 
@@ -95,62 +97,58 @@ module NewRelic
         end
 
         def self.browser_monitoring_auto_instrument
-          Proc.new { self[:'rum.enabled'] }
+          Proc.new { NewRelic::Agent.config[:'rum.enabled'] }
         end
 
         # This check supports the js_errors_beta key we've asked clients to
         # set. Once JS errors are GA, browser_monitoring.loader can stop
         # being dynamic.
         def self.browser_monitoring_loader
-          Proc.new { self[:js_errors_beta] ? "full" : "rum"}
+          Proc.new { NewRelic::Agent.config[:js_errors_beta] ? "full" : "rum"}
         end
 
         def self.slow_sql_record_sql
-          Proc.new { self[:'transaction_tracer.record_sql'] }
+          Proc.new { NewRelic::Agent.config[:'transaction_tracer.record_sql'] }
         end
 
         def self.slow_sql_explain_enabled
-          Proc.new { self[:'transaction_tracer.explain_enabled'] }
+          Proc.new { NewRelic::Agent.config[:'transaction_tracer.explain_enabled'] }
         end
 
         def self.slow_sql_explain_threshold
-          Proc.new { self[:'transaction_tracer.explain_threshold'] }
-        end
-
-        def self.slow_sql_stack_trace_threshold
-          Proc.new { self[:'transaction_tracer.stack_trace_threshold'] }
+          Proc.new { NewRelic::Agent.config[:'transaction_tracer.explain_threshold'] }
         end
 
         def self.slow_sql_enabled
-          Proc.new { self[:'transaction_tracer.enabled'] }
+          Proc.new { NewRelic::Agent.config[:'transaction_tracer.enabled'] }
         end
 
         def self.transaction_tracer_transaction_threshold
-          Proc.new { self[:apdex_t] * 4 }
+          Proc.new { NewRelic::Agent.config[:apdex_t] * 4 }
         end
 
         def self.disable_activerecord_instrumentation
-          Proc.new { self[:skip_ar_instrumentation] }
+          Proc.new { NewRelic::Agent.config[:skip_ar_instrumentation] }
         end
 
         def self.api_port
-          Proc.new { self[:port] }
+          Proc.new { NewRelic::Agent.config[:port] }
         end
 
         def self.port
-          Proc.new { self[:ssl] ? 443 : 80 }
+          Proc.new { NewRelic::Agent.config[:ssl] ? 443 : 80 }
         end
 
         def self.strip_exception_messages_enabled
-          Proc.new { self[:high_security] }
+          Proc.new { NewRelic::Agent.config[:high_security] }
         end
 
         def self.developer_mode
-          Proc.new { self[:developer] }
+          Proc.new { NewRelic::Agent.config[:developer] }
         end
 
         def self.monitor_mode
-          Proc.new { self[:enabled] }
+          Proc.new { NewRelic::Agent.config[:enabled] }
         end
       end
 
@@ -185,9 +183,13 @@ module NewRelic
         'routes',
         'secret',
         'spec',
+        'spec:features',
+        'spec:requests',
         'spec:controllers',
         'spec:helpers',
         'spec:models',
+        'spec:views',
+        'spec:routing',
         'spec:rcov',
         'stats',
         'test',
@@ -208,18 +210,6 @@ module NewRelic
           :type => String,
           :description => "New Relic license key."
         },
-        :log => {
-          :default => '',
-          :public => false,
-          :type => String,
-          :description => "Override to set log file name and path to STDOUT."
-        },
-        :omit_fake_collector => {
-          :default => false,
-          :public => false,
-          :type => Boolean,
-          :description => "Override to omit fake collector in multiverse tests."
-        },
         :config_path => {
           :default => DefaultSource.config_path,
           :public => true,
@@ -305,12 +295,6 @@ module NewRelic
           :type => Boolean,
           :description => 'Enables or disables the agent for background processes. No longer necessary as the agent now automatically instruments background processes.'
         },
-        :multi_homed => {
-          :default => false,
-          :public => false,
-          :type => Boolean,
-          :description => 'Enable or disable instrumentation for multiple applications on the same host bound to different interfaces serving the same port.'
-        },
         :high_security => {
           :default => false,
           :public => true,
@@ -355,10 +339,39 @@ module NewRelic
         },
         :ssl => {
           :default => true,
+          :allow_nil => true,
           :public => true,
           :type => Boolean,
           :description => "Enable or disable SSL for transmissions to the New Relic data collection service."
         },
+        :proxy_host => {
+          :default => nil,
+          :allow_nil => true,
+          :public => false,
+          :type => String,
+          :description => 'Host for proxy server.'
+        },
+        :proxy_port => {
+          :default => nil,
+          :allow_nil => true,
+          :public => false,
+          :type => Fixnum,
+          :description => 'Port for proxy server.'
+        },
+        :proxy_user => {
+          :default => nil,
+          :allow_nil => true,
+          :public => false,
+          :type => String,
+          :description => 'User for proxy server.'
+        },
+        :proxy_pass => {
+          :default => nil,
+          :allow_nil => true,
+          :public => false,
+          :type => String,
+          :description => 'Password for proxy server.'
+        },
         :sync_startup => {
           :default => false,
           :public => true,
@@ -395,12 +408,6 @@ module NewRelic
           :type => Boolean,
           :description => 'Enable or disable transmission of application environment information to the New Relic data collection service.'
         },
-        :start_channel_listener => {
-          :default => false,
-          :public => false,
-          :type => Boolean,
-          :description => 'Enable or disable spawning of a background thread that listens for connections from child processes. Primarily used for Resque instrumentation.'
-        },
         :'resque.use_harvest_lock' => {
           :default => false,
           :public => true,
@@ -419,6 +426,12 @@ module NewRelic
           :type => Boolean,
           :description => '(Deprecated) Enable or disable retrying failed connections to the New Relic data collection service.'
         },
+        :force_reconnect => {
+          :default => false,
+          :public => false,
+          :type => Boolean,
+          :description => 'Force a new connection to the server before running the worker loop. Creates a separate agent run and is recorded as a separate instance by the New Relic data collection service.'
+        },
         :report_instance_busy => {
           :default => true,
           :public => false,
@@ -467,6 +480,12 @@ module NewRelic
           :type => Boolean,
           :description => 'Enable or disable resque instrumentation.'
         },
+        :disable_sidekiq => {
+          :default => false,
+          :public => true,
+          :type => Boolean,
+          :description => 'Enable or disable sidekiq instrumentation.'
+        },
         :disable_dj => {
           :default => false,
           :public => true,
@@ -593,18 +612,30 @@ module NewRelic
           :type => Fixnum,
           :description => 'Maximum number of transaction trace segments to record in a single transaction trace.'
         },
+        :disable_sequel_instrumentation => {
+          :default => false,
+          :public => true,
+          :type => Boolean,
+          :description => 'Enable or disable sequel instrumentation.'
+        },
+        :override_sql_obfuscation_adapter => {
+          :default => '',
+          :public => true,
+          :type => String,
+          :description => "Override for the sql obfuscation adapter."
+        },
+        :disable_database_instrumentation => {
+          :default => false,
+          :public => true,
+          :type => Boolean,
+          :description => 'Enable or disable sequel instrumentation.'
+        },
         :'slow_sql.enabled' => {
           :default => DefaultSource.slow_sql_enabled,
           :public => true,
           :type => Boolean,
           :description => 'Enable or disable collection of slow sql queries.'
         },
-        :'slow_sql.stack_trace_threshold' => {
-          :default => DefaultSource.slow_sql_stack_trace_threshold,
-          :public => true,
-          :type => Float,
-          :description => 'Stack traces will be generated and included in slow sql queries with durations that exceed this threshold.'
-        },
         :'slow_sql.explain_threshold' => {
           :default => DefaultSource.slow_sql_explain_threshold,
           :public => true,
@@ -647,11 +678,35 @@ module NewRelic
           :type => Boolean,
           :description => 'Enable or disable real user monitoring.'
         },
-        :'rum.load_episodes_file' => {
-          :default => true,
+        :browser_key => {
+          :default => '',
           :public => false,
-          :type => Boolean,
-          :description => 'Enable or disable real user monitoring.'
+          :type => String,
+          :description => 'Real user monitoring license key for the browser timing header.'
+        },
+        :beacon => {
+          :default => '',
+          :public => false,
+          :type => String,
+          :description => 'Beacon for real user monitoring.'
+        },
+        :error_beacon => {
+          :default => '',
+          :public => false,
+          :type => String,
+          :description => 'Error beacon for real user monitoring.'
+        },
+        :application_id => {
+          :default => '',
+          :public => false,
+          :type => String,
+          :description => 'Application ID for real user monitoring.'
+        },
+        :js_agent_file => {
+          :default => '',
+          :public => false,
+          :type => String,
+          :description => 'Javascript agent file for real user monitoring.'
         },
         :'browser_monitoring.auto_instrument' => {
           :default => DefaultSource.browser_monitoring_auto_instrument,
@@ -665,12 +720,25 @@ module NewRelic
           :type => String,
           :description => 'Type of JavaScript agent loader to use for browser monitoring instrumentation'
         },
+        :'browser_monitoring.loader_version' => {
+          :default => '',
+          :public => private,
+          :type => String,
+          :description => 'Version of JavaScript agent loader (returned from the New Relic data collection services)'
+        },
         :'browser_monitoring.debug' => {
           :default => false,
           :public => false,
           :type => Boolean,
           :description => 'Enable or disable debugging version of JavaScript agent loader for browser monitoring instrumentation.'
         },
+        :'browser_monitoring.ssl_for_http' => {
+          :default => nil,
+          :allow_nil => true,
+          :public => false,
+          :type => Boolean,
+          :description => 'Enable or disable HTTPS instrumentation by JavaScript agent on HTTP pages.'
+        },
         :js_agent_loader => {
           :default => '',
           :public => false,
@@ -695,6 +763,25 @@ module NewRelic
           :type => Boolean,
           :description => 'Enable or disable cross-application tracing.'
         },
+        :cross_application_tracing => {
+          :default => nil,
+          :allow_nil => true,
+          :public => false,
+          :type => Boolean,
+          :description => 'Enable or disable cross-application tracing.'
+        },
+        :encoding_key => {
+          :default => '',
+          :public => false,
+          :type => String,
+          :description => 'Encoding key for cross-application tracing.'
+        },
+        :cross_process_id => {
+          :default => '',
+          :public => false,
+          :type => String,
+          :description => 'Cross process ID for cross-application tracing.'
+        },
         :'thread_profiler.enabled' => {
           :default => DefaultSource.thread_profiler_enabled,
           :public => true,
@@ -743,18 +830,18 @@ module NewRelic
           :type => Boolean,
           :description => 'Enable or disable the analytics event sampling.'
         },
-        :'analytics_events.transactions.enabled' => {
-          :default => true,
-          :public => true,
-          :type => Boolean,
-          :description => 'Enable or disable the analytics event sampling for transactions.'
-        },
         :'analytics_events.max_samples_stored' => {
           :default => 1200,
           :public => false,
           :type => Fixnum,
           :description => 'Maximum number of request events recorded by the analytics event sampling in a single harvest.'
         },
+        :'capture_attributes.traces' => {
+          :default => true,
+          :public => false,
+          :type => Boolean,
+          :description => 'Include custom parameters in transaction traces and traced errors'
+        },
         :'capture_attributes.transaction_events' => {
           :default => true,
           :public => true,