newrelic_rpm 4.8.0.341 → 5.1.0.344

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b51f94bfacea16c929d073a557db1c96c171da40
-  data.tar.gz: 6b593714cfad1a3751dd07b410ba300fe46e4751
+SHA256:
+  metadata.gz: 542ac1ce1a083c278c83f047f78ab8b3c8810a0916c87f83894a1f923d0a3fd2
+  data.tar.gz: 4e1eb213e1a4dac5877552f15e971bdf1b5005d2fb208a5364a8e1e59b9d25a0
 SHA512:
-  metadata.gz: 88aa0416e6c2a3f8e32b6b5536e1b4f58b5b423ce06085ba583830fca6c014c04ea318bad3b48bcc17f5f93506d27f1ac7fed3ce56fb157cfd43830650c74652
-  data.tar.gz: afc0971db514b4b76e93725c6c7b299e26a281ba0a8cee2add9aba30a149f0c20a0dc74d7d08363f4977a54c5dc90f2e897edf64d2fa658cf286cc18358cc978
+  metadata.gz: eaf4583a69257f2e22aaae8a6148a5b38d130f83e9585fd69b70ddaf6696e18d7da0a814e7d0046fa6fc6d1afd23f591f961194b56c3da4d86c97cc9d975da4e
+  data.tar.gz: 49de5e3b35b731ef61835a2f3fed0a82fcf7ff9af97db695c829cd3936b19bd7ecf1087ff69c5a755a743f203a1efec8c070d4587737e0419e364116bd827121

data/.travis.yml

@@ -16,6 +16,11 @@ before_install:
 
 install: bundle install
 
+addons:
+  apt:
+    packages:
+      - haveged
+
 before_script: ./test/script/before_script/install_mongodb.sh
 
 script: ./test/script/ci.sh
@@ -171,3 +176,25 @@ matrix:
       env: TYPE=UNIT ENVIRONMENT=rails31
     - rvm: jruby-9.1.13.0
       env: TYPE=UNIT ENVIRONMENT=rails32
+
+  # Travis (and only Travis) has been throwing difficult-to-reproduce
+  # errors in various JRuby tests.  These appeared after a build image
+  # update, and they seem to be unrelated to any agent code changes.
+  # So, we'll allow these specific test runs to fail while we track
+  # the issue (RUBY-1869).
+  #
+  allow_failures:
+    - rvm: jruby-9.1.13.0
+      env: TYPE=UNIT ENVIRONMENT=rails40
+    - rvm: jruby-9.1.13.0
+      env: TYPE=UNIT ENVIRONMENT=rails41
+    - rvm: jruby-9.1.13.0
+      env: TYPE=UNIT ENVIRONMENT=rails42
+    - rvm: jruby-9.1.13.0
+      env: TYPE=UNIT ENVIRONMENT=rails50
+    - rvm: jruby-9.1.13.0
+      env: TYPE=UNIT ENVIRONMENT=rails51
+    - rvm: jruby-9.1.13.0
+      env: TYPE=UNIT ENVIRONMENT=norails
+    - rvm: jruby-9.1.13.0
+      env: TYPE=FUNCTIONAL GROUP=background_2

data/CHANGELOG.md

@@ -1,5 +1,98 @@
 # New Relic Ruby Agent Release Notes #
 
