newrelic_rpm 3.14.1.311 → 3.14.2.312

data/lib/new_relic/agent/transaction_event_recorder.rb

@@ -0,0 +1,48 @@
+# 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.
+require 'new_relic/agent/transaction_event_aggregator'
+require 'new_relic/agent/synthetics_event_aggregator'
+require 'new_relic/agent/transaction_event_primitive'
+
+module NewRelic
+  module Agent
+    # This is responsibile for recording transaction events and managing
+    # the relationship between events generated from synthetics requests
+    # vs normal requests.
+    class TransactionEventRecorder
+      attr_reader :transaction_event_aggregator
+      attr_reader :synthetics_event_aggregator
+
+      def initialize
+        @transaction_event_aggregator = NewRelic::Agent::TransactionEventAggregator.new
+        @synthetics_event_aggregator = NewRelic::Agent::SyntheticsEventAggregator.new
+      end
+
+      def record payload
+        return unless NewRelic::Agent.config[:'analytics_events.enabled']
+
+        if synthetics_event? payload
+          event = create_event payload
+          _, rejected = synthetics_event_aggregator.append_or_reject event
+          transaction_event_aggregator.append event if rejected
+        else
+          transaction_event_aggregator.append { create_event(payload) }
+        end
+      end
+
+      def create_event payload
+        TransactionEventPrimitive.create payload
+      end
+
+      def synthetics_event? payload
+        payload.key? :synthetics_resource_id
+      end
+
+      def drop_buffered_data
+        transaction_event_aggregator.reset!
+        synthetics_event_aggregator.reset!
+      end
+    end
+  end
+end

data/lib/new_relic/agent/transaction_metrics.rb

@@ -17,7 +17,15 @@ module NewRelic
         @scoped   = Hash.new(&DEFAULT_PROC)
       end
 
-      def record_scoped(names, value=nil, aux=nil, &blk)
+      # As a general rule, when recording a scoped metric, the corresponding
+      # unscoped metric should always be recorded as well.
+      #
+      # As an optimization, scoped metrics are representated within this class
+      # only by their entries in the @scoped Hash, and it's up to clients to
+      # propagate them into unscoped metrics as well when instances of this
+      # class are merged into the global metric store.
+      #
+      def record_scoped_and_unscoped(names, value=nil, aux=nil, &blk)
         _record_metrics(names, value, aux, @scoped, &blk)
       end
 

data/lib/new_relic/agent/transction_event_recorder.rb

@@ -0,0 +1,35 @@
+# 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.
+require 'new_relic/agent/transaction_event_aggregator'
+require 'new_relic/agent/synthetics_event_aggregator'
+
+module NewRelic
+  module Agent
+    # This is responsibile for recording transaction events and managing
+    # the relationship between events generated from synthetics requests
+    # vs normal requests.
+    class TransactionEventRecorder
+      attr_reader :transaction_event_aggregator
+      attr_reader :synthetics_event_aggregator
+
+      def initialize
+        @transaction_event_aggregator = NewRelic::Agent::TransactionEventAggregator.new
+        @synthetics_event_aggregator = NewRelic::Agent::SyntheticsEventAggregator.new
+      end
+
+      def record payload
+        return unless NewRelic::Agent.config[:'analytics_events.enabled']
+
+        event = TransactionEvent.new payload
+
+        if event.synthetics?
+          _, rejected = synthetics_event_aggregator.append_or_reject event.to_collector_array
+          transaction_event_aggregator.record event if rejected
+        else
+          transaction_event_aggregator.record event.to_collector_array
+        end
+      end
+    end
+  end
+end

data/lib/new_relic/recipes/capistrano3.rb

@@ -10,7 +10,7 @@ namespace :newrelic do
   desc "Record a deployment in New Relic (newrelic.com)"
   task :notice_deployment do
     run_locally do
-      environment = fetch(:newrelic_rails_env, fetch(:rack_env, fetch(:rails_env, "production")))
+      environment = fetch(:newrelic_rails_env, fetch(:rack_env, fetch(:rails_env, fetch(:stage, "production"))))
 
       require 'new_relic/cli/command.rb'
 

data/lib/new_relic/version.rb

@@ -12,7 +12,7 @@ module NewRelic
 
     MAJOR = 3
     MINOR = 14
-    TINY  = 1
+    TINY  = 2
 
     begin
       require File.join(File.dirname(__FILE__), 'build')

data/lib/tasks/versions.html.erb

@@ -1,27 +1,29 @@
 <h2 id="<%= anchor %>"><%= title %></h2>
 <table>
   <thead>
