newrelic_rpm 5.5.0.348 → 7.2.0

data/lib/new_relic/rack.rb

@@ -1,6 +1,6 @@
 # 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.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 # @api public
 module NewRelic

data/lib/new_relic/rack/agent_hooks.rb

@@ -1,6 +1,6 @@
 # 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.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 require 'new_relic/agent/event_listener'
 require 'new_relic/rack/agent_middleware'

data/lib/new_relic/rack/agent_middleware.rb

@@ -1,8 +1,8 @@
 # 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.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
-require 'new_relic/agent/transaction_state'
+require 'new_relic/agent/tracer'
 require 'new_relic/agent/instrumentation/controller_instrumentation'
 require 'new_relic/agent/instrumentation/middleware_tracing'
 

data/lib/new_relic/rack/browser_monitoring.rb

@@ -1,6 +1,6 @@
 # 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.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 require 'rack'
 require 'new_relic/rack/agent_middleware'
@@ -21,6 +21,7 @@ module NewRelic::Rack
 
     CONTENT_TYPE        = 'Content-Type'.freeze
     CONTENT_DISPOSITION = 'Content-Disposition'.freeze
+    CONTENT_LENGTH      = 'Content-Length'.freeze
     ATTACHMENT          = 'attachment'.freeze
     TEXT_HTML           = 'text/html'.freeze
 
@@ -29,15 +30,20 @@ module NewRelic::Rack
     GT                  = ">".freeze
 
     def traced_call(env)
-      result = @app.call(env)   # [status, headers, response]
+      result = @app.call(env)
+      (status, headers, response) = result
 
       js_to_inject = NewRelic::Agent.browser_timing_header
-      if (js_to_inject != "") && should_instrument?(env, result[0], result[1])
-        response_string = autoinstrument_source(result[2], result[1], js_to_inject)
+      if (js_to_inject != "") && should_instrument?(env, status, headers)
+        response_string = autoinstrument_source(response, headers, js_to_inject)
+        if headers.key?(CONTENT_LENGTH)
+          content_length = response_string ? response_string.bytesize : 0
+          headers[CONTENT_LENGTH] = content_length.to_s
+        end
 
         env[ALREADY_INSTRUMENTED_KEY] = true
         if response_string
-          response = Rack::Response.new(response_string, result[0], result[1])
+          response = Rack::Response.new(response_string, status, headers)
           response.finish
         else
           result
@@ -55,7 +61,7 @@ module NewRelic::Rack
         !env[ALREADY_INSTRUMENTED_KEY] &&
         is_html?(headers) &&
         !is_attachment?(headers) &&
-        !is_streaming?(env)
+        !is_streaming?(env, headers)
     end
 
     def is_html?(headers)
@@ -66,10 +72,11 @@ module NewRelic::Rack
       headers[CONTENT_DISPOSITION] && headers[CONTENT_DISPOSITION].include?(ATTACHMENT)
     end
 
-    def is_streaming?(env)
-      return false unless defined?(ActionController::Live)
+    def is_streaming?(env, headers)
+      return true if headers && headers['Transfer-Encoding'] == 'chunked'
 
-      env['action_controller.instance'].class.included_modules.include?(ActionController::Live)
+      defined?(ActionController::Live) &&
+        env['action_controller.instance'].class.included_modules.include?(ActionController::Live)
     end
 
     CHARSET_RE         = /<\s*meta[^>]+charset\s*=[^>]*>/im.freeze

data/lib/new_relic/recipes.rb

@@ -1,6 +1,6 @@
 # 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.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 # When installed as a plugin, this is loaded automatically.
 #

data/lib/new_relic/recipes/capistrano3.rb

@@ -1,6 +1,6 @@
 # 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.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 require 'capistrano/framework'
 

data/lib/new_relic/recipes/capistrano_legacy.rb

@@ -1,6 +1,6 @@
 # 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.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 make_notify_task = Proc.new do
 

data/lib/new_relic/supportability_helper.rb

@@ -1,6 +1,6 @@
 # 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.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 module NewRelic
   module SupportabilityHelper
