newrelic_rpm 3.6.2.96 → 3.6.3.103.beta

data/.gitignore

@@ -20,3 +20,6 @@ gems/newrelic_rpm.gemspec
 gems/newrelic_rpm*.tar.gz
 lib/new_relic/build.rb
 .pryrc
+.tm_properties
+.bundle
+/bin/

data/CHANGELOG

@@ -1,6 +1,38 @@
-
 # New Relic Ruby Agent Release Notes #
 
+## 3.6.3 ##
+
+  * Better Sinatra Support
+
+  A number of improvements have been made to our Sinatra instrumentation.
+  More details: https://newrelic.com/docs/ruby/sinatra-support-in-the-ruby-agent
+
+  Sinatra instrumentation has been updated to more accurately reflect the final
+  route that was actually executed, taking pass and conditions into account.
+  
+  New Relic middlewares for error collection, real user monitoring, and cross
+  application tracing are automatically inserted into the middleware stack.
+  
+  Ignoring routes, similar to functionality available to Rails controllers, is
+  now available in Sinatra as well.
+  
+  Routes in 1.4 are properly formatting in transaction names. Thanks Zachary
+  Anker for the contribution!
+
+  * Padrino Support
+
+  Along with improving our support of Sinatra, we've also extended that to
+  supporting Padrino, a framework that builds on Sinatra. Web transactions
+  should show up in New Relic now for Padrino apps automatically. The agent has
+  been tested against the latest Padrino in versions 0.11.x and 0.10.x.
+  
+  * Main overview graph only shows web transactions
+  
+  In the past database times from background jobs mixed with other web transaction
+  metrics in the main overview graph. This often skewed graphs. A common workaround
+  was to send background jobs to a separate application, but that should no longer
+  be necessary as the overview graphs now only represent web transactions.
+
 ## v3.6.2 ##
 
   * Sequel support

data/README.md

@@ -176,17 +176,17 @@ online.  Refer to instructions in *Getting Started*.
 
 ## Support
 
