newrelic_rpm 3.5.8.72 → 3.6.0.74.beta

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

@@ -1,3 +1,7 @@
+# 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.
+
 module Multiverse
   module Runner
     extend self

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

@@ -1,4 +1,8 @@
 #!/usr/bin/env 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.
+
 require File.expand_path(File.join(File.dirname(__FILE__), 'environment'))
 module Multiverse
   class Suite

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

@@ -1,3 +1,7 @@
+# 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 'rubygems'
 

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

@@ -1,3 +1,7 @@
+# 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.
+
 # https://support.newrelic.com/tickets/2101
 # https://github.com/newrelic/rpm/pull/42
 # https://github.com/newrelic/rpm/pull/45

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

@@ -1,3 +1,7 @@
+# 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.
+
 # RUBY-981 Audit Log
 
 require 'newrelic_rpm'

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

@@ -1,3 +1,7 @@
+# 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 'fake_collector'
 require './testing_app'

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

@@ -1,3 +1,7 @@
+# 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.
+
 # https://newrelic.atlassian.net/browse/RUBY-765
 require 'fake_collector'
 

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

@@ -1,3 +1,7 @@
+# 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 KeyTransactionsTest < Test::Unit::TestCase
   class TestWidget
     include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation

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

@@ -1,3 +1,7 @@
+# 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.
+
 # RUBY-980 Improve logging
 # This test suite is for checking IMPORTANT conditions that we log rather than
 # trying to do this via brittle unit tests

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

@@ -1,3 +1,7 @@
+# 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.
+
 # https://newrelic.atlassian.net/wiki/display/eng/The+Terror+and+Glory+of+Transaction+Traces
 # https://newrelic.atlassian.net/browse/RUBY-914
 

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

@@ -1,3 +1,7 @@
+# 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 'multiverse/color'
 
 class MethodVisibilityTest < Test::Unit::TestCase

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

@@ -1,3 +1,7 @@
+# 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 NoDnsResolv < Test::Unit::TestCase
   def test_should_no_resolve_hostname_when_agent_is_disabled

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

@@ -1,3 +1,7 @@
+# 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.
+
 # https://newrelic.atlassian.net/browse/RUBY-669
 
 class PipeManagerTest < Test::Unit::TestCase

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

@@ -1,3 +1,7 @@
+# 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 RenameRuleTest < Test::Unit::TestCase
   class TestWidget
     include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation

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

@@ -1,3 +1,7 @@
+# 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 'new_relic/rack/browser_monitoring'
 require './testing_app'

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

@@ -1,3 +1,7 @@
+# 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 'socket'
 
 class ServiceTimeoutTest < Test::Unit::TestCase

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

@@ -1,3 +1,7 @@
+# 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 SSLTest < Test::Unit::TestCase
 
   def setup

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

@@ -1,3 +1,7 @@
+# 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.
+
 # RUBY-839 make sure there is no STDOUT chatter
 require 'open3'
 

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

@@ -1,3 +1,7 @@
+# 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 'test/unit'
 require 'newrelic_rpm'

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

@@ -1,3 +1,7 @@
+# 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 'test/unit'
 require 'newrelic_rpm'

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

@@ -1,3 +1,7 @@
+# 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 TestingApp
 
   attr_accessor :response, :headers

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

@@ -1,3 +1,7 @@
+# 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.
+
 # https://newrelic.atlassian.net/wiki/display/eng/Agent+Thread+Profiling
 # https://newrelic.atlassian.net/browse/RUBY-917
 

data/test/multiverse/suites/config_file_loading/config_file_loading_test.rb

@@ -1,3 +1,7 @@
+# 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.
+
 # Test the logic for loading the newrelic.yml config file.
 #
 # We will look at (in this priority):

data/test/multiverse/suites/datamapper/encoding_test.rb

@@ -1,3 +1,7 @@
+# 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.
+
 # https://support.newrelic.com/tickets/2101
 # https://github.com/newrelic/rpm/pull/42
 # https://github.com/newrelic/rpm/pull/45

data/test/multiverse/suites/rails/app.rb

@@ -1,3 +1,7 @@
+# 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 'action_controller/railtie'
 
 # We define our single Rails application here, one time, upon the first inclusion

data/test/multiverse/suites/rails/error_tracing_test.rb

@@ -1,3 +1,7 @@
+# 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.
+
 # https://newrelic.atlassian.net/browse/RUBY-747
 
 require 'rails/test_help'

data/test/multiverse/suites/rails/gc_instrumentation_test.rb