-    <th>Name</th>
-    <th>Supported</th>
-    <th>Deprecated</th>
-    <th>Experimental</th>
+    <tr>
+      <th>Name</th>
+      <th>Supported</th>
+      <th>Deprecated</th>
+      <th>Experimental</th>
+    </tr>
   </thead>
+  <tbody>
   <% for version in versions %>
     <tr>
       <td><b><%= version.name %></b></td>
-      <td><%= version_list(version.supported) %></td>
-      <td><%= version_list(version.deprecated) %></td>
-      <td><%= version_list(version.experimental) %></td>
+      <td><%= CGI.escapeHTML(version_list(version.supported)) %></td>
+      <td><%= CGI.escapeHTML(version_list(version.deprecated)) %></td>
+      <td><%= CGI.escapeHTML(version_list(version.experimental)) %></td>
     </tr>
     <% if version.notes %>
     <tr>
       <td></td>
-      <td colspan=3>
-        <% for note in version.notes %>
-          <%= note %><br/>
-        <% end %>
+      <td colspan="3">
+        <%= version.notes.join("<br />") %>
       </td>
     </tr>
     <% end %>
   <% end %>
+  </tbody>
 </table>

data/lib/tasks/versions.postface.html

@@ -0,0 +1,8 @@
+<h2 id="more_help">For more help</h2>
+
+<p>Additional documentation resources include:
+  <ul>
+    <li><a href="/docs/agents/ruby-agent/getting-started/new-relic-ruby">New Relic for Ruby</a> (compatibility and requirements, general information about installation, configuration, troubleshooting, and known issues)</li>
+    <li><a href="/docs/agents/ruby-agent/installation-and-configuration/ruby-agent-installation">Ruby agent installation</a> (using the New Relic Ruby gem and configuration file)</li>
+  </ul>
+</p>

data/lib/tasks/versions.preface.html

@@ -0,0 +1,3 @@
+<p>This document lists the official supported versions and frameworks for New Relic's Ruby Agent.</p>
+
+<h2 id="qiklinks">Contents</h2>

data/lib/tasks/versions.rake

@@ -4,6 +4,7 @@ namespace :newrelic do
   require File.join(File.dirname(__FILE__), '..', 'new_relic', 'agent', 'supported_versions')
 
   task :supported_versions, [:format] => [] do |t, args|
+    require 'cgi'
 
     def version_list(list)
       return "-" if list.nil? || list.empty?
@@ -37,17 +38,26 @@ namespace :newrelic do
       puts erb.result(binding).gsub(/^ *$/, '')
     end
 
+    def include_if_exists(filename)
+      path = File.join(File.dirname(__FILE__), filename)
+      puts File.read(path) if File.exists?(path)
+    end
+
     VersionStruct = Struct.new(:name, :supported, :deprecated, :experimental, :notes)
 
     format = args[:format] || "txt"
     erb = build_erb(format)
 
-    write_versions("Ruby Versions",   :ruby, erb)
-    write_versions("Web Servers",     :app_server, erb)
-    write_versions("Web Frameworks",  :web, erb)
+    include_if_exists("versions.preface.#{format}")
+
+    write_versions("Ruby versions",   :ruby, erb)
+    write_versions("Web servers",     :app_server, erb)
+    write_versions("Web frameworks",  :web, erb)
     write_versions("Database",        :database, erb)
-    write_versions("Background Jobs", :background, erb)
-    write_versions("HTTP Clients",    :http, erb)
+    write_versions("Background jobs", :background, erb)
+    write_versions("HTTP clients",    :http, erb)
     write_versions("Other",           :other, erb)
+
+    include_if_exists("versions.postface.#{format}")
   end
 end

data/test/agent_helper.rb

@@ -604,7 +604,7 @@ def json_dump_and_encode(object)
 end
 
 def get_last_analytics_event
-  NewRelic::Agent.agent.instance_variable_get(:@transaction_event_aggregator).samples.last
+  NewRelic::Agent.agent.transaction_event_aggregator.harvest![1].last
 end
 
 def swap_instance_method(target, method_name, new_method_implementation, &blk)

data/test/environments/rails31/Gemfile

@@ -22,3 +22,5 @@ end
 
 gem 'pry', '~> 0.9.12'
 gem 'hometown', '~> 0.2.5'
+
+gem 'rack-cache', '< 1.3' if RUBY_VERSION < '1.9.3' # rack-cache 1.3.0 only supports >= 1.9.3

data/test/environments/rails32/Gemfile