@@ -11,7 +11,10 @@ module NewRelic
     # transaction, just to eke out a bit less performance hit
     #
     API_SUPPORTABILITY_METRICS = [
+      :insert_distributed_trace_headers,
+      :accept_distributed_trace_headers,
       :add_custom_attributes,
+      :add_custom_span_attributes,
       :add_instrumentation,
       :add_method_tracer,
       :add_transaction_tracer,
@@ -64,5 +67,17 @@ module NewRelic
         NewRelic::Agent.logger.debug "API supportability metric not found for :#{method_name}"
       end
     end
+
+    def valid_api_argument_class? arg, name, klass
+      return true if arg.is_a?(klass)
+
+      caller_location = caller_locations.first.label
+
+      message = "Bad argument passed to ##{caller_location}. " \
+        "Expected #{klass} for `#{name}` but got #{arg.class}"
+
+      NewRelic::Agent.logger.warn message
+      nil
+    end
   end
 end

data/lib/new_relic/version.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby
 # 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.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 
 module NewRelic
@@ -10,8 +10,8 @@ module NewRelic
       parts.compact.join('.')
     end
 
-    MAJOR = 5
-    MINOR = 5
+    MAJOR = 7
+    MINOR = 2
     TINY  = 0
 
     begin

data/lib/newrelic_rpm.rb

@@ -1,6 +1,6 @@
 # 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.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 # == New Relic Initialization
 #

data/lib/sequel/extensions/newrelic_instrumentation.rb

@@ -1,7 +1,7 @@
 # -*- ruby -*-
 # 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.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 require 'sequel' unless defined?( Sequel )
 require 'newrelic_rpm' unless defined?( NewRelic )

data/lib/sequel/plugins/newrelic_instrumentation.rb

@@ -1,7 +1,7 @@
 # -*- ruby -*-
 # 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.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 require 'sequel' unless defined?( Sequel )
 require 'newrelic_rpm' unless defined?( NewRelic )

data/lib/tasks/all.rb

@@ -1,6 +1,6 @@
 # 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.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 # This is required to load in task definitions from merb
 Dir.glob(File.join(File.dirname(__FILE__),'*.rake')) do |file|

data/lib/tasks/config.html.erb

@@ -1,32 +1,21 @@
 <% sections.each do |(section_key, section_name, section_description, configs)| %>
-<h2 id="<%=section_key%>"><%=section_name%></h2>
+## <%=section_name%>
 
-<%= "<p>#{section_description}</p>" unless section_description.nil? %>
+<%= "#{section_description}" unless section_description.nil? %>
 
-<dl class="clamshell-list">
+<CollapserGroup>
   <% configs.each do |config|%>
-  <!-- ********** <%= config[:key] %> ********** -->
-  <dt id="<%= config[:key].gsub('.', '-') %>"><%=config[:key]%></dt>
-  <dd>
-  <table class="specs">
-    <tbody>
-      <tr>
-        <th>Type</th>
-        <td><%=config[:type]%></td>
-      </tr>
-      <tr>
-        <th>Default</th>
-        <td><%=config[:default]%></td>
-      </tr>
-      <tr>
-        <th>Environ variable</th>
-        <td><code><%=config[:env_var]%></code></td>
-      </tr>
-    </tbody>
-  </table>
+  <Collapser id="<%= config[:key].gsub('.', '-') %>" title="<%=config[:key]%>">
+    <table>
+      <tbody>
+        <tr><th>Type</th><td><%=config[:type]%></td></tr>
+        <tr><th>Default</th><td>`<%=config[:default]%>`</td></tr>
+        <tr><th>Environ variable</th><td>`<%=config[:env_var]%>`</td></tr>
+      </tbody>
+    </table>
 
-  <p><%=config[:description]%></p>
-  </dd>
+  <%=config[:description]%>
+  </Collapser>
   <% end %>
-</dl>
+</CollapserGroup>
 <% end %>

data/lib/tasks/config.rake

@@ -9,16 +9,15 @@ namespace :newrelic do
     SECTION_DESCRIPTIONS = {
       GENERAL              => 'These settings are available for agent configuration. Some settings depend on your New Relic subscription level.',
       DISABLING            => 'Use these settings to toggle instrumentation types during agent startup.',
-      ATTRIBUTES           => '<a href="https://docs.newrelic.com/docs/features/agent-attributes">Attributes</a> are key-value pairs containing information that determines the properties of an event or transaction. These key-value pairs can be viewed within transaction traces in New Relic APM, traced errors in New Relic APM, transaction events in Insights, and page views in Insights. You can customize exactly which attributes will be sent to each of these destinations.',
-      "transaction_tracer" => 'The <a href="/docs/apm/traces/transaction-traces/transaction-traces">transaction traces</a> feature collects detailed information from a selection of transactions, including a summary of the calling sequence, a breakdown of time spent, and a list of SQL queries and their query plans (on mysql and postgresql). Available features depend on your New Relic subscription level.',
+      ATTRIBUTES           => '[Attributes](/docs/features/agent-attributes) are key-value pairs containing information that determines the properties of an event or transaction. These key-value pairs can be viewed within transaction traces in APM, traced errors in APM, transaction events in dashboards, and page views in dashboards. You can customize exactly which attributes will be sent to each of these destinations',
+      "transaction_tracer" => 'The [transaction traces](/docs/apm/traces/transaction-traces/transaction-traces) feature collects detailed information from a selection of transactions, including a summary of the calling sequence, a breakdown of time spent, and a list of SQL queries and their query plans (on mysql and postgresql). Available features depend on your New Relic subscription level.',
       "error_collector"    => 'The agent collects and reports all uncaught exceptions by default. These configuration options allow you to customize the error collection.',
-      "browser_monitoring" => 'New Relic Browser\'s <a href="/docs/browser/new-relic-browser/page-load-timing/page-load-timing-process">page load timing</a> feature (sometimes referred to as real user monitoring or RUM) 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.',
-      "analytics_events"   => '<a href="/docs/insights/new-relic-insights/understanding-insights/new-relic-insights">New Relic Insights</a> is a software analytics resource to gather and visualize data about your software and what it says about your business. With it you can quickly and easily create real-time dashboards to get immediate answers about end-user experiences, clickstreams, mobile activities, and server transactions.'
+      "browser_monitoring" => 'The Browser monitoring [page load timing](/docs/browser/new-relic-browser/page-load-timing/page-load-timing-process) feature (sometimes referred to as real user monitoring or RUM) 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.',
+      "analytics_events"   => '[New Relic dashboards](/docs/query-your-data/explore-query-data/dashboards/introduction-new-relic-one-dashboards) is a resource to gather and visualize data about your software and what it says about your business. With it you can quickly and easily create real-time dashboards to get immediate answers about end-user experiences, clickstreams, mobile activities, and server transactions.'
     }
 
     NAME_OVERRIDES = {
-      "slow_sql"     => "Slow SQL",
-      "xray_session" => "X-Ray Session"
+      "slow_sql"     => "Slow SQL"
     }
 
     def output(format)
@@ -97,8 +96,9 @@ namespace :newrelic do
     end
 
     def format_description(value)
-      description = value[:description]
-      description = "<b>DEPRECATED</b> #{description}" if value[:deprecated]
+      description = ''
+      description += "<b>DEPRECATED</b> " if value[:deprecated]
+      description += value[:description]
       description
     end
 
@@ -106,7 +106,7 @@ namespace :newrelic do
       if spec[:default].is_a?(Proc)
         '(Dynamic)'
       else
-        "<code>#{spec[:default].inspect}</code>"
+        "#{spec[:default].inspect}"
       end
     end
 

data/lib/tasks/multiverse.rb

@@ -1,6 +1,6 @@
 # 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.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 #
 # Rake task for running Ruby agent multiverse tests. This file may be required
 # from third party gems. It is also used by the agent itself to run multiverse.
@@ -43,11 +43,45 @@ namespace :test do
 
   namespace :multiverse do
 
+    def remove_local_multiverse_databases
+      list_databases_command = %{echo "show databases" | mysql -u root}
+      databases = `#{list_databases_command}`.chomp!.split("\n").select{|s| s =~ /multiverse/}
+      databases.each do |database|
+        puts "Dropping #{database}"
+        `echo "drop database #{database}" | mysql -u root`
+      end
+    rescue => error
+      puts "ERROR: Cannot get MySQL databases..."
+      puts error.message
+    end
+
+    def remove_generated_gemfiles
+      file_path = File.expand_path "test/multiverse/suites"
+      Dir.glob(File.join file_path, "**", "Gemfile*").each do |fn|
+        puts "Removing #{fn.gsub(file_path,'.../suites')}"
+        FileUtils.rm fn
+      end
+    end
+
+    def remove_generated_gemfile_lockfiles
+      file_path = File.expand_path "test/environments"
+      Dir.glob(File.join file_path, "**", "Gemfile.lock").each do |fn|
+        puts "Removing #{fn.gsub(file_path,'.../environments')}"
+        FileUtils.rm fn
+      end
+    end
+
     task :env do
       # ENV['SUITES_DIRECTORY'] = File.expand_path('../../test/multiverse/suites', __FILE__)
       require File.expand_path('../../../test/multiverse/lib/multiverse', __FILE__)
     end
 
+    task :clobber do
+      remove_local_multiverse_databases
+      remove_generated_gemfiles
+      remove_generated_gemfile_lockfiles
+    end
+
     desc "Clean cached gemfiles from Bundler.bundle_path"
     task :clean_gemfile_cache do
       glob = File.expand_path 'multiverse-cache/Gemfile.*.lock', Bundler.bundle_path

data/lib/tasks/newrelic.rb

@@ -1,6 +1,6 @@
 # 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.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 #
 # If you are looking to instrument rake tasks in a Rails environment, but the
 # task doesn't depend on :environment, this task may be included to ensure that

data/lib/tasks/tests.rake

@@ -26,9 +26,14 @@ if defined? Rake::TestTask
     agent_home = File.expand_path(File.join(File.dirname(__FILE__),'..','..'))
 
     Rake::TestTask.new(:newrelic) do |t|
+      
+      file_pattern = ENV["file"]
+      file_pattern = file_pattern.split(",").map{|f| "#{agent_home}/#{f}".gsub("//", "/")} if file_pattern
+      file_pattern ||= "#{agent_home}/test/new_relic/**/*_test.rb"
+
       t.libs << "#{agent_home}/test"
       t.libs << "#{agent_home}/lib"
-      t.pattern = "#{agent_home}/test/new_relic/**/*_test.rb"
+      t.pattern = Array(file_pattern)
       t.verbose = true
     end
 

data/newrelic_rpm.gemspec

@@ -10,16 +10,16 @@ Gem::Specification.new do |s|
   s.version = NewRelic::VERSION::STRING
   s.required_ruby_version = '>= 2.0.0'
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.authors = [ "Matthew Wear", "Chris Pine", "Erin Dees", "Rachel Klein" ]
+  s.authors = [ "Aaron Huntsman", "Tanna McClure", "Michael Lang" ]
   s.date = Time.now.strftime('%Y-%m-%d')
-  s.licenses    = ['New Relic']
+  s.licenses    = ['Apache-2.0']
   s.description = <<-EOS
 New Relic is a performance management system, developed by New Relic,
 Inc (http://www.newrelic.com).  New Relic provides you with deep
 information about the performance of your web application as it runs
-in production. The New Relic Ruby Agent is dual-purposed as a either a
+in production. The New Relic Ruby agent is dual-purposed as a either a
 Gem or plugin, hosted on
-https://github.com/newrelic/rpm/
+https://github.com/newrelic/newrelic-ruby-agent/
 EOS
   s.email = "support@newrelic.com"
   s.executables = [ "mongrel_rpm", "newrelic_cmd", "newrelic", "nrdebug" ]
@@ -31,7 +31,15 @@ EOS
     "newrelic.yml"
   ]
 
-  file_list = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/(?!agent_helper.rb)}) }
+  s.metadata = {
+    'bug_tracker_uri'   => 'https://github.com/newrelic/newrelic-ruby-agent/issues',
+    'changelog_uri'     => 'https://github.com/newrelic/newrelic-ruby-agent/blob/main/CHANGELOG.md',
+    'documentation_uri' => 'https://docs.newrelic.com/docs/agents/ruby-agent',
+    'source_code_uri'   => 'https://github.com/newrelic/newrelic-ruby-agent',
+    "homepage_uri"      => "https://newrelic.com/ruby",
+  }
+
+  file_list = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|infinite_tracing|\.github)/(?!agent_helper.rb)}) }
   build_file_path = 'lib/new_relic/build.rb'
   file_list << build_file_path if File.exist?(build_file_path)
   s.files = file_list