@@ -1,3 +1,7 @@
+# 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 './app'
 
 # GC instrumentation only works with REE or 1.9.x

data/test/multiverse/suites/rails/queue_time_test.rb

@@ -1,3 +1,7 @@
+# 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.
+
 # https://newrelic.atlassian.net/browse/RUBY-927
 
 require 'rails/test_help'

data/test/multiverse/suites/rails/view_instrumentation_test.rb

@@ -1,3 +1,7 @@
+# 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 './app'
 
 ActionController::Base.view_paths = ['app/views']

data/test/multiverse/suites/resque/instrumentation_test.rb

@@ -1,3 +1,7 @@
+# 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.
+
 # https://newrelic.atlassian.net/browse/RUBY-669
 
 require 'resque'
@@ -134,7 +138,7 @@ class ResqueTest < Test::Unit::TestCase
 
     run_worker(:env_vars => 'BROKEN_AFTER_FORK=true')
 
-    assert File.read(log_path).include?('Unable to send data to parent process')
+    assert File.read(log_path).include?('No communication channel to parent process')
   end
 
   if RUBY_VERSION >= '1.9'

data/test/multiverse/suites/resque/resque_setup.rb

@@ -1,3 +1,7 @@
+# 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 'resque'
 require 'newrelic_rpm'
 

data/test/multiverse/suites/sidekiq/Envfile

@@ -0,0 +1,21 @@
+suite_condition("SideKiq requires MRI 1.9.3 or JRuby 1.6 in 1.9 mode") do
+  RUBY_VERSION >= '1.9.3' || (RUBY_PLATFORM == 'java' && RUBY_VERSION >= '1.9')
+end
+
+gemfile <<-RB
+  gem 'json'
+  gem 'sidekiq'
+  gem 'rack'
+RB
+
+before_suite do
+  ENV["NEWRELIC_MULTIVERSE_REDIS_PORT"] = (20_000 + ($$ % 10_000)).to_s
+  ENV["NEWRELIC_MULTIVERSE_FAKE_COLLECTOR_PORT"] = (30_000 + ($$ % 10_000)).to_s
+  system("echo 'port #{ENV["NEWRELIC_MULTIVERSE_REDIS_PORT"]}' | redis-server - > /dev/null &")
+end
+
+after_suite do
+  system("redis-cli -p #{ENV["NEWRELIC_MULTIVERSE_REDIS_PORT"]} shutdown")
+end
+
+execute_mode 'spawn'

data/test/multiverse/suites/sidekiq/app.rb

@@ -0,0 +1,25 @@
+# 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 "newrelic_rpm"
+
+REDIS_PORT = ENV['NEWRELIC_MULTIVERSE_REDIS_PORT']
+REDIS_URL  = "redis://localhost:#{REDIS_PORT}/0"
+
+Sidekiq.configure_server do |config|
+  config.redis = { :url => REDIS_URL }
+end
+
+Sidekiq.configure_client do |config|
+  config.redis = { :url => REDIS_URL }
+end
+
+$redis = Redis.new(:port => REDIS_PORT)
+
+class TestWorker
+  include Sidekiq::Worker
+  def perform(key, val)
+    $redis.sadd(key, val)
+  end
+end

data/test/multiverse/suites/sidekiq/config/newrelic.yml

@@ -0,0 +1,22 @@
+---
+development:
+  error_collector:
+    capture_source: true
+    enabled: true
+  apdex_t: 0.5
+  ssl: false
+  monitor_mode: true
+  license_key: bootstrap_newrelic_admin_license_key_000
+  developer_mode: false
+  app_name: test
+  host: 127.0.0.1
+  api_host: 127.0.0.1
+  port: <%= ENV['NEWRELIC_MULTIVERSE_FAKE_COLLECTOR_PORT'] %>
+  transaction_tracer:
+    record_sql: obfuscated
+    enabled: true
+    stack_trace_threshold: 0.5
+    transaction_threshold: 1.0
+  capture_params: false
+  log_level: debug
+  log_file_path: log

data/test/multiverse/suites/sidekiq/sidekiq_instrumentation_test.rb

