newrelic_rpm 3.10.0.279 → 3.11.0.283

data/test/multiverse/suites/deferred_instrumentation/sinatra_test.rb

@@ -3,7 +3,6 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'sinatra', 'sinatra_test_cases'))
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'agent_helper'))
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'helpers', 'exceptions'))
 
 require 'newrelic_rpm'

data/test/multiverse/suites/delayed_job/Envfile

@@ -1,6 +1,5 @@
-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")
+suite_condition("Rubinius problems prevent these from running") do
+  (!defined?(RUBY_ENGINE) || RUBY_ENGINE != "rbx")
 end
 
 boilerplate_gems = <<-SQLITE
@@ -18,16 +17,27 @@ if RUBY_VERSION >= '1.9.3'
   gemfile <<-RB
     gem 'delayed_job', '~> 4.0.4'
     gem 'delayed_job_mongoid', '~> 2.1.0'
+    gem 'i18n', '~> 0.6.11'
     #{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
+if RUBY_VERSION >= '1.9.3'
+  dj4_with_active_record = <<-DJ
+    gem 'delayed_job', '~> 4.0.4'
+    gem 'delayed_job_active_record', '~> 4.0.2'
+    #{boilerplate_gems}
+  DJ
+else
+  dj4_with_active_record = <<-DJ
+    gem 'delayed_job', '~> 4.0.4'
+
+    # 4.0.3 breaks 1.8.7 compatibility
+    gem 'delayed_job_active_record', '= 4.0.2'
+    #{boilerplate_gems}
+  DJ
+end
 
 dj3_with_active_record = <<-DJ
   gem 'delayed_job', '~> 3.0.5'
@@ -41,14 +51,23 @@ dj2_with_active_record3 = <<-DJ
 DJ
 
 if RUBY_VERSION >= '1.9.3'
+  gemfile <<-RB
+    gem 'activerecord', '~> 4.2.0'
+    gem 'i18n', '~> 0.7.0'
+    #{dj4_with_active_record}
+    gem 'minitest', '~> 5.2.3'
+  RB
+
   gemfile <<-RB
     gem 'activerecord', '~> 4.1.6'
+    gem 'i18n', '~> 0.6.11'
     #{dj4_with_active_record}
     gem 'minitest', '~> 5.2.3'
   RB
 
   gemfile <<-RB
     gem 'activerecord', '~>4.0.10'
+    gem 'i18n', '~> 0.6.11'
     #{dj4_with_active_record}
   RB
 end
@@ -56,16 +75,19 @@ end
 [dj4_with_active_record, dj3_with_active_record, dj2_with_active_record3].each do |dj|
   gemfile <<-RB
     gem 'activerecord', '~> 3.2.19'
+    gem 'i18n', '~> 0.6.11'
     #{dj}
   RB
 
   gemfile <<-RB
     gem 'activerecord', '~> 3.1.12'
+    gem 'i18n', '~> 0.6.11'
     #{dj}
   RB
 
   gemfile <<-RB
     gem 'activerecord', '~> 3.0.20'
+    gem 'i18n', '~> 0.5.4'
     #{dj}
   RB
 end
@@ -74,6 +96,7 @@ if RUBY_VERSION <= '1.9.3'
 gemfile <<-RB
   gem 'activerecord', '~> 2.3.18'
   gem 'delayed_job', '~> 2.0.8'
+  gem 'i18n', '~> 0.5.4'
   #{boilerplate_gems}
 RB
 end

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

@@ -2,9 +2,6 @@
 # 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'
-require 'minitest/unit'
-
 require 'new_relic/delayed_job_injection'
 
 if NewRelic::Agent::Samplers::DelayedJobSampler.supported_backend?

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

@@ -2,9 +2,6 @@
 # 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'
-require 'minitest/unit'
-
 require 'new_relic/delayed_job_injection'
 
 if !NewRelic::Agent::Samplers::DelayedJobSampler.supported_backend?

data/test/multiverse/suites/excon/excon_test.rb

@@ -6,8 +6,6 @@ require "excon"
 require "newrelic_rpm"
 require "http_client_test_cases"
 