@@ -41,19 +49,16 @@ EOS
   s.rubygems_version = Gem::VERSION
   s.summary = "New Relic Ruby Agent"
 
-  s.add_development_dependency 'rake', '10.1.0'
-  s.add_development_dependency 'minitest', '~> 4.7.5'
-  s.add_development_dependency 'mocha', '~> 0.13.0'
+  s.add_development_dependency 'rake', '12.3.3'
+  s.add_development_dependency 'rb-inotify', '0.9.10'   # locked to support < Ruby 2.3 (and listen 3.0.8)
+  s.add_development_dependency 'listen', '3.0.8'        # locked to support < Ruby 2.3
+  s.add_development_dependency 'minitest', '4.7.5'
+  s.add_development_dependency 'mocha', '~> 1.9.0'
   s.add_development_dependency 'yard'
-  s.add_development_dependency 'rails', '~> 3.2.13'
-  s.add_development_dependency 'json', '>= 2.0.2' if RUBY_VERSION >= '2.4.0' # possible bundler issue?
-  s.add_development_dependency 'pry-nav', '~> 0.2.4'
+  s.add_development_dependency 'pry-nav', '~> 0.3.0'
   s.add_development_dependency 'pry-stack_explorer', '~> 0.4.9'
+  s.add_development_dependency 'guard', '~> 2.16.0'
+  s.add_development_dependency 'guard-minitest', '~> 2.4.0'
   s.add_development_dependency 'hometown', '~> 0.2.5'
-
-  if RUBY_PLATFORM == 'java'
-    s.add_development_dependency 'activerecord-jdbcsqlite3-adapter'
-  else
-    s.add_development_dependency 'sqlite3'
-  end
+  s.add_development_dependency 'bundler'
 end