@@ -24,3 +24,5 @@ end
 
 gem 'pry', '~> 0.9.12'
 gem 'hometown', '~> 0.2.5'
+
+gem 'rack-cache', '< 1.3' if RUBY_VERSION < '1.9.3' # rack-cache 1.3.0 only supports >= 1.9.3

data/test/environments/rails32/Rakefile

@@ -8,4 +8,5 @@ RpmTestApp::Application.load_tasks
 require 'tasks/all'
 
 Rake::Task["default"].clear
-task :default => [:'test:newrelic']
+task :default => [:'test:newrelic_with_db']
+task :'test:newrelic_with_db' => [:'db:create', :'test:newrelic']

data/test/environments/rails32/config/database.yml

@@ -1,4 +1,3 @@
-# Shared properties for mysql db
 mysql: &mysql
   adapter: mysql
   socket: <%= (`uname -s` =~ /Linux/ ) ? "" :"/tmp/mysql.sock" %>
@@ -6,8 +5,6 @@ mysql: &mysql
   host: localhost
   database: <%= db = "#{ENV['RUBY_VERSION']}#{ENV['BRANCH']}"; db.empty? ? "rails_blog" : db %>
 
-# Shared properties for postgres.  This won't work with our schema but
-# Does work with agent tests
 sqlite3: &sqlite3
 <% if defined?(JRuby) %>
   adapter: jdbcsqlite3
@@ -18,9 +15,7 @@ sqlite3: &sqlite3
   pool: 5
   timeout: 5000
   host: localhost
-  
-# SQLite version 3.x
-#   gem install sqlite3-ruby (not necessary on OS X Leopard)
+
 development:
   <<: *sqlite3
 

data/test/multiverse/suites/active_record/Envfile

@@ -6,6 +6,7 @@ boilerplate_gems = <<-BOILERPLATE
   else
     gem 'mysql'
   end
+  gem 'i18n', '< 0.7.0' if RUBY_VERSION < '1.9.3' # i18n >= 0.7.0 only works on Ruby 1.9.3 and newer
 BOILERPLATE
 
 if RUBY_VERSION >= '1.9.3'

data/test/multiverse/suites/agent_only/agent_attributes_test.rb

@@ -32,6 +32,18 @@ class AgentAttributesTest < Minitest::Test
     refute_browser_monitoring_has_agent_attribute("response.headers.contentType")
   end
 
+  def test_response_content_length_default_destinations
+    run_transaction do |txn|
+      txn.response_content_length = 100
+    end
+
+    assert_transaction_trace_has_agent_attribute("response.headers.contentLength", 100)
+    assert_event_has_agent_attribute("response.headers.contentLength", 100)
+    assert_error_has_agent_attribute("response.headers.contentLength", 100)
+
+    refute_browser_monitoring_has_agent_attribute("response.headers.contentLength")
+  end
+
   def test_request_headers_referer_default_destinations
     txn_options = {:request => stub(:referer => "referrer", :path => "/")}
     run_transaction({}, txn_options) do |txn|
@@ -73,6 +85,7 @@ class AgentAttributesTest < Minitest::Test
       :referer => "http://docs.newrelic.com",
       :env => {"HTTP_ACCEPT" => "application/json"},
       :content_length => 103,
+      :content_type => "application/json",
       :host => 'chippy',
       :user_agent => 'Use This!',
       :request_method => "GET"
@@ -96,6 +109,11 @@ class AgentAttributesTest < Minitest::Test
     assert_error_has_agent_attribute "request.headers.contentLength", 103
     refute_browser_monitoring_has_agent_attribute "request.headers.contentLength"
 
+    assert_transaction_trace_has_agent_attribute "request.headers.contentType", "application/json"
+    assert_event_has_agent_attribute "request.headers.contentType", "application/json"
+    assert_error_has_agent_attribute "request.headers.contentType", "application/json"
+    refute_browser_monitoring_has_agent_attribute "request.headers.contentType"
+
     assert_transaction_trace_has_agent_attribute "request.headers.host", "chippy"
     assert_event_has_agent_attribute "request.headers.host", "chippy"
     assert_error_has_agent_attribute "request.headers.host", "chippy"

data/test/multiverse/suites/agent_only/custom_analytics_events_test.rb

@@ -12,7 +12,7 @@ class CustomAnalyticsEventsTest < Minitest::Test
     NewRelic::Agent.record_custom_event(:DummyType, :foo => :bar, :baz => :qux)
 
     NewRelic::Agent.agent.send(:harvest_and_send_analytic_event_data)