-require File.join(File.dirname(__FILE__), "..", "..", "..", "agent_helper")
-
 class ExconTest < Minitest::Test
   include HttpClientTestCases
 

data/test/multiverse/suites/grape/grape_test.rb

@@ -4,11 +4,8 @@
 
 require "grape"
 require "newrelic_rpm"
-require 'multiverse_helpers'
 require './grape_test_api'
 
-require File.join(File.dirname(__FILE__), "..", "..", "..", "agent_helper")
-
 class GrapeTest < Minitest::Test
   include Rack::Test::Methods
   include MultiverseHelpers

data/test/multiverse/suites/grape/grape_versioning_test.rb

@@ -3,11 +3,8 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 unless ::Grape::VERSION == '0.1.5'
-  require 'multiverse_helpers'
   require './grape_versioning_test_api'
 
-  require File.join(File.dirname(__FILE__), "..", "..", "..", "agent_helper")
-
   class GrapeVersioningTest < Minitest::Test
     include Rack::Test::Methods
     include MultiverseHelpers

data/test/multiverse/suites/grape/unsupported_version_test.rb

@@ -4,11 +4,8 @@
 
 require "grape"
 require "newrelic_rpm"
-require 'multiverse_helpers'
 require './grape_test_api'
 
-require File.join(File.dirname(__FILE__), "..", "..", "..", "agent_helper")
-
 class UnsupportedGrapeTest < Minitest::Test
   include Rack::Test::Methods
   include MultiverseHelpers

data/test/multiverse/suites/high_security/high_security_test.rb

@@ -2,7 +2,6 @@
 # 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'
 require 'fake_server'
 
 # These tests are designed to work in conjunction with a local newrelic.yml

data/test/multiverse/suites/httpclient/httpclient_test.rb

@@ -6,8 +6,6 @@ require "httpclient"
 require "newrelic_rpm"
 require "http_client_test_cases"
 
-require File.join(File.dirname(__FILE__), "..", "..", "..", "agent_helper")
-
 class HTTPClientTest < Minitest::Test
   include HttpClientTestCases
 

data/test/multiverse/suites/json/json_test.rb

@@ -2,7 +2,6 @@
 # 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'
 require File.join(File.dirname(__FILE__), '..', '..', '..', 'new_relic', 'marshalling_test_cases')
 
 # This is intended as a sanity check for our serialization to JSON via the

data/test/multiverse/suites/marshalling/marshalling_test.rb

@@ -2,7 +2,6 @@
 # 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'
 require File.join(File.dirname(__FILE__), '..', '..', '..', 'new_relic', 'marshalling_test_cases')
 
 # These tests are intended to exercise the basic marshalling functionality of

data/test/multiverse/suites/memcached/Envfile

@@ -0,0 +1,52 @@
+dalli_versions = %w(1.0.5)
+dalli_versions += %w(2.7.2 2.6.4 2.2.1) if RUBY_VERSION >= "1.9.3"
+
+dalli_versions.each do |version|
+  gemfile <<-RB
+    gem 'dalli', '~> #{version}'
+  RB
+end
+
+memcache_client_versions = %w(1.8.5 1.5.0)
+
+memcache_client_versions.each do |version|
+  gemfile <<-RB
+    gem 'memcache-client', '~> #{version}', :require => 'memcache'
+    # version lockdown for ZenTest that cooperates with all Rubies
+    # and the build VMs
+    gem 'ZenTest', '3.4.2'
+  RB
+end
+
+
+if RUBY_VERSION == "1.8.7"
+  memcached_client_versions = ['1.4.1']
+elsif RUBY_VERSION > "1.9.3"
+  memcached_client_versions = ['1.8.0']
+else
+  memcached_client_versions = %w(1.8.0 1.4.1)
+end
+
+if RUBY_PLATFORM == 'java'
+  memcached_client_versions = []
+end
+
+memcached_client_versions.each do |version|
+  gemfile <<-RB
+    gem 'memcached', '~> #{version}'
+  RB
+end
+
+def memcache_running?
+  begin
+  require 'socket'
+    TCPSocket.new('localhost', 11211)
+    true
+  rescue => e
+    false
+  end
+end
+
+before_suite do
+  system('memcached -d -l localhost') unless memcache_running?
+end

