newrelic_rpm 3.11.2.286 → 3.12.0.288

data/lib/new_relic/rack/developer_mode/segment_summary.rb

@@ -0,0 +1,56 @@
+# 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.
+
+# summarizes performance data for all calls to segments
+# with the same metric_name
+module NewRelic
+  module Rack
+    class DeveloperMode
+      class SegmentSummary
+        attr_accessor :metric_name, :total_time, :exclusive_time, :call_count, :current_nest_count
+
+        def initialize(metric_name, sample)
+          @metric_name = metric_name
+          @total_time, @exclusive_time, @call_count = 0,0,0
+          @sample = sample
+          @current_nest_count = 0
+        end
+
+        def <<(segment)
+          if metric_name != segment.metric_name
+            raise ArgumentError, "Metric Name Mismatch: #{segment.metric_name} != #{metric_name}"
+          end
+
+          # a nested segment should use the sum of the top level totals
+          @total_time += segment.duration if current_nest_count == 0
+          @exclusive_time += segment.exclusive_duration
+          @call_count += 1
+        end
+
+        def average_time
+          @total_time / @call_count
+        end
+
+        def average_exclusive_time
+          @exclusive_time / @call_count
+        end
+
+        def exclusive_time_percentage
+          return 0 unless @exclusive_time && @sample.duration && @sample.duration > 0
+          @exclusive_time / @sample.duration
+        end
+
+        def total_time_percentage
+          return 0 unless @total_time && @sample.duration && @sample.duration > 0
+          @total_time / @sample.duration
+        end
+
+        def ui_name
+          return @metric_name if @metric_name == 'Remainder'
+          NewRelic::MetricParser::MetricParser.parse(@metric_name).developer_name
+        end
+      end
+    end
+  end
+end

data/lib/new_relic/version.rb

@@ -11,8 +11,8 @@ module NewRelic
     end
 
     MAJOR = 3
-    MINOR = 11
-    TINY  = 2
+    MINOR = 12
+    TINY  = 0
 
     begin
       require File.join(File.dirname(__FILE__), 'build')

data/newrelic.yml

@@ -3,222 +3,45 @@
 # .NET, PHP, Python and Node applications with deep visibility and low
 # overhead.  For more information, visit www.newrelic.com.
 #
-# Generated <%= Time.now.strftime('%B %d, %Y') %>, for version <%= NewRelic::VERSION::STRING %>
-#
-# <%= generated_for_user %>
-
+# Generated <%= Time.now.strftime('%B %d, %Y') %><%= ", for version #{@agent_version}" if @agent_version %>
+# <%= "\n# #{generated_for_user}\n#" if generated_for_user %>
+# For full documentation of agent configuration options, please refer to
+# https://docs.newrelic.com/docs/agents/ruby-agent/installation-configuration/ruby-agent-configuration
 
-# Here are the settings that are common to all environments
 common: &default_settings
-  # ============================== LICENSE KEY ===============================
-
-  # You must specify the license key associated with your New Relic
-  # account.  This key binds your Agent's data to your account in the
-  # New Relic service.
-  license_key: '<%= license_key %>'
-
-  # Agent Enabled (Ruby/Rails Only)
-  # Use this setting to force the agent to run or not run.
-  # Default is 'auto' which means the agent will install and run only
-  # if a valid dispatcher such as Mongrel is running.  This prevents
-  # it from running with Rake or the console.  Set to false to
-  # completely turn the agent off regardless of the other settings.
-  # Valid values are true, false and auto.
-  #
-  # agent_enabled: auto
+  # Required license key associated with your New Relic account.
+  license_key: <%= license_key %>
 
-  # Application Name Set this to be the name of your application as
-  # you'd like it show up in New Relic. The service will then auto-map
-  # instances of your application into an "application" on your
-  # dashboard page. If you want to map this instance into multiple
-  # apps, like "AJAX Requests" and "All UI" then specify a semicolon
-  # separated list of up to three distinct names, or a yaml list.
-  # Defaults to the capitalized RAILS_ENV or RACK_ENV (i.e.,
-  # Production, Staging, etc)
-  #
-  # Example:
-  #
-  #   app_name:
-  #       - Ajax Service
-  #       - All Services
-  #
-  # Caution: If you change this name, a new application will appear in the New
-  # Relic user interface with the new name, and data will stop reporting to the
-  # app with the old name.
-  #
-  # See https://newrelic.com/docs/site/renaming-applications for more details
-  # on renaming your New Relic applications.
-  #
-  app_name: <%= @app_name %>
+  # Your application name. Renaming here affects where data displays in New
+  # Relic.  For more details, see https://docs.newrelic.com/docs/apm/new-relic-apm/maintenance/renaming-applications
+  app_name: <%= app_name %>
 
