newrelic_rpm 3.9.6.257 → 3.9.7.266

data/test/multiverse/lib/multiverse/runner.rb

@@ -84,7 +84,7 @@ module Multiverse
     GROUPS = {
       "agent"         => ["agent_only", "bare", "config_file_loading",
                           "deferred_instrumentation", "high_security"],
-      "background"    => ["resque", "sidekiq"],
+      "background"    => ["delayed_job", "resque", "sidekiq"],
       "database"      => ["datamapper", "mongo", "sequel"],
       "httpclients"   => ["curb", "excon", "httpclient", "typhoeus", "net_http"],
       "rails"         => ["active_record", "rails"],

data/test/multiverse/lib/multiverse/suite.rb

@@ -227,6 +227,7 @@ module Multiverse
 
     def execute_child_environment(env_index)
       with_clean_env do
+        ENV["MULTIVERSE_ENV"] = env_index.to_s
         log_test_running_process
         configure_before_bundling
 

data/test/multiverse/suites/active_record/Envfile

@@ -1,13 +1,47 @@
-gemfile <<-RB
+boilerplate_gems = <<-SQLITE
   gem 'rack'
-  if RUBY_VERSION == '1.8.6'
-    gem 'activerecord', '2.3.14'
-  elsif RUBY_PLATFORM == 'java'
-    gem 'activerecord-jdbcsqlite3-adapter', '1.2.2.1'
-    gem 'jdbc-sqlite3', '3.7.2'
-    gem 'activerecord', '~> 3.2.0'
+  if RUBY_PLATFORM == 'java'
+    gem 'activerecord-jdbcsqlite3-adapter'
   else
-    gem 'activerecord', '~> 3.2.0'
     gem 'sqlite3'
   end
+SQLITE
+
+if RUBY_VERSION >= '1.9.3'
+  # JRuby currently having problem with Rails 4.2 beta. Remove condition on GA.
+  if !defined?(RUBY_ENGINE) || RUBY_ENGINE != 'jruby'
+  gemfile <<-RB
+    gem 'activerecord', '~> 4.2.0.beta2'
+    gem 'minitest', '~> 5.2.3'
+    #{boilerplate_gems}
+  RB
+  end
+
+  gemfile <<-RB
+    gem 'activerecord', '~> 4.1.6'
+    gem 'minitest', '~> 5.2.3'
+    #{boilerplate_gems}
+  RB
+end
+
+gemfile <<-RB
+  gem 'activerecord', '~> 3.2.19'
+  #{boilerplate_gems}
+RB
+
+gemfile <<-RB
+  gem 'activerecord', '~> 3.1.12'
+  #{boilerplate_gems}
+RB
+
+gemfile <<-RB
+  gem 'activerecord', '~> 3.0.20'
+  #{boilerplate_gems}
+RB
+
+if RUBY_VERSION <= '1.9.3'
+gemfile <<-RB
+  gem 'activerecord', '~> 2.3.18'
+  #{boilerplate_gems}
 RB
+end

data/test/multiverse/suites/active_record/ar_method_aliasing.rb

@@ -5,6 +5,8 @@
 require 'rubygems'
 
 require 'active_record'
+require 'active_support/multibyte'
+
 require 'newrelic_rpm'
 require 'multiverse/color'
 require 'multiverse_helpers'
@@ -33,7 +35,9 @@ class InstrumentActiveRecordMethods < Minitest::Test
   end
 
   def after_setup
-    @db_connection = ActiveRecord::Base.establish_connection( :adapter => 'sqlite3', :database => 'testdb.sqlite3')
+    database_name = "testdb.#{ENV["MULTIVERSE_ENV"]}.sqlite3"
+    @db_connection = ActiveRecord::Base.establish_connection(:adapter => 'sqlite3',
+                                                             :database => database_name)
     ActiveRecord::Migration.class_eval do
       @connection = @db_connection
       create_table :users do |t|
@@ -60,7 +64,7 @@ class InstrumentActiveRecordMethods < Minitest::Test
     assert a_user.new_record?
     a_user.save!
     assert User.connected?
-    assert a_user.persisted?
+    assert a_user.persisted? if a_user.respond_to?(:persisted?)
     assert a_user.id == 1
   end
 
@@ -74,8 +78,8 @@ class InstrumentActiveRecordMethods < Minitest::Test
     an_alias = Alias.new :user_id => a_user.id, :aka => "the Blob"
     assert an_alias.new_record?
     an_alias.save!
-    assert an_alias.persisted?
+    assert an_alias.persisted? if a_user.respond_to?(:persisted?)
     an_alias.destroy
-    assert an_alias.destroyed?
+    assert an_alias.destroyed? if a_user.respond_to?(:destroyed?)
   end
 end

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

@@ -48,8 +48,6 @@ class AuditLogTest < Minitest::Test
   end
 
   def perform_actions
-    reset_collector
-
     state = NewRelic::Agent::TransactionState.tl_get
     NewRelic::Agent.instance.sql_sampler.on_start_transaction(state, nil)
     NewRelic::Agent.instance.sql_sampler.notice_sql("select * from test",

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

@@ -2,8 +2,7 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
-# RUBY-839 make sure there is no STDOUT chatter
-require 'open3'
+require 'multiverse_helpers'
 
 class CollectorExceptionHandlingTest < Minitest::Test
   include MultiverseHelpers

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

@@ -42,18 +42,18 @@ class CrossApplicationTracingTest < Minitest::Test
   end
 
   def test_cross_app_doesnt_modify_with_invalid_header
-    get '/', nil, {'X-NewRelic-ID' => Base64.encode64('otherjunk')}
+    get '/', nil, {'HTTP_X_NEWRELIC_ID' => Base64.encode64('otherjunk')}
     assert_nil last_response.headers["X-NewRelic-App-Data"]
   end
 
   def test_cross_app_writes_out_information
-    get '/', nil, {'X-NewRelic-ID' => Base64.encode64('1#234')}
+    get '/', nil, {'HTTP_X_NEWRELIC_ID' => Base64.encode64('1#234')}
     refute_nil last_response.headers["X-NewRelic-App-Data"]
     assert_metrics_recorded(['ClientApplication/1#234/all'])
   end
 
   def test_cross_app_doesnt_modify_if_txn_is_ignored
-    get '/', {'transaction_name' => 'ignored_transaction'}, {'X-NewRelic-ID' => Base64.encode64('1#234')}
+    get '/', {'transaction_name' => 'ignored_transaction'}, {'HTTP_X_NEWRELIC_ID' => Base64.encode64('1#234')}
     assert_nil last_response.headers["X-NewRelic-App-Data"]
   end
 
@@ -62,8 +62,8 @@ class CrossApplicationTracingTest < Minitest::Test
     if !test_case["outboundRequests"]
       if test_case['inboundPayload']
         request_headers = {
-          'X-NewRelic-ID'          => Base64.encode64('1#234'),
-          'X-NewRelic-Transaction' => json_dump_and_encode(test_case['inboundPayload'])
+          'HTTP_X_NEWRELIC_ID'          => Base64.encode64('1#234'),
+          'HTTP_X_NEWRELIC_TRANSACTION' => json_dump_and_encode(test_case['inboundPayload'])
         }
       else
         request_headers = {}

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

@@ -2,6 +2,8 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
+require 'multiverse_helpers'
+
 if RUBY_VERSION >= '1.9'
 
 class EncodingHandlingTest < Minitest::Test

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

@@ -14,6 +14,8 @@ class HarvestTimestampsTest < Minitest::Test
     freeze_time
 
     t1 = advance_time 10
+
+    simulate_fork
     NewRelic::Agent.after_fork
 
     t2 = advance_time 10
@@ -29,6 +31,7 @@ class HarvestTimestampsTest < Minitest::Test
   def test_start_timestamp_maintained_on_harvest_failure
     t0 = freeze_time.to_f
 
+    simulate_fork
     NewRelic::Agent.after_fork
 
     $collector.stub('metric_data', {}, 503)
@@ -48,6 +51,7 @@ class HarvestTimestampsTest < Minitest::Test
   def test_timestamps_updated_even_if_filling_metric_id_cache_fails
     t0 = freeze_time.to_f
 
+    simulate_fork
     NewRelic::Agent.after_fork
 
     # Induce a failure in filling the metric ID cache by handing back a bogus
@@ -73,4 +77,8 @@ class HarvestTimestampsTest < Minitest::Test
   def last_metric_data_post
     $collector.calls_for('metric_data').last
   end
+
+  def simulate_fork
+    NewRelic::Agent.instance.harvester.instance_variable_set(:@starting_pid, nil)
+  end
 end

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

@@ -0,0 +1,139 @@
+# 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 'rack/test'
+require 'multiverse_helpers'
+require 'new_relic/rack/agent_hooks'
+require './testing_app'
+
+class SyntheticsTest < Minitest::Test
+  @app = TestingApp.new
+  @wrapper_app = NewRelic::Rack::AgentHooks.new(@app)
+
+  def self.wrapper_app
+    @wrapper_app
+  end
+
+  include MultiverseHelpers
+  include Rack::Test::Methods
+
+  setup_and_teardown_agent
+
+  def app
+    self.class.wrapper_app
+  end
+
+  def last_sent_analytics_event
+    calls = $collector.calls_for(:analytic_event_data)
+    assert_equal(1, calls.size)
+    events = calls.first.events
+    assert_equal(1, events.size)
+    events.first
+  end
+
+  def last_sent_transaction_trace
+    calls = $collector.calls_for(:transaction_sample_data)
+    assert_equal(1, calls.size)
+    traces = calls.first.samples
+    assert_equal(1, traces.size)
+    traces.first
+  end
+
+  def generate_synthetics_header(test)
+    synthetics_key     = test['settings']['syntheticsEncodingKey']
+    synthetics_payload = test['inputHeaderPayload']
+
+    return nil if synthetics_payload.empty?
+
+    encoded_synthetics_payload   = ::NewRelic::JSONWrapper.dump(synthetics_payload)
+    obfuscated_synthetics_header = ::NewRelic::Agent::Obfuscator.new(synthetics_key).obfuscate(encoded_synthetics_payload)
+
+    assert_equal(test['inputObfuscatedHeader']['X-NewRelic-Synthetics'], obfuscated_synthetics_header)
+    obfuscated_synthetics_header
+  end
+
+  def request_headers_for_test(test)
+    header_value = generate_synthetics_header(test)
+    if header_value
+      { 'HTTP_X_NEWRELIC_SYNTHETICS' => header_value }
+    else
+      {}
+    end
+  end
+
+  def request_params_for_test(test)
+    if test['settings']
+      { 'guid' => test['settings']['transactionGuid'] }
+    else
+      {}
+    end
+  end
+
+  def validate_transaction_event(event, test)
+    event_spec               = test['outputTransactionEvent']
+    expected_event_attrs     = event_spec['expectedAttributes']
+    non_expected_event_attrs = event_spec['nonExpectedAttributes']
+
+    expected_event_attrs.each do |key, value|
+      msg = "Incorrect value for analytic event key '#{key}'. Full event = #{event.inspect}"
+      assert_equal(value, event[0][key], msg) unless key == 'nr.guid' && event[0][key] == nil
+    end
+
+    non_expected_event_attrs.each do |key|
+      msg = "Did not expect key '#{key}' on analytics event. Actual value was #{event[0][key]}"
+      refute_includes(event[0].keys, key, msg)
+    end
+  end
+
+  def validate_transaction_trace(trace, test)
+    trace_spec           = test['outputTransactionTrace']
+    expected_resource_id = trace_spec['header']['field_9']
+    expected_attrs       = trace_spec['expectedIntrinsics']
+    non_expected_attrs   = trace_spec['nonExpectedIntrinsics']
+
+    trace_attrs          = trace.tree.custom_params
+
+    assert_equal(expected_resource_id, trace.synthetics_resource_id)
+
+    expected_attrs.each do |key, value|
+      key = "nr.#{key}"
+      msg = "Incorrect value for transaction trace intrinsic '#{key}'. All intrinsics = #{trace_attrs.inspect}"
+      assert_equal(value, trace_attrs[key], msg)
+    end
+
+    non_expected_attrs.each do |key|
+      key = "nr.#{key}"
+      msg = "Did not expect key '#{key}' on transaction trace. Actual value was #{trace_attrs[key]}"
+      refute_includes(trace_attrs.keys, key, msg)
+    end
+  end
+
+  # These tests do *not* cover passing on the correct synthetics header to
+  # outgoing HTTP requests, since testing that requires our various HTTP client
+  # libraries to be present. That aspect is tested in http_client_test_cases.rb
+  load_cross_agent_test('synthetics/synthetics').each do |test|
+    define_method("test_synthetics_#{test['name']}") do
+      config = {
+        :encoding_key        => test['settings']['agentEncodingKey'],
+        :trusted_account_ids => test['settings']['trustedAccountIds'],
+        :'transaction_tracer.transaction_threshold' => 0.0
+      }
+
+      with_config(config) do
+        NewRelic::Agent.instance.events.notify(:finished_configuring)
+
+        get '/', request_params_for_test(test), request_headers_for_test(test)
+
+        NewRelic::Agent.agent.send(:transmit_data)
+        NewRelic::Agent.agent.send(:harvest_and_send_analytic_event_data)
+
+        event = last_sent_analytics_event
+        validate_transaction_event(event, test)
+
+        trace = last_sent_transaction_trace
+        validate_transaction_trace(trace, test)
+      end
+    end
+  end
+end

data/test/multiverse/suites/delayed_job/Envfile

@@ -0,0 +1,79 @@
+suite_condition("Rails 2.2.0-preview1 and Rubinius problems prevent these from running") do
+  # https://github.com/rails/rails/issues/17017
+  RUBY_VERSION != '2.2.0' && (!defined?(RUBY_ENGINE) || RUBY_ENGINE != "rbx")
+end
+
+boilerplate_gems = <<-SQLITE
+  gem 'rack'
+  if RUBY_PLATFORM == 'java'
+    gem 'activerecord-jdbcsqlite3-adapter'
+  else
+    gem 'sqlite3'
+  end
+SQLITE
+
+# delayed_job_mongoid is currently unsupported, but check that we behave
+# mongoid 3.x is only supported on Ruby 1.9.3, though
+if RUBY_VERSION >= '1.9.3'
+  gemfile <<-RB
+    gem 'delayed_job', '~> 4.0.4'
+    gem 'delayed_job_mongoid', '~> 2.1.0'
+    #{boilerplate_gems}
+  RB
+end
+
+# delayed_job_active_record (and older baked into delayed_job) support
+dj4_with_active_record = <<-DJ
+  gem 'delayed_job', '~> 4.0.4'
+  gem 'delayed_job_active_record', '~> 4.0.2'
+  #{boilerplate_gems}
+DJ
+
+dj3_with_active_record = <<-DJ
+  gem 'delayed_job', '~> 3.0.5'
+  gem 'delayed_job_active_record', '~> 0.4.4'
+  #{boilerplate_gems}
+DJ
+
+dj2_with_active_record3 = <<-DJ
+  gem 'delayed_job', '~> 2.1.4'
+  #{boilerplate_gems}
+DJ
+
+if RUBY_VERSION >= '1.9.3'
+  gemfile <<-RB
+    gem 'activerecord', '~> 4.1.6'
+    #{dj4_with_active_record}
+    gem 'minitest', '~> 5.2.3'
+  RB
+
+  gemfile <<-RB
+    gem 'activerecord', '~>4.0.10'
+    #{dj4_with_active_record}
+  RB
+end
+
+[dj4_with_active_record, dj3_with_active_record, dj2_with_active_record3].each do |dj|
+  gemfile <<-RB
+    gem 'activerecord', '~> 3.2.19'
+    #{dj}
+  RB
+
+  gemfile <<-RB
+    gem 'activerecord', '~> 3.1.12'
+    #{dj}
+  RB
+
+  gemfile <<-RB
+    gem 'activerecord', '~> 3.0.20'
+    #{dj}
+  RB
+end
+
+if RUBY_VERSION <= '1.9.3'
+gemfile <<-RB
+  gem 'activerecord', '~> 2.3.18'
+  gem 'delayed_job', '~> 2.0.8'
+  #{boilerplate_gems}
+RB
+end

data/test/multiverse/suites/delayed_job/before_suite.rb

@@ -0,0 +1,33 @@
+# 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 'delayed_job'
+begin
+  require 'active_record'
+rescue LoadError
+  # Let it fail, might be working with another library
+end
+
+# Deprecated on some versions, required on others. Hurray!
+Delayed::Worker.guess_backend
+
+if Delayed::Worker.backend.to_s == "Delayed::Backend::ActiveRecord::Job"
+  $db_connection = ActiveRecord::Base.establish_connection(:adapter  => "sqlite3",
+                                                           :database => ":memory:")
+
+  begin
+    require 'generators/delayed_job/templates/migration'
+  rescue MissingSourceFile
+    # Back on DJ v2 the generators aren't in the lib folder so we have to do some
+    # sneaky stuff to get them loaded. Still better than dup'ing them, though.
+    dj_dir = ($:).grep(/delayed_job-/).first
+    require "#{dj_dir}/../generators/delayed_job/templates/migration"
+  end
+
+  class CreateDelayedJobs
+    @connection = $db_connection
+  end
+
+  CreateDelayedJobs.up
+end