-    events = last_custom_event_submission
+    events = last_posted_events
 
     expected_event = [{'type' => 'DummyType', 'timestamp' => t0.to_i },
                       {'foo' => 'bar', 'baz' => 'qux'}]
@@ -37,7 +37,7 @@ class CustomAnalyticsEventsTest < Minitest::Test
     NewRelic::Agent.record_custom_event(good_event_type, :foo => :bar)
 
     NewRelic::Agent.agent.send(:harvest_and_send_analytic_event_data)
-    events = last_custom_event_submission
+    events = last_posted_events
 
     assert_equal(1, events.size)
     assert_equal(good_event_type, events.first[0]['type'])
@@ -59,9 +59,24 @@ class CustomAnalyticsEventsTest < Minitest::Test
     assert_equal(0, $collector.calls_for(:custom_event_data).size)
   end
 
-  def last_custom_event_submission
-    submissions = $collector.calls_for('custom_event_data')
-    assert_equal(1, submissions.size)
-    submissions.first.events
+  def test_post_includes_metadata
+    10.times do |i|
+      NewRelic::Agent.record_custom_event(:DummyType, :foo => :bar, :baz => :qux, :i => i)
+    end
+
+    NewRelic::Agent.agent.send(:harvest_and_send_analytic_event_data)
+    post = last_custom_event_post
+
+    assert_equal({"reservoir_size"=>1000, "events_seen"=>10}, post.reservoir_metadata)
+  end
+
+  def last_custom_event_post
+    posts = $collector.calls_for('custom_event_data')
+    assert_equal(1, posts.size)
+    posts.first
+  end
+
+  def last_posted_events
+    last_custom_event_post.events
   end
 end

data/test/multiverse/suites/agent_only/error_events_test.rb

@@ -52,18 +52,26 @@ class ErrorEventsTest < Minitest::Test
   end
 
   def test_does_not_record_error_events_when_disabled_by_feature_gate
-    connect_response = {
+
+    $collector.stub('connect', {
       'agent_run_id'          => 1,
       'collect_error_events' => false
-    }
-
-    $collector.stub('connect', connect_response)
+    })
     trigger_agent_reconnect
 
     generate_errors 5
 
     NewRelic::Agent.agent.send(:harvest_and_send_error_event_data)
     assert_equal(0, $collector.calls_for(:error_event_data).size)
+
+    # reset the collect_error_events flag so that the ErrorEventAggregator
+    # will be enabled for the next test
+    $collector.stub('connect', {
+      'agent_run_id'          => 1,
+      'collect_error_events' => true
+    })
+
+    trigger_agent_reconnect
   end
 
   def test_error_events_created_outside_of_transaction
@@ -86,8 +94,8 @@ class ErrorEventsTest < Minitest::Test
 
   def last_error_event
     post = last_error_event_post
-    assert_equal(1, post.error_events.size)
-    post.error_events.last
+    assert_equal(1, post.events.size)
+    post.events.last
   end
 
   def last_error_event_post

data/test/multiverse/suites/agent_only/transaction_events_test.rb

@@ -0,0 +1,31 @@
+# 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.
+
+class TransactionEventsTest < Minitest::Test
+  include MultiverseHelpers
+
+  setup_and_teardown_agent
+
+  def test_transaction_event_error_flag_is_set
+    in_transaction :transaction_name => "Controller/blogs/index" do |t|
+      t.notice_error RuntimeError.new "Big Controller"
+    end
+
+    NewRelic::Agent.agent.send(:harvest_and_send_analytic_event_data)
+
+    intrinsics, _, _ = last_transaction_event
+
+    assert intrinsics["error"], "Expected the error flag to be true"
+  end
+
+  def last_transaction_event
+    post = last_transaction_event_post
+    assert_equal(1, post.events.size)
+    post.events.last
+  end
+
+  def last_transaction_event_post
+    $collector.calls_for(:analytic_event_data).first
+  end
+end

data/test/multiverse/suites/agent_only/utilization_data_collection_test.rb

@@ -54,6 +54,8 @@ class UtilizationDataCollectionTest < Minitest::Test
     NewRelic::Agent::Hostname.stubs(:get).returns("host")
     NewRelic::Agent::SystemInfo.stubs(:num_logical_processors).returns(5)
     NewRelic::Agent::SystemInfo.stubs(:ram_in_mib).returns(128)
+    NewRelic::Agent::SystemInfo.stubs(:docker_container_id).returns(nil)
+    NewRelic::Agent::AWSInfo.any_instance.stubs(:loaded?).returns(false)
 
     # this will trigger the agent to connect and send utilization data
     setup_agent