data/test/multiverse/suites/memcached/dalli_test.rb

@@ -0,0 +1,89 @@
+# 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 "./memcache_test_cases"
+
+if defined?(Dalli)
+  class DalliTest < Minitest::Test
+    include MemcacheTestCases
+
+    def setup
+      @cache = Dalli::Client.new("127.0.0.1:11211", :socket_timeout => 2.0)
+    end
+  end
+
+  if Dalli::VERSION >= '2.7'
+    require 'dalli/cas/client'
+    DependencyDetection.detect!
+
+    class DalliCasClientTest < DalliTest
+
+      def after_setup
+        super
+        @cas_key = set_key_for_testcase(1)
+      end
+
+      def test_get_cas
+        expected_metrics = expected_web_metrics(:get_cas)
+
+        value = nil
+        in_web_transaction("Controller/#{self.class}/action") do
+          value, _ = @cache.get_cas(@cas_key)
+        end
+
+        assert_memcache_metrics_recorded expected_metrics
+        assert_equal value, @cache.get(@cas_key)
+      end
+
+      def test_get_multi_cas
+        expected_metrics = expected_web_metrics(:get_multi_cas)
+
+        value = nil
+        in_web_transaction("Controller/#{self.class}/action") do
+          # returns { "cas_key" => [value, cas] }
+          value, _ = @cache.get_multi_cas(@cas_key)
+        end
+
+        assert_memcache_metrics_recorded expected_metrics
+        assert_equal 1, value.values.length
+        assert_equal value.values.first.first, @cache.get(@cas_key)
+      end
+
+
+      def test_set_cas
+        expected_metrics = expected_web_metrics(:set_cas)
+
+        in_web_transaction("Controller/#{self.class}/action") do
+          @cache.set_cas(@cas_key, 2, 0)
+        end
+
+        assert_memcache_metrics_recorded expected_metrics
+        assert_equal 2, @cache.get(@cas_key)
+      end
+
+      def test_replace_cas
+        expected_metrics = expected_web_metrics(:replace_cas)
+
+        in_web_transaction("Controller/#{self.class}/action") do
+          @cache.replace_cas(@cas_key, 2, 0)
+        end
+
+        assert_memcache_metrics_recorded expected_metrics
+        assert_equal 2, @cache.get(@cas_key)
+      end
+
+      def test_delete_cas
+        expected_metrics = expected_web_metrics(:delete_cas)
+
+        in_web_transaction("Controller/#{self.class}/action") do
+          @cache.delete_cas(@cas_key)
+        end
+
+        assert_memcache_metrics_recorded expected_metrics
+        assert_equal nil, @cache.get(@cas_key)
+      end
+
+    end
+  end
+end

data/test/multiverse/suites/memcached/memcache_client_test.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 "./memcache_test_cases"
+
+if defined?(MemCache)
+  class MemcacheTest < Minitest::Test
+    include MemcacheTestCases
+
+    def setup
+      @cache = MemCache.new("localhost:11211")
+    end
+
+    if MemCache::VERSION <= "1.5.0"
+      undef_method :test_append_in_web, :test_prepend_in_web, :test_replace_in_web,
+                   :test_append_in_background, :test_prepend_in_background,
+                   :test_replace_in_background
+    end
+
+    if MemCache::VERSION <= "1.7.0"
+      undef_method :test_cas_in_web, :test_cas_in_background
+    end
+  end
+end

data/test/multiverse/suites/memcached/memcache_test_cases.rb