-Reach out to us--and to fellow users--at
-[support.newrelic.com](http://support.newrelic.com/).
-There you'll find documentation, FAQs, and forums where you can submit
-suggestions and discuss New Relic with staff and other users.
+You can find more detailed documentation [on our website](http://newrelic.com/docs),
+and specifically in the [Ruby category](http://newrelic.com/docs/ruby).
+
+If you can't find what you're looking for there, reach out to us on our [support
+site](http://support.newrelic.com/) and we'll be happy to help you.
 
 Also available is community support on IRC: we generally use #newrelic
 on irc.freenode.net
 
-Find a bug?  E-mail support@newrelic.com, or post it to
-
-[support.newrelic.com](http://support.newrelic.com/).
+Find a bug? Contact us via [support.newrelic.com](http://support.newrelic.com/),
+or e-mail support @ newrelic.com.
 
 Thank you, and may your application scale to infinity plus one.
 

data/lib/new_relic/agent/agent.rb

@@ -16,6 +16,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/agent/request_sampler'
 require 'new_relic/environment_report'
 
 module NewRelic
@@ -40,6 +41,7 @@ module NewRelic
         @error_collector       = NewRelic::Agent::ErrorCollector.new
         @transaction_rules     = NewRelic::Agent::RulesEngine.new
         @metric_rules          = NewRelic::Agent::RulesEngine.new
+        @request_sampler       = NewRelic::Agent::RequestSampler.new(@events)
 
         @connect_state = :pending
         @connect_attempts = 0
@@ -51,17 +53,6 @@ module NewRelic
         if Agent.config[:monitor_mode]
           @service = NewRelic::Agent::NewRelicService.new
         end
-
-        txn_tracer_enabler = Proc.new do
-          if NewRelic::Agent.config[:'transaction_tracer.enabled'] ||
-              NewRelic::Agent.config[:developer_mode]
-            @stats_engine.transaction_sampler = @transaction_sampler
-          else
-            @stats_engine.transaction_sampler = nil
-          end
-        end
-        Agent.config.register_callback(:'transaction_tracer.enabled', &txn_tracer_enabler)
-        Agent.config.register_callback(:developer_mode, &txn_tracer_enabler)
       end
 
       # contains all the class-level methods for NewRelic::Agent::Agent
@@ -204,6 +195,8 @@ module NewRelic
 
           ::NewRelic::Agent.logger.debug "Starting the worker thread in #{$$} after forking."
 
+          reset_objects_with_locks
+
           # Clear out stats that are left over from parent process
           reset_stats
 
@@ -324,7 +317,7 @@ module NewRelic
           def log_startup
             log_environment
             log_dispatcher
-            log_app_names
+            log_app_name
           end
 
           # Log the environment the app thinks it's running in.
@@ -342,14 +335,14 @@ module NewRelic
             ::NewRelic::Agent.logger.info "Dispatcher: #{dispatcher_name}"
           end
 
+          def log_app_name
+            ::NewRelic::Agent.logger.info "Application: #{Agent.config.app_names.join(", ")}"
+          end
+
           # Logs the configured application names
-          def log_app_names
+          def app_name_configured?
             names = Agent.config.app_names
-            if names.respond_to?(:any?) && names.any?
-              ::NewRelic::Agent.logger.info "Application: #{names.join(", ")}"
-            else
-              ::NewRelic::Agent.logger.error 'Unable to determine application name. Please set the application name in your newrelic.yml or in a NEW_RELIC_APP_NAME environment variable.'
-            end
+            return names.respond_to?(:any?) && names.any?
           end
 
           # Connecting in the foreground blocks further startup of the
@@ -476,15 +469,32 @@ module NewRelic
 
         include Start
 
-        # Logs a bunch of data and starts the agent, if needed
-        def start
-          return if already_started? || disabled?
+
+        # Check to see if the agent should start, returning +true+ if it should.
+        def agent_should_start?
+          return false if already_started? || disabled?
 
           if defer_for_resque?
             ::NewRelic::Agent.logger.debug "Deferring startup for Resque in case it daemonizes"
-            return
+            return false
           end
 
+          unless app_name_configured?
+            NewRelic::Agent.logger.error "No application name configured.",
+              "The Agent cannot start without at least one. Please check your ",
+              "newrelic.yml and ensure that it is valid and has at least one ",
+              "value set for app_name in the #{NewRelic::Control.instance.env} ",
+              "environment."
+            return false
+          end
+
+          return true
+        end
+
+        # Logs a bunch of data and starts the agent, if needed
+        def start
+          return unless agent_should_start?
+
           @started = true
           @local_host = determine_host
           log_startup
@@ -503,6 +513,13 @@ module NewRelic
           @launch_time = Time.now
         end
 
+        # Clear out state for any objects that we know lock from our parents
+        # This is necessary for cases where we're in a forked child and Ruby
+        # might be holding locks for background thread that aren't there anymore.
+        def reset_objects_with_locks
+          @stats_engine = NewRelic::Agent::StatsEngine.new
+        end
+
         def add_harvest_sampler(subclass)
           begin
             ::NewRelic::Agent.logger.debug "#{subclass.name} not supported on this platform." and return unless subclass.supported_on_this_platform?
@@ -1013,6 +1030,17 @@ module NewRelic
           end
         end
 
+        # Fetch samples from the RequestSampler and send them.
+        def harvest_and_send_analytic_event_data
+          samples = @request_sampler.samples
+          @service.analytic_event_data(samples) unless samples.empty?
+          @request_sampler.reset
+        rescue => e
+          NewRelic::Agent.logger.debug "Failed to sent analytics; throttling to conserve memory"
+          @request_sampler.throttle
+          raise
+        end
+
         def check_for_agent_commands
           commands = @service.get_agent_commands
           ::NewRelic::Agent.logger.debug "Received get_agent_commands = #{commands.inspect}"
@@ -1031,6 +1059,7 @@ module NewRelic
             harvest_and_send_slowest_sample
             harvest_and_send_slowest_sql
             harvest_and_send_timeslice_data
+            harvest_and_send_analytic_event_data
             harvest_and_send_thread_profile(disconnecting)
 
             check_for_agent_commands

data/lib/new_relic/agent/agent_logger.rb

@@ -16,24 +16,25 @@ module NewRelic
         gather_startup_logs
       end
 
+
       def fatal(*msgs)
-        @log.fatal(format_messages(msgs))
+        format_and_send(:fatal, msgs)
       end
 
       def error(*msgs)
-        @log.error(format_messages(msgs))
+        format_and_send(:error, msgs)
       end
 
       def warn(*msgs)
-        @log.warn(format_messages(msgs))
+        format_and_send(:warn, msgs)
       end
 
       def info(*msgs)
-        @log.info(format_messages(msgs))
+        format_and_send(:info, msgs)
       end
 
       def debug(*msgs)
-        @log.debug(format_messages(msgs))
+        format_and_send(:debug, msgs)
       end
 
       def is_startup_logger?
@@ -41,14 +42,24 @@ module NewRelic
       end
 
       # Allows for passing exceptions in explicitly, which format with backtrace
-      def format_messages(msgs)
-        msgs.map do |msg|
-          if msg.respond_to?(:backtrace)
-            "#{msg.class}: #{msg}\n\t#{(msg.backtrace || []).join("\n\t")}"
+      def format_and_send(level, *msgs)
+        msgs.flatten!
+        exceptions = msgs.find_all {|m| m.is_a?(Exception) }
+        msgs.collect! do |msg|
+          if msg.respond_to?(:message)
+            "%p: %s" % [ msg.class, msg.message ]
           else
-            msg
+            msg.to_s
           end
-        end.join("\n")
+        end
+
+        msgs.each do |msg|
+          @log.send level, msg
+        end
+
+        exceptions.each do |ex|
+          @log.debug { "Debugging backtrace:\n  " + ex.backtrace.join("\n  ") }
+        end
       end
 
       def create_log(config, root, override_logger)

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

@@ -99,6 +99,8 @@ module NewRelic
         :disable_samplers                     => false,
         :disable_resque                       => false,
         :disable_dj                           => false,
+        :disable_sinatra                      => false,
+        :disable_sinatra_auto_middleware      => false,
         :disable_view_instrumentation         => false,
         :disable_backtrace_cleanup            => false,
         :skip_ar_instrumentation              => false,
@@ -139,7 +141,10 @@ module NewRelic
 
         :'thread_profiler.enabled' => Proc.new { NewRelic::Agent::ThreadProfiler.is_supported? },
 
-        :marshaller => Proc.new { NewRelic::Agent::NewRelicService::JsonMarshaller.is_supported? ? 'json' : 'pruby' }
+        :marshaller => Proc.new { NewRelic::Agent::NewRelicService::JsonMarshaller.is_supported? ? 'json' : 'pruby' },
+
+        :'request_sampler.enabled'        => false,
+        :'request_sampler.sample_rate_ms' => 50
       ].freeze
     end
   end

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

@@ -2,11 +2,6 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 require 'new_relic/agent/instrumentation/evented_subscriber'
-begin
-  require 'rack'
-rescue LoadError => e
-  Agent.logger.debug(e)
-end
 
 module NewRelic
   module Agent
@@ -17,6 +12,7 @@ module NewRelic
           NewRelic::Agent.instance.events.subscribe(:before_call) do |env|
 
             request = begin
+                        require 'rack'
                         ::Rack::Request.new(env)
                       rescue => e
                         Agent.logger.debug("Error creating Rack::Request object: #{e}")
@@ -111,7 +107,6 @@ module NewRelic
         end
 
         def stop_transaction(event)
-          TransactionInfo.get.transaction.name = event.metric_name
           Agent.instance.stats_engine \
             .pop_scope(event.scope, event.metric_name, event.end)
           Transaction.stop

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

@@ -51,7 +51,7 @@ module NewRelic
             if parent && (payload[:virtual_path] ||
                           (parent.payload[:identifier] =~ /template$/))
               return parent.metric_name
-            elsif payload[:virtual_path]
+            elsif payload.key?(:virtual_path)
               identifier = payload[:virtual_path]
             else
               identifier = payload[:identifier]

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

@@ -31,15 +31,15 @@ module NewRelic
             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))
+          sql, name, _ = args
+          metric = ActiveRecordHelper.metric_for_name(NewRelic::Helper.correctly_encoded(name)) ||
+            ActiveRecordHelper.metric_for_sql(NewRelic::Helper.correctly_encoded(sql))
 
           if !metric
             log_without_newrelic_instrumentation(*args, &block)
           else
             metrics = [metric, remote_service_metric].compact
-            metrics += rollup_metrics_for(metric)
+            metrics += ActiveRecordHelper.rollup_metrics_for(metric)
             self.class.trace_execution_scoped(metrics) do
               t0 = Time.now
               begin
@@ -60,50 +60,9 @@ module NewRelic
 
         def remote_service_metric
           if @config && @config[:adapter]
-            type = @config[:adapter].sub(/\d*/, '')
-            host = @config[:host] || 'localhost'
-            "RemoteService/sql/#{type}/#{host}"
+            ActiveRecordHelper.remote_service_metric(@config[:adapter], @config[:host])
           end
         end
-
-        def metric_for_name(name)
-          if name && (parts = name.split " ") && parts.size == 2
-            model = parts.first
-            operation = parts.last.downcase
-            op_name = case operation
-                          when 'load', 'count', 'exists' then 'find'
-                          when 'indexes', 'columns' then nil # fall back to DirectSQL
-                          when 'destroy', 'find', 'save', 'create' then operation
-                          when 'update' then 'save'
-                          else
-                            if model == 'Join'
-                              operation
-                            end
-                          end
-            "ActiveRecord/#{model}/#{op_name}" if op_name
-          end
-        end
-
-        def metric_for_sql(sql)
-          metric = NewRelic::Agent::Transaction.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
-
-        def rollup_metrics_for(metric)
-          metrics = ["ActiveRecord/all"]
-          metrics << "ActiveRecord/#{$1}" if metric =~ /ActiveRecord\/\w+\/(\w+)/
-          metrics
-        end
       end
     end
   end
@@ -113,8 +72,9 @@ DependencyDetection.defer do
   @name = :active_record
 
   depends_on do
-    defined?(::ActiveRecord) && (!defined?(::ActiveRecord::VERSION) ||
-      ::ActiveRecord::VERSION::MAJOR.to_i <= 3)
+    defined?(::ActiveRecord) && defined?(::ActiveRecord::Base) &&
+      (!defined?(::ActiveRecord::VERSION) ||
+        ::ActiveRecord::VERSION::MAJOR.to_i <= 3)
   end
 
   depends_on do

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

@@ -52,8 +52,16 @@ module NewRelic
         # 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 = []
+
+          # If we're outside of a web transaction, don't record any rollup
+          # database metrics. This is to prevent metrics from background tasks
+          # from polluting the metrics used to drive overview graphs.
+          if NewRelic::Agent::Transaction.recording_web_transaction?
+            metrics << "ActiveRecord/all"
+          end
           metrics << "ActiveRecord/#{$1}" if metric =~ /ActiveRecord\/[\w|\:]+\/(\w+)/
+
           metrics
         end
 

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

@@ -310,7 +310,7 @@ module NewRelic
             return yield if !(NewRelic::Agent.is_execution_traced? || options[:force])
             options[:metric] = true if options[:metric].nil?
             options[:deduct_call_time_from_parent] = true if options[:deduct_call_time_from_parent].nil?
-            start_time, expected_scope = NewRelic::Agent::MethodTracer::InstanceMethods::TraceExecutionScoped.trace_execution_scoped_header(options)
+            _, expected_scope = NewRelic::Agent::MethodTracer::InstanceMethods::TraceExecutionScoped.trace_execution_scoped_header(options, txn.start_time.to_f)
 
             begin
               NewRelic::Agent::BusyCalculator.dispatcher_start txn.start_time
@@ -338,11 +338,12 @@ module NewRelic
             metric_names = Array(metrics)
             first_name = metric_names.shift
             scope = NewRelic::Agent.instance.stats_engine.scope_name
-            NewRelic::Agent::MethodTracer::InstanceMethods::TraceExecutionScoped.trace_execution_scoped_footer(start_time, first_name, metric_names, expected_scope, scope, options)
+            end_time = Time.now
+            NewRelic::Agent::MethodTracer::InstanceMethods::TraceExecutionScoped.trace_execution_scoped_footer(txn.start_time.to_f, first_name, metric_names, expected_scope, scope, options, end_time.to_f)
             NewRelic::Agent::BusyCalculator.dispatcher_finish
             # Look for a transaction in the thread local and process it.
             # Clear the thread local when finished to ensure it only gets called once.
-            txn = Transaction.stop(txn_name)
+            txn = Transaction.stop(txn_name, end_time)
             txn.record_apdex(txn_name) unless ignore_apdex?
 
             NewRelic::Agent::TransactionInfo.get.ignore_end_user = true if ignore_enduser?