+  ## v5.1.0 ##
+
+  * Rails 5.2 support
+
+    The Ruby agent has been validated against the latest release of
+    Ruby on Rails!
+
+  * Support for newer libraries and frameworks
+
+    We have updated the multiverse suite to test the agent against
+    current versions of several frameworks.
+
+  * Add `custom_attributes.enabled` configuration option
+
+    This option is enabled by default. When it's disabled, custom
+    attributes will not be transmitted on transaction events or error
+    events.
+
+  * Fix Grape load order dependency
+
+    The agent will now choose the correct name for Grape transactions
+    even if the customer's app loads the agent before Grape. Thanks
+    to Daniel Doubrovkine for the contribution!
+
+  * Add `webpacker:compile` to blacklisted tasks
+
+    `webpacker:compile` is commonly used for compiling assets. It has
+    been added to `AUTOSTART_BLACKLISTED_RAKE_TASKS` in the default
+    configuration. Thanks to Claudio B. for the contribution!
+
+  * Make browser instrumentation W3C-compliant
+
+    `type="text/javascript"` is optional for the `<script>` tag under
+    W3C. The `type` attribute has now been removed from browser
+    instrumentation. Thanks to Spharian for the contribution!
+
+  * Deferred `add_method_tracer` calls
+
+    If a third-party library calls `add_method_tracer` before the
+    agent has finished starting, we now queue these calls and run them
+    when it's safe to do so (rather than skipping them and logging a
+    warning).
+
+  * Bugfix for Resque `around` / `before` hooks
+
+    In rare cases, the agent was not instrumenting Resque `around` and
+    `before` hooks. This version fixes the error.
+
+  * Truncation of long stack traces
+
+    Occasionally, long stack traces would cause complications sending
+    data to New Relic. This version truncates long traces to 50 frames
+    (split evenly between the top and bottom of the trace).
+
+  ## v5.0.0 ##
+
+  * SSL connections to New Relic are now mandatory
+
+    Prior to this version, using an SSL connection to New Relic was
+    the default behavior, but could be overridden. SSL connections are
+    now enforced (not overrideable).
+
+  * Additional security checking before trying to explain
+    multi-statement SQL queries
+
+    Customer applications might submit SQL queries containing multiple
+    statements (e.g., SELECT * FROM table; SELECT * FROM table).  For
+    security reasons, we should not generate explain plans in this
+    situation.
+
+    Although the agent correctly skipped explain plans for these
+    queries during testing, we have added extra checks for this
+    scenario.
+
+  * Bugfix for RabbitMQ exchange names that are symbols
+
+    The agent no longer raises a TypeError when a RabbitMQ exchange
+    name is a Ruby symbol instead of a string.
+
+  * Bugfix for audit logging to stdout
+
+    Previous agents configured to log to stdout would correctly send
+    regular agent logs to stdout, but would incorrectly send audit
+    logs to a text file named "stdout".  This release corrects the
+    error.
+
+  * Bugfix for Capistrano deployment notifications on v3.7 and beyond
+
+    Starting with version 3.7, Capistrano uses a different technique
+    to determine a project's version control system.  The agent now
+    works correctly with this new behavior. Thanks to Jimmy Zhang for
+    the contribution.
+
   ## v4.8.0 ##
 
   * Initialize New Relic Agent before config initializers

data/README.md