-  # When "true", the agent collects performance data about your
-  # application and reports this data to the New Relic service at
-  # newrelic.com. This global switch is normally overridden for each
-  # environment below. (formerly called 'enabled')
-  monitor_mode: true
+  # To disable the agent regardless of other settings, uncomment the following:
+  # agent_enabled: false
 
-  # Developer mode should be off in every environment but
-  # development as it has very high overhead in memory.
-  developer_mode: false
-
-  # The newrelic agent generates its own log file to keep its logging
-  # information separate from that of your application. Specify its
-  # log level here.
+  # Logging level for log/newrelic_agent.log
   log_level: info
 
-  # Optionally set the path to the log file This is expanded from the
-  # root directory (may be relative or absolute, e.g. 'log/' or
-  # '/var/log/') The agent will attempt to create this directory if it
-  # does not exist.
-  # log_file_path: 'log'
-
-  # Optionally set the name of the log file, defaults to 'newrelic_agent.log'
-  # log_file_name: 'newrelic_agent.log'
-
-  # The newrelic agent communicates with the service via https by default.  This
-  # prevents eavesdropping on the performance metrics transmitted by the agent.
-  # The encryption required by SSL introduces a nominal amount of CPU overhead,
-  # which is performed asynchronously in a background thread.  If you'd prefer
-  # to send your metrics over http uncomment the following line.
-  # ssl: false
-
-  #============================== Browser Monitoring ===============================
-  # New Relic Real User Monitoring gives you insight into the performance real users are
-  # experiencing with your website. This is accomplished by measuring the time it takes for
-  # your users' browsers to download and render your web pages by injecting a small amount
-  # of JavaScript code into the header and footer of each page.
-  browser_monitoring:
-      # By default the agent automatically injects the monitoring JavaScript
-      # into web pages. Set this attribute to false to turn off this behavior.
-      auto_instrument: true
-
-  # Proxy settings for connecting to the New Relic server.
-  #
-  # If a proxy is used, the host setting is required.  Other settings
-  # are optional. Default port is 8080.
-  #
-  # proxy_host: hostname
-  # proxy_port: 8080
-  # proxy_user:
-  # proxy_pass:
-
-  # The agent can optionally log all data it sends to New Relic servers to a
-  # separate log file for human inspection and auditing purposes. To enable this
-  # feature, change 'enabled' below to true.
-  # See: https://newrelic.com/docs/ruby/audit-log
-  audit_log:
-    enabled: false
-
-  # Tells transaction tracer and error collector (when enabled)
-  # whether or not to capture HTTP params.  When true, frameworks can
-  # exclude HTTP parameters from being captured.
-  # Rails: the RoR filter_parameter_logging excludes parameters
-  # Java: create a config setting called "ignored_params" and set it to
-  #     a comma separated list of HTTP parameter names.
-  #     ex: ignored_params: credit_card, ssn, password
-  capture_params: false
-
-  # Transaction tracer captures deep information about slow
-  # transactions and sends this to the New Relic service once a
-  # minute. Included in the transaction is the exact call sequence of
-  # the transactions including any SQL statements issued.
-  transaction_tracer:
-
-    # Transaction tracer is enabled by default. Set this to false to
-    # turn it off. This feature is only available at the Professional
-    # and above product levels.
-    enabled: true
-
-    # Threshold in seconds for when to collect a transaction
-    # trace. When the response time of a controller action exceeds
-    # this threshold, a transaction trace will be recorded and sent to
-    # New Relic. Valid values are any float value, or (default) "apdex_f",
-    # which will use the threshold for an dissatisfying Apdex
-    # controller action - four times the Apdex T value.
-    transaction_threshold: apdex_f
 