@@ -0,0 +1,302 @@
+# 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 MemcacheTestCases
+  def after_setup
+    @keys = []
+  end
+
+  def teardown
+    @keys.each { |key| @cache.delete(key) rescue nil }
+    NewRelic::Agent.drop_buffered_data
+  end
+
+  def randomized_key
+    "test_#{rand(1e18)}".tap do |key|
+      @keys << key
+    end
+  end
+
+  def set_key_for_testcase(value = "value")
+    randomized_key.tap do |key|
+      @cache.set(key, value)
+      NewRelic::Agent.drop_buffered_data
+    end
+  end
+
+  def expected_web_metrics(command)
+    [
+      "Datastore/all",
+      "Datastore/Memcached/all",
+      "Datastore/operation/Memcached/#{command}",
+      "Datastore/allWeb",
+      "Datastore/Memcached/allWeb",
+      ["Datastore/operation/Memcached/#{command}", "Controller/#{self.class}/action"]
+    ]
+  end
+
+  def expected_bg_metrics(command)
+    [
+      "Datastore/all",
+      "Datastore/Memcached/all",
+      "Datastore/operation/Memcached/#{command}",
+      "Datastore/allOther",
+      "Datastore/Memcached/allOther",
+      ["Datastore/operation/Memcached/#{command}", "OtherTransaction/Background/#{self.class}/bg_task"]
+    ]
+  end
+
+  def assert_memcache_metrics_recorded(expected_metrics)
+    assert_metrics_recorded_exclusive expected_metrics, :filter => /^memcache.*/i
+  end
+
+  def test_get_in_web
+    key = set_key_for_testcase
+
+    expected_metrics = expected_web_metrics(:get)
+
+    in_web_transaction("Controller/#{self.class}/action") do
+      @cache.get(key)
+    end
+
+    assert_memcache_metrics_recorded expected_metrics
+  end
+
+  def test_get_multi_in_web
+    key = set_key_for_testcase
+
+    expected_metrics = expected_web_metrics(:get_multi)
+
+    in_web_transaction("Controller/#{self.class}/action") do
+      @cache.get_multi(key)
+    end
+
+    assert_memcache_metrics_recorded expected_metrics
+  end
+
+  def test_set_in_web
+    expected_metrics = expected_web_metrics(:set)
+
+    in_web_transaction("Controller/#{self.class}/action") do
+      @cache.set(randomized_key, "value")
+    end
+
+    assert_memcache_metrics_recorded expected_metrics
+  end
+
+  def test_add_in_web
+    expected_metrics = expected_web_metrics(:add)
+
+    in_web_transaction("Controller/#{self.class}/action") do
+      @cache.add(randomized_key, "value")
+    end
+
+    assert_memcache_metrics_recorded expected_metrics
+  end
+
+  def test_delete_in_web
+    key = set_key_for_testcase
+
+    expected_metrics = expected_web_metrics(:delete)
+
+    in_web_transaction("Controller/#{self.class}/action") do
+      @cache.delete(key)
+    end
+
+    assert_memcache_metrics_recorded expected_metrics
+  end
+
+  def test_incr_in_web
+    expected_metrics = expected_web_metrics(:incr)
+
+    in_web_transaction("Controller/#{self.class}/action") do
+      @cache.incr("incr_test", 0)
+    end
+
+    assert_memcache_metrics_recorded expected_metrics
+  end
+
+  def test_decr_in_web
+    expected_metrics = expected_web_metrics(:decr)
+
+    in_web_transaction("Controller/#{self.class}/action") do
+      @cache.decr("decr_test", 1)
+    end
+
+    assert_memcache_metrics_recorded expected_metrics
+  end
+
+  def test_replace_in_web
+    key = set_key_for_testcase
+
+    expected_metrics = expected_web_metrics(:replace)
+
+    in_web_transaction("Controller/#{self.class}/action") do
+      @cache.replace(key, 1337807)
+    end
+
+    assert_memcache_metrics_recorded expected_metrics
+  end
+
+  def test_append_in_web
+    key = set_key_for_testcase
+
+    expected_metrics = expected_web_metrics(:append)
+
+    in_web_transaction("Controller/#{self.class}/action") do
+      @cache.append(key, 1337807)
+    end
+
+    assert_memcache_metrics_recorded expected_metrics
+  end
+
+  def test_prepend_in_web
+    key = set_key_for_testcase
+
+    expected_metrics = expected_web_metrics(:prepend)
+
+    in_web_transaction("Controller/#{self.class}/action") do
+      @cache.prepend(key, 1337807)
+    end
+
+    assert_memcache_metrics_recorded expected_metrics
+  end
+
+  def test_cas_in_web
+    key = set_key_for_testcase(1)
+
+    expected_metrics = expected_web_metrics(:cas)
+
+    in_web_transaction("Controller/#{self.class}/action") do
+      @cache.cas(key) {|val| val += 2}
+    end
+
+    assert_memcache_metrics_recorded expected_metrics
+    assert_equal 3, @cache.get(key)
+  end
+
+  def test_get_in_background
+    key = set_key_for_testcase
+
+    expected_metrics = expected_bg_metrics(:get)
+
+    in_background_transaction("OtherTransaction/Background/#{self.class}/bg_task") do
+      @cache.get(key)
+    end
+
+    assert_memcache_metrics_recorded expected_metrics
+  end
+
+  def test_get_multi_in_background
+    key = set_key_for_testcase
+
+    expected_metrics = expected_bg_metrics(:get_multi)
+
+    in_background_transaction("OtherTransaction/Background/#{self.class}/bg_task") do
+      @cache.get_multi(key)
+    end
+
+    assert_memcache_metrics_recorded expected_metrics
+  end
+
+  def test_set_in_background
+    expected_metrics = expected_bg_metrics(:set)
+
+    in_background_transaction("OtherTransaction/Background/#{self.class}/bg_task") do
+      @cache.set(randomized_key, "value")
+    end
+
+    assert_memcache_metrics_recorded expected_metrics
+  end
+
+  def test_add_in_background
+    expected_metrics = expected_bg_metrics(:add)
+
+    in_background_transaction("OtherTransaction/Background/#{self.class}/bg_task") do
+      @cache.add(randomized_key, "value")
+    end
+
+    assert_memcache_metrics_recorded expected_metrics
+  end
+
+  def test_delete_in_background
+    key = set_key_for_testcase
+
+    expected_metrics = expected_bg_metrics(:delete)
+
+    in_background_transaction("OtherTransaction/Background/#{self.class}/bg_task") do
+      @cache.delete(key)
+    end
+
+    assert_memcache_metrics_recorded expected_metrics
+  end
+
+  def test_incr_in_background
+    expected_metrics = expected_bg_metrics(:incr)
+
+    in_background_transaction("OtherTransaction/Background/#{self.class}/bg_task") do
+      @cache.incr("incr_test", 0)
+    end
+
+    assert_memcache_metrics_recorded expected_metrics
+  end
+
+  def test_decr_in_background
+    expected_metrics = expected_bg_metrics(:decr)
+
+    in_background_transaction("OtherTransaction/Background/#{self.class}/bg_task") do
+      @cache.decr("decr_test", 0)
+    end
+
+    assert_memcache_metrics_recorded expected_metrics
+  end
+
+  def test_replace_in_background
+    key = set_key_for_testcase
+
+    expected_metrics = expected_bg_metrics(:replace)
+
+    in_background_transaction("OtherTransaction/Background/#{self.class}/bg_task") do
+      @cache.replace(key, 1337807)
+    end
+
+    assert_memcache_metrics_recorded expected_metrics
+  end
+
+  def test_append_in_background
+    key = set_key_for_testcase
+
+    expected_metrics = expected_bg_metrics(:append)
+
+    in_background_transaction("OtherTransaction/Background/#{self.class}/bg_task") do
+      @cache.append(key, 1337807)
+    end
+
+    assert_memcache_metrics_recorded expected_metrics
+  end
+
+  def test_prepend_in_background
+    key = set_key_for_testcase
+
+    expected_metrics = expected_bg_metrics(:prepend)
+
+    in_background_transaction("OtherTransaction/Background/#{self.class}/bg_task") do
+      @cache.prepend(key, 1337807)
+    end
+
+    assert_memcache_metrics_recorded expected_metrics
+  end
+
+  def test_cas_in_background
+      key = set_key_for_testcase(1)
+      expected_metrics = expected_bg_metrics(:cas)
+
+      in_background_transaction("OtherTransaction/Background/#{self.class}/bg_task") do
+        @cache.cas(key) {|val| val += 2}
+      end
+
+      assert_memcache_metrics_recorded expected_metrics
+      assert_equal 3, @cache.get(key)
+    end
+end