@@ -130,9 +130,6 @@ If you can't find what you're looking for there, reach out to us on our [support
 site](http://support.newrelic.com/) or our [community forum](http://forum.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? Contact us via [support.newrelic.com](http://support.newrelic.com/),
 or email support@newrelic.com.
 

data/config.dot

@@ -21,7 +21,6 @@ digraph AgentEnabled {
   "[error_collector.ignore_errors]"
   "[browser_monitoring.auto_instrument]"
   "[license_key]"
-  "[ssl]"
   "[verify_certificate]"
   "[api_host]"
   "[api_port]"
@@ -164,14 +163,12 @@ digraph AgentEnabled {
   "Control#server_from_host" -> "[host]"
   "Control#server_from_host" -> "[port]"
   "Control#server_from_host" -> "Control#convert_to_ip_address"
-  "Control#http_connection" -> "[ssl]"
   "Control#http_connection" -> "[verify_certificate]"
   "Control#http_connection" -> "Control#proxy_server"
   "Control#set_log_level!" -> "[log_level]"
   "Control#log_path" -> "[log_file_path]"
   "Control#log_path" -> "Control#log_to_stdout?"
   "Control#log_to_stdout?" -> "[log_file_path]"
-  "Control#convert_to_ip_address" -> "[ssl]"
   "Control#convert_to_ip_address" -> "[verify_certificate]"
   "Control#server" -> "Control#server_from_host"
   "Control#setup_log" -> "Control#set_log_level!"

data/lib/new_relic/agent/{throughput_monitor.rb → adaptive_sampler.rb}

@@ -4,14 +4,16 @@
 
 module NewRelic
   module Agent
-    class ThroughputMonitor
+    class AdaptiveSampler
 
-      def initialize target_samples = 10
+      def initialize target_samples = 10, interval_duration = 60
         @target = target_samples
         @seen = 0
         @seen_last = 0
         @sampled_count = 0
-        @first_cycle = true
+        @interval_duration = interval_duration
+        @first_interval = true
+        @interval_start = Time.now.to_f
         @lock = Mutex.new
       end
 
@@ -20,7 +22,8 @@ module NewRelic
       # sampled. This uses the adaptive sampling algorithm.
       def sampled?
         @lock.synchronize do
-          sampled = if @first_cycle
+          reset_if_interval_expired!
+          sampled = if @first_interval
             @sampled_count < 10
           elsif @sampled_count < @target
             rand(@seen_last) < @target
@@ -35,15 +38,6 @@ module NewRelic
         end
       end
 
-      def reset!
-        @lock.synchronize do
-          @first_cycle = false
-          @seen_last = @seen
-          @seen = 0
-          @sampled_count = 0
-        end
-      end
-
       def stats
         @lock.synchronize do
           {
@@ -54,6 +48,21 @@ module NewRelic
           }
         end
       end
+
+      private
+
+      def reset_if_interval_expired!
+        now = Time.now.to_f
+        return unless @interval_start + @interval_duration <= now
+
+        elapsed_intervals = Integer((now - @interval_start) / @interval_duration)
+        @interval_start = @interval_start + elapsed_intervals * @interval_duration
+
+        @first_interval = false
+        @seen_last = elapsed_intervals > 1 ? 0 : @seen
+        @seen = 0
+        @sampled_count = 0
+      end
     end
   end
 end

data/lib/new_relic/agent/agent.rb

@@ -30,7 +30,7 @@ require 'new_relic/agent/vm/monotonic_gc_profiler'
 require 'new_relic/agent/utilization_data'
 require 'new_relic/environment_report'
 require 'new_relic/agent/attribute_filter'
-require 'new_relic/agent/throughput_monitor'
+require 'new_relic/agent/adaptive_sampler'
 
 module NewRelic
   module Agent
@@ -63,7 +63,7 @@ module NewRelic
         @harvest_samplers          = NewRelic::Agent::SamplerCollection.new(@events)
         @monotonic_gc_profiler     = NewRelic::Agent::VM::MonotonicGCProfiler.new
         @javascript_instrumentor   = NewRelic::Agent::JavascriptInstrumentor.new(@events)
-        @throughput_monitor        = NewRelic::Agent::ThroughputMonitor.new
+        @adaptive_sampler          = NewRelic::Agent::AdaptiveSampler.new
 
         @harvester       = NewRelic::Agent::Harvester.new(@events)
         @after_fork_lock = Mutex.new
@@ -144,7 +144,7 @@ module NewRelic
         attr_reader :custom_event_aggregator
         attr_reader :transaction_event_recorder
         attr_reader :attribute_filter
-        attr_reader :throughput_monitor
+        attr_reader :adaptive_sampler
 
         def transaction_event_aggregator
           @transaction_event_recorder.transaction_event_aggregator
@@ -1154,7 +1154,6 @@ module NewRelic
             harvest_and_send_for_agent_commands
           end
         ensure
-          throughput_monitor.reset!
           NewRelic::Agent::Database.close_connections
           duration = (Time.now - now).to_f
           NewRelic::Agent.record_metric('Supportability/Harvest', duration)

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

@@ -113,9 +113,15 @@ module NewRelic
           }
         end
 
+        DEFAULT_LOG_DIR = 'log/'.freeze
+
         def self.audit_log_path
           Proc.new {
-            File.join(NewRelic::Agent.config[:log_file_path], 'newrelic_audit.log')
+            log_file_path = NewRelic::Agent.config[:log_file_path]
+            wants_stdout  = (log_file_path.upcase == 'STDOUT')
+            audit_log_dir = wants_stdout ? DEFAULT_LOG_DIR : log_file_path
+
+            File.join(audit_log_dir, 'newrelic_audit.log')
           }
         end
 
@@ -142,10 +148,6 @@ module NewRelic
           Proc.new { NewRelic::Agent.config[:apdex_t] * 4 }
         end
 
-        def self.port
-          Proc.new { NewRelic::Agent.config[:ssl] ? 443 : 80 }
-        end
-
         def self.profiling_available
           Proc.new {
             begin
@@ -157,6 +159,17 @@ module NewRelic
           }
         end
 
+        def self.host
+          Proc.new do
+            regex = /\A(?<identifier>.+?)x/
+            if matches = regex.match(String(NewRelic::Agent.config[:license_key]))
+              "collector.#{matches['identifier']}.nr-data.net"
+            else
+              'collector.newrelic.com'
+            end
+          end
+        end
+
         def self.convert_to_regexp_list(raw_value)
           value_list = convert_to_list(raw_value)
           value_list.map do |value|
@@ -238,7 +251,8 @@ module NewRelic
         'test:uncommitted',
         'time:zones:all',
         'tmp:clear',
-        'tmp:create'
+        'tmp:create',
+        'webpacker:compile'
       ].join(',').freeze
 
       DEFAULTS = {
@@ -299,14 +313,6 @@ module NewRelic
           :allowed_from_server => false,
           :description => 'If <code>true</code>, enables <a href="https://docs.newrelic.com/docs/accounts-partnerships/accounts/security/high-security">high security mode</a>. Ensure you understand the implications of high security mode before enabling this setting.'
         },
-        :ssl => {
-          :default => true,
-          :allow_nil => true,
-          :public => true,
-          :type => Boolean,
-          :allowed_from_server => false,
-          :description => 'If <code>true</code>, enables SSL for transmissions to the New Relic <a href="https://docs.newrelic.com/docs/apm/new-relic-apm/getting-started/glossary#collector">collector</a>.'
-        },
         :proxy_host => {
           :default => nil,
           :allow_nil => true,
@@ -450,7 +456,7 @@ module NewRelic
           :description => 'Specify a whitelist of exceptions you do not want the agent to strip when <a href="#strip_exception_messages-enabled">strip_exception_messages</a> is <code>true</code>. Separate exceptions with a comma. For example, <code>"ImportantException,PreserveMessageException"</code>.'
         },
         :host => {
-          :default => 'collector.newrelic.com',
+          :default => DefaultSource.host,
           :public => false,
           :type => String,
           :allowed_from_server => false,
@@ -464,7 +470,7 @@ module NewRelic
           :description => 'API host for New Relic.'
         },
         :port => {
-          :default => DefaultSource.port,
+          :default => 443,
           :public => false,
           :type => Integer,
           :allowed_from_server => false,
@@ -578,7 +584,7 @@ module NewRelic
           :description => 'Defines a name for the log file.'
         },
         :log_file_path => {
-          :default => 'log/',
+          :default => DefaultSource::DEFAULT_LOG_DIR,
           :public => true,
           :type => String,
           :allowed_from_server => false,
@@ -799,7 +805,16 @@ module NewRelic
           :public => true,
           :type => String,
           :allowed_from_server => true,
-          :description => 'Obfuscation level for SQL queries reported in transaction trace nodes. Valid options are <code>obfuscated</code>, <code>raw</code>, or <code>none</code>.'
+          :description => 'Obfuscation level for SQL queries reported in transaction trace nodes.</p>
+
+  <p>By default, this is set to <code>obfuscated</code>, which strips out the numeric and string literals.</p>
+
+  <ul>
+    <li>If you do not want the agent to capture query information, set this to <code>none</code>.</li>
+    <li>If you want the agent to capture all query information in its original form, set this to <code>raw</code>.</li>
+    <li>When you enable <a href="/docs/agents/manage-apm-agents/configuration/high-security-mode">high security mode</a>, this is automatically set to <code>obfuscated</code>.</li>
+  </ul>
+  <p>' # Doc generator will wrap this in <p>...</p>
         },
         :'transaction_tracer.record_redis_arguments' => {
           :default => false,
@@ -1082,7 +1097,7 @@ module NewRelic
           :description => 'List of trusted New Relic account IDs for the purposes of cross-application tracing. Inbound requests from applications including cross-application headers that do not come from an account in this list will be ignored.'
         },
         :"cross_application_tracer.enabled" => {
-          :default => true,
+          :default => Proc.new { !NewRelic::Agent.config[:'distributed_tracing.enabled'] },
           :public => true,
           :type => Boolean,
           :allowed_from_server => true,
@@ -1563,6 +1578,13 @@ module NewRelic
           :transform    => DefaultSource.method(:convert_to_list),
           :description => 'Prefix of attributes to include in browser monitoring. Allows <code>*</code> as wildcard at end.'
         },
+        :'custom_attributes.enabled' => {
+          :default     => true,
+          :public      => true,
+          :type        => Boolean,
+          :allowed_from_server => false,
+          :description => 'If <code>false</code>, custom attributes will not be sent on Insights events.'
+        },
         :'utilization.detect_aws' => {
           :default     => true,
           :public      => true,

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

@@ -10,8 +10,6 @@ module NewRelic
       class HighSecuritySource < DottedHash
         def initialize(local_settings)
           super({
-            :ssl => true,
-
             :capture_params           => false,
             :'resque.capture_params'  => false,
             :'sidekiq.capture_params' => false,

data/lib/new_relic/agent/database/explain_plan_helpers.rb

@@ -21,6 +21,17 @@ module NewRelic
           Obfuscator.instance.obfuscate_single_quote_literals(sql) =~ /\$\d+/
         end
 
+        # SQL containing a semicolon in the middle (with something
+        # other than whitespace after it) may contain two or more
+        # queries.  It's not safe to EXPLAIN this kind of expression,
+        # since it could lead to executing unwanted SQL.
+        #
+        MULTIPLE_QUERIES = Regexp.new(';\s*\S+')
+
+        def multiple_queries?(sql)
+          sql =~ MULTIPLE_QUERIES
+        end
+
         def handle_exception_in_explain
           yield
         rescue => e

data/lib/new_relic/agent/database.rb

@@ -271,6 +271,11 @@ module NewRelic
             return false
           end
 
+          if multiple_queries?(@sql)
+            NewRelic::Agent.logger.debug('Unable to collect explain plan for multiple queries.')
+            return false
+          end
+
           true
         end
       end

data/lib/new_relic/agent/distributed_trace_monitor.rb

@@ -17,12 +17,14 @@ module NewRelic
       end
 
       def on_before_call(request)
-        return unless CrossAppTracing.cross_app_enabled?
+        return unless NewRelic::Agent.config[:'distributed_tracing.enabled']
         return unless payload = request[NEWRELIC_TRACE_KEY]
 
         state = NewRelic::Agent::TransactionState.tl_get
         txn = state.current_transaction
-        txn.accept_distributed_trace_payload HTTP_TRANSPORT_TYPE, payload
+        if txn.accept_distributed_trace_payload payload
+          txn.distributed_trace_payload.caller_transport_type = HTTP_TRANSPORT_TYPE
+        end
       end
     end
   end