-    # When transaction tracer is on, SQL statements can optionally be
-    # recorded. The recorder has three modes, "off" which sends no
-    # SQL, "raw" which sends the SQL statement in its original form,
-    # and "obfuscated", which strips out numeric and string literals.
-    record_sql: obfuscated
-
-    # Threshold in seconds for when to collect stack trace for a SQL
-    # call. In other words, when SQL statements exceed this threshold,
-    # then capture and send to New Relic the current stack trace. This is
-    # helpful for pinpointing where long SQL calls originate from.
-    stack_trace_threshold: 0.500
-
-    # Determines whether the agent will capture query plans for slow
-    # SQL queries.  Only supported in mysql and postgres.  Should be
-    # set to false when using other adapters.
-    # explain_enabled: true
-
-    # Threshold for query execution time below which query plans will
-    # not be captured.  Relevant only when `explain_enabled` is true.
-    # explain_threshold: 0.5
-
-  # Error collector captures information about uncaught exceptions and
-  # sends them to New Relic for viewing
-  error_collector:
-
-    # Error collector is enabled by default. Set this to false to turn
-    # it off. This feature is only available at the Professional and above
-    # product levels.
-    enabled: true
-
-    # To stop specific errors from reporting to New Relic, set this property
-    # to comma-separated values.  Default is to ignore routing errors,
-    # which are how 404's get triggered.
-    ignore_errors: "ActionController::RoutingError,Sinatra::NotFound"
-
-  # If you're interested in capturing memcache keys as though they
-  # were SQL uncomment this flag. Note that this does increase
-  # overhead slightly on every memcached call, and can have security
-  # implications if your memcached keys are sensitive
-  # capture_memcache_keys: true
-
-# Application Environments
-# ------------------------------------------
 # Environment-specific settings are in this section.
-# For Rails applications, RAILS_ENV is used to determine the environment.
-# For Java applications, pass -Dnewrelic.environment <environment> to set
-# the environment.
-
-# NOTE if your application has other named environments, you should
-# provide newrelic configuration settings for these environments here.
-
+# RAILS_ENV or RACK_ENV (as appropriate) is used to determine the environment.
+# If your application has other named environments, configure them here.
 development:
   <<: *default_settings
-  # Turn on communication to New Relic service in development mode
-  monitor_mode: true
-  app_name: <%= @app_name %> (Development)
+  app_name: <%= app_name %> (Development)
 
-  # Rails Only - when running in Developer Mode, the New Relic Agent will
-  # present performance information on the last 100 transactions you have
-  # executed since starting the mongrel.
   # NOTE: There is substantial overhead when running in developer mode.
   # Do not use for production or load testing.
   developer_mode: true
 
 test:
   <<: *default_settings
-  # It almost never makes sense to turn on the agent when running
-  # unit, functional or integration tests or the like.
+  # It doesn't make sense to report to New Relic from automated test runs.
   monitor_mode: false
 
-# Turn on the agent in production for 24x7 monitoring. NewRelic
-# testing shows an average performance impact of < 5 ms per
-# transaction, you can leave this on all the time without
-# incurring any user-visible performance degradation.
-production:
+staging:
   <<: *default_settings
-  monitor_mode: true
+  app_name: <%= app_name %> (Staging)
 
-# Many applications have a staging environment which behaves
-# identically to production. Support for that environment is provided
-# here.  By default, the staging environment has the agent turned on.
-staging:
+production:
   <<: *default_settings
-  monitor_mode: true
-  app_name: <%= @app_name %> (Staging)

data/test/agent_helper.rb

@@ -287,10 +287,14 @@ def in_transaction(*args, &blk)
                                         args.first || 'dummy'
 
   state = NewRelic::Agent::TransactionState.tl_get
+  txn = nil
 
   NewRelic::Agent::Transaction.wrap(state, name, category, opts) do
+    txn = state.current_transaction
     yield state.current_transaction
   end
+
+  txn
 end
 
 def stub_transaction_guid(guid)
@@ -300,7 +304,7 @@ end
 # Convenience wrapper around in_transaction that sets the category so that it
 # looks like we are in a web transaction
 def in_web_transaction(name='dummy')
-  in_transaction(name, :category => :controller, :request => stub()) do
+  in_transaction(name, :category => :controller, :request => stub(:path => '/')) do
     yield
   end
 end
@@ -311,12 +315,14 @@ def in_background_transaction(name='silly')
   end
 end
 
-def last_traced_error
-  NewRelic::Agent.agent.error_collector.errors.last
+def refute_contains_request_params(attributes)
+  attributes.keys.each do |key|
+    refute_match /^request\.parameters\./, key.to_s
+  end
 end
 
-def last_traced_error_request_params
-  last_traced_error.params[:request_params]
+def last_traced_error
+  NewRelic::Agent.agent.error_collector.errors.last
 end
 
 def last_transaction_trace
@@ -324,7 +330,11 @@ def last_transaction_trace
 end
 
 def last_transaction_trace_request_params
-  last_transaction_trace.params[:request_params]
+  agent_attributes = attributes_for(last_transaction_trace, :agent)
+  agent_attributes.inject({}) do |memo, (key, value)|
+    memo[key] = value if key.to_s.start_with?("request.parameters.")
+    memo
+  end
 end
 
 def find_sql_trace(metric_name)
@@ -337,72 +347,64 @@ def last_sql_trace
   NewRelic::Agent.agent.sql_sampler.sql_traces.values.last
 end
 
-def find_last_transaction_segment(transaction_sample=nil)
+def find_last_transaction_node(transaction_sample=nil)
   if transaction_sample
-    root_segment = transaction_sample.root_segment
+    root_node = transaction_sample.root_node
   else
     builder = NewRelic::Agent.agent.transaction_sampler.tl_builder
-    root_segment = builder.current_segment
+    root_node = builder.current_node
   end
 
-  last_segment = nil
-  root_segment.each_segment {|s| last_segment = s }
+  last_node = nil
+  root_node.each_node {|s| last_node = s }
 
-  return last_segment
+  return last_node
 end
 
-def collect_segment_names(transaction_sample)
-  names = []
-
-  transaction_sample.root_segment.each_segment do |segment|
-    names << segment.metric_name
-  end
-
-  names
-end
-
-def find_segment_with_name(transaction_sample, name)
-  transaction_sample.root_segment.each_segment do |segment|
-    if segment.metric_name == name
-      return segment
+def find_node_with_name(transaction_sample, name)
+  transaction_sample.root_node.each_node do |node|
+    if node.metric_name == name
+      return node
     end
   end
 
   nil
 end
 
-def find_segment_with_name_matching(transaction_sample, regex)
-  transaction_sample.root_segment.each_segment do |segment|
-    if segment.metric_name.match regex
-      return segment
+def find_node_with_name_matching(transaction_sample, regex)
+  transaction_sample.root_node.each_node do |node|
+    if node.metric_name.match regex
+      return node
     end
   end
 
   nil
 end
 
-def find_all_segments_with_name_matching(transaction_sample, regexes)
+def find_all_nodes_with_name_matching(transaction_sample, regexes)
   regexes = [regexes].flatten
-  matching_segments = []
+  matching_nodes = []
 
-  transaction_sample.root_segment.each_segment do |segment|
+  transaction_sample.root_node.each_node do |node|
     regexes.each do |regex|
-      if segment.metric_name.match regex
-        matching_segments << segment
+      if node.metric_name.match regex
+        matching_nodes << node
       end
     end
   end
 
-  matching_segments
+  matching_nodes
 end
 
 def with_config(config_hash, at_start=true)
   config = NewRelic::Agent::Configuration::DottedHash.new(config_hash, true)
   NewRelic::Agent.config.add_config_for_testing(config, at_start)
+  NewRelic::Agent.instance.refresh_attribute_filter
   begin
     yield
   ensure
     NewRelic::Agent.config.remove_config(config)
+    NewRelic::Agent.instance.refresh_attribute_filter
   end
 end
 
@@ -639,3 +641,7 @@ def assert_event_attributes(event, test_name, expected_attributes, non_expected_
     assert_nil(event_attrs[name], "Found value '#{event_attrs[name]}' for attribute '#{name}', but expected nothing in #{test_name}")
   end
 end
+
+def attributes_for(sample, type)
+  sample.attributes.instance_variable_get("@#{type}_attributes")
+end