@@ -0,0 +1,137 @@
+# 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.
+
+# https://newrelic.atlassian.net/browse/RUBY-775
+
+require 'sidekiq'
+require 'test/unit'
+require 'newrelic_rpm'
+require 'fake_collector'
+
+class ResqueTest < Test::Unit::TestCase
+  JOB_COUNT = 5
+  COLLECTOR_PORT = ENV['NEWRELIC_MULTIVERSE_FAKE_COLLECTOR_PORT']
+
+  def setup
+    $collector ||= NewRelic::FakeCollector.new
+    $collector.reset
+    $collector.run(COLLECTOR_PORT)
+    @pidfile = "sidekiq.#{$$}.pid"
+    @sidekiq_log = "log/sidekiq.#{$$}.log"
+    JOB_COUNT.times do |i|
+      TestWorker.perform_async('jobs_completed', i + 1)
+    end
+  end
+
+  def teardown
+    $redis.flushall
+    File.unlink(@pidfile) if File.exist?(@pidfile)
+    File.unlink(@sidekiq_log) if File.exist?(@sidekiq_log)
+  end
+
+  def start_worker(opts={})
+    daemon_arg = opts[:daemonize] ? '-d' : ''
+    worker_cmd = "bundle exec sidekiq #{daemon_arg} -P #{@pidfile} -L #{@sidekiq_log} -r ./app.rb &"
+    system(worker_cmd)
+  end
+
+  def stop_worker
+    worker_pid = File.read(@pidfile).to_i
+    Process.kill("TERM", worker_pid)
+    begin
+      Timeout.timeout(5) { sleep(1) until !process_alive?(worker_pid) }
+    rescue Timeout::Error => e
+      raise e.exception("timed out waiting for sidekiq worker exit")
+    end
+  end
+
+  def process_alive?(pid)
+    Process.kill(0, pid)
+    return true
+  rescue Errno::ESRCH
+    return false
+  end
+
+  def wait_for_jobs
+    time_for_jobs = 5
+    begin
+      stats = Sidekiq::Stats.new
+      Timeout.timeout(time_for_jobs) { sleep(0.1) until stats.processed == JOB_COUNT }
+    rescue Timeout::Error => err
+      raise err.exception("waiting #{time_for_jobs}s for completion of #{JOB_COUNT} jobs")
+    end
+  end
+
+  def run_worker(opts={})
+    begin
+      start_worker(opts)
+      wait_for_jobs
+    ensure
+      stop_worker
+    end
+  end
+
+  # The point here is to supress Sidekiq log output for passing tests, but
+  # dump the log for failing tests.
+  def capture_sidekiq_log
+    File.unlink(@sidekiq_log) if File.exist?(@sidekiq_log)
+    @sidekiq_log = "log/sidekiq.#{$$}.log"
+    begin
+      yield
+    rescue Exception => e
+      if File.exist?(@sidekiq_log)
+        log_contents = File.read(@sidekiq_log)
+        $stderr.puts "Sidekiq log contents (#{@sidekiq_log}):"
+        $stderr.puts log_contents
+      end
+      raise e
+    end
+    File.unlink(@sidekiq_log) if File.exist?(@sidekiq_log)
+  end
+
+  METRIC_VALUES_POSITION = 3
+
+  def assert_metric_and_call_count(name, expected_call_count)
+    metric_data = $collector.calls_for('metric_data')
+    assert_equal(1, metric_data.size, "expected exactly one metric_data post from agent")
+
+    metric = metric_data.first[METRIC_VALUES_POSITION].find { |m| m[0]['name'] == name }
+    assert(metric, "could not find metric named #{name}")
+
+    call_count = metric[1][0]
+    assert_equal(expected_call_count, call_count)
+  end
+
+  def test_all_jobs_ran
+    capture_sidekiq_log do
+      run_worker
+      completed_jobs = Set.new($redis.smembers('jobs_completed').map(&:to_i))
+      expected_completed_jobs = Set.new((1..JOB_COUNT).to_a)
+      assert_equal(expected_completed_jobs, completed_jobs)
+    end
+  end
+
+  def test_agent_posts_correct_metric_data
+    capture_sidekiq_log do
+      run_worker
+      assert_metric_and_call_count('OtherTransaction/SidekiqJob/all', JOB_COUNT)
+    end
+  end
+
+  def test_all_jobs_ran_background
+    capture_sidekiq_log do
+      run_worker(:daemonize => true)
+      completed_jobs = Set.new($redis.smembers('jobs_completed').map(&:to_i))
+      expected_completed_jobs = Set.new((1..JOB_COUNT).to_a)
+      assert_equal(expected_completed_jobs, completed_jobs)
+    end
+  end
+
+  def test_agent_posts_correct_metric_data_background
+    capture_sidekiq_log do
+      run_worker(:daemonize => true)
+      assert_metric_and_call_count('OtherTransaction/SidekiqJob/all', JOB_COUNT)
+    end
+  end
+end