newrelic_rpm 3.6.4.122 → 3.6.5.130

data/test/new_relic/language_support_test.rb

@@ -0,0 +1,45 @@
+# 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__),'..','test_helper'))
+
+class NewRelic::LanguageSupportTest < Test::Unit::TestCase
+  def test_object_space_enabled_true_without_jruby_with_object_space
+    undefine_constant(:JRuby) do
+      define_constant(:ObjectSpace, mock()) do
+        assert_truthy NewRelic::LanguageSupport.object_space_enabled?
+      end
+    end
+  end
+
+  def test_object_space_enabled_false_without_object_space_without_jruby
+    undefine_constant(:ObjectSpace) do
+      undefine_constant(:JRuby) do
+        assert_falsy NewRelic::LanguageSupport.object_space_enabled?
+      end
+    end
+  end
+
+  def test_object_space_enabled_true_if_enabled_in_jruby_without_object_space
+    fake_runtime = mock(:is_object_space_enabled => true)
+    fake_jruby = mock(:runtime => fake_runtime)
+
+    define_constant(:JRuby, fake_jruby) do
+      undefine_constant(:ObjectSpace) do
+        assert_truthy NewRelic::LanguageSupport.object_space_enabled?
+      end
+    end
+  end
+
+  def test_object_space_enabled_false_if_disabled_in_jruby_without_object_space
+    fake_runtime = mock(:is_object_space_enabled => false)
+    fake_jruby = mock(:runtime => fake_runtime)
+
+    define_constant(:JRuby, fake_jruby) do
+      undefine_constant(:ObjectSpace) do
+        assert_falsy NewRelic::LanguageSupport.object_space_enabled?
+      end
+    end
+  end
+end

data/vendor/gems/dependency_detection-0.0.1.build/lib/dependency_detection.rb

@@ -6,15 +6,15 @@ require 'dependency_detection/version'
 module DependencyDetection
 
   module_function
-  @@items = []
+  @items = []
   def defer(&block)
     item = Dependent.new
     item.instance_eval(&block)
-    @@items << item
+    @items << item
   end
 
   def detect!
-    @@items.each do |item|
+    @items.each do |item|
       if item.dependencies_satisfied?
         item.execute
       end
@@ -22,7 +22,7 @@ module DependencyDetection
   end
 
   def dependency_by_name(name)
-    @@items.find {|i| i.name == name }
+    @items.find {|i| i.name == name }
   end
 
   def installed?(name)
@@ -30,6 +30,14 @@ module DependencyDetection
     item && item.executed
   end
 
+  def items
+    @items
+  end
+
+  def items=(new_items)
+    @items = new_items
+  end
+
   class Dependent
     attr_reader :executed
     attr_reader :name
@@ -64,6 +72,19 @@ module DependencyDetection
       @dependencies << Proc.new
     end
 
+    def named(new_name)
+      name = new_name
+      depends_on do
+        key = "disable_#{new_name}".to_sym
+        if (::NewRelic::Agent.config[key] == true)
+          ::NewRelic::Agent.logger.debug("Not installing #{new_name} instrumentation because of configuration #{key}")
+          false
+        else
+          true
+        end
+      end
+    end
+
     def executes
       @executes << Proc.new
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.6.4.122
+  version: 3.6.5.130
   prerelease: 
 platform: ruby
 authors:
@@ -41,7 +41,7 @@ cert_chain:
   cHUySWFQWE92bTNUOEc0TzZxWnZobkxoL1VpZW4rK0RqOGVGQmVjVFBvTThw
   VmpLM3BoNQpuL0V3dVpDY0U2Z2h0Q0NNCi0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2013-06-14 00:00:00.000000000 Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies: []
 description: ! 'New Relic is a performance management system, developed by New Relic,
 
@@ -112,6 +112,10 @@ files:
 - lib/new_relic/agent/database.rb
 - lib/new_relic/agent/error_collector.rb
 - lib/new_relic/agent/event_listener.rb
+- lib/new_relic/agent/http_clients/excon_wrappers.rb
+- lib/new_relic/agent/http_clients/net_http_wrappers.rb
+- lib/new_relic/agent/http_clients/typhoeus_wrappers.rb
+- lib/new_relic/agent/http_clients/uri_util.rb
 - lib/new_relic/agent/instrumentation.rb
 - lib/new_relic/agent/instrumentation/action_controller_subscriber.rb
 - lib/new_relic/agent/instrumentation/action_view_subscriber.rb
@@ -126,6 +130,9 @@ files:
 - lib/new_relic/agent/instrumentation/data_mapper.rb
 - lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb
 - lib/new_relic/agent/instrumentation/evented_subscriber.rb
+- lib/new_relic/agent/instrumentation/excon.rb
+- lib/new_relic/agent/instrumentation/excon/connection.rb
+- lib/new_relic/agent/instrumentation/excon/middleware.rb
 - lib/new_relic/agent/instrumentation/memcache.rb
 - lib/new_relic/agent/instrumentation/merb/controller.rb
 - lib/new_relic/agent/instrumentation/merb/errors.rb
@@ -152,6 +159,7 @@ files:
 - lib/new_relic/agent/instrumentation/sinatra/ignorer.rb
 - lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb
 - lib/new_relic/agent/instrumentation/sunspot.rb
+- lib/new_relic/agent/instrumentation/typhoeus.rb
 - lib/new_relic/agent/instrumentation/unicorn_instrumentation.rb
 - lib/new_relic/agent/method_tracer.rb
 - lib/new_relic/agent/new_relic_service.rb
@@ -183,7 +191,6 @@ files:
 - lib/new_relic/agent/transaction_info.rb
 - lib/new_relic/agent/transaction_sample_builder.rb
 - lib/new_relic/agent/transaction_sampler.rb
-- lib/new_relic/agent/uri_util.rb
 - lib/new_relic/agent/worker_loop.rb
 - lib/new_relic/coerce.rb
 - lib/new_relic/collection_helper.rb
@@ -244,7 +251,11 @@ files:
 - test/active_record_fixtures.rb
 - test/agent_helper.rb
 - test/config/newrelic.yml
+- test/config/test.cert.crt
+- test/config/test.cert.csr
+- test/config/test.cert.key
 - test/config/test_control.rb
+- test/config/testing-privkey.pem
 - test/fixtures/proc_cpuinfo.txt
 - test/intentional_fail.rb
 - test/multiverse/.gitignore
@@ -287,6 +298,12 @@ files:
 - test/multiverse/suites/datamapper/Envfile
 - test/multiverse/suites/datamapper/config/newrelic.yml
 - test/multiverse/suites/datamapper/datamapper_test.rb
+- test/multiverse/suites/excon/Envfile
+- test/multiverse/suites/excon/config/newrelic.yml
+- test/multiverse/suites/excon/excon_test.rb
+- test/multiverse/suites/net_http/Envfile
+- test/multiverse/suites/net_http/config/newrelic.yml
+- test/multiverse/suites/net_http/net_http_test.rb
 - test/multiverse/suites/padrino/Envfile
 - test/multiverse/suites/padrino/config/newrelic.yml
 - test/multiverse/suites/padrino/padrino_test.rb
@@ -309,7 +326,6 @@ files:
 - test/multiverse/suites/resque/Rakefile
 - test/multiverse/suites/resque/config/newrelic.yml
 - test/multiverse/suites/resque/instrumentation_test.rb
-- test/multiverse/suites/resque/resque_setup.rb
 - test/multiverse/suites/sequel/Envfile
 - test/multiverse/suites/sequel/config/newrelic.yml
 - test/multiverse/suites/sequel/sequel_test.rb
@@ -327,6 +343,9 @@ files:
 - test/multiverse/suites/sinatra/sinatra_modular_test.rb
 - test/multiverse/suites/sinatra/sinatra_routes_test.rb
 - test/multiverse/suites/sinatra/sinatra_test_cases.rb
+- test/multiverse/suites/typhoeus/Envfile
+- test/multiverse/suites/typhoeus/config/newrelic.yml
+- test/multiverse/suites/typhoeus/typhoeus_test.rb
 - test/multiverse/test/multiverse_test.rb
 - test/multiverse/test/suite_examples/one/a/Envfile
 - test/multiverse/test/suite_examples/one/a/a_test.rb
@@ -362,6 +381,7 @@ files:
 - test/new_relic/agent/error_collector/notice_error_test.rb
 - test/new_relic/agent/error_collector_test.rb
 - test/new_relic/agent/event_listener_test.rb
+- test/new_relic/agent/http_clients/uri_util_test.rb
 - test/new_relic/agent/instrumentation/action_controller_subscriber_test.rb
 - test/new_relic/agent/instrumentation/action_view_subscriber_test.rb
 - test/new_relic/agent/instrumentation/active_record_helper_test.rb
@@ -407,7 +427,6 @@ files:
 - test/new_relic/agent/transaction_sample_builder_test.rb
 - test/new_relic/agent/transaction_sampler_test.rb
 - test/new_relic/agent/transaction_test.rb
-- test/new_relic/agent/uri_util_test.rb
 - test/new_relic/agent/worker_loop_test.rb
 - test/new_relic/agent_test.rb
 - test/new_relic/coerce_test.rb
@@ -417,11 +436,17 @@ files:
 - test/new_relic/control/frameworks/rails_test.rb
 - test/new_relic/control_test.rb
 - test/new_relic/delayed_job_injection_test.rb
+- test/new_relic/dependency_detection_test.rb
 - test/new_relic/dispatcher_test.rb
 - test/new_relic/environment_report_test.rb
+- test/new_relic/evil_server.rb
 - test/new_relic/fake_collector.rb
+- test/new_relic/fake_external_server.rb
+- test/new_relic/fake_server.rb
 - test/new_relic/framework_test.rb
 - test/new_relic/helper_test.rb
+- test/new_relic/http_client_test_cases.rb
+- test/new_relic/language_support_test.rb
 - test/new_relic/license_test.rb
 - test/new_relic/load_test.rb
 - test/new_relic/local_environment_test.rb
@@ -531,36 +556,13 @@ files:
 - lib/new_relic/build.rb
 homepage: http://www.github.com/newrelic/rpm
 licenses: []
-post_install_message: ! "# New Relic Ruby Agent Release Notes #\n\n## v3.6.4 ##\n\n*
-  Exception Whitelist\n\n  We've improved exception message handling for applications
-  running in\n  high security mode. Enabling 'high_security' now removes exception
-  messages\n  entirely rather than simply obfuscating any SQL.\n\n  By default this
-  feature affects all exceptions, though you can configure a\n  whitelist of exceptions
-  whose messages should be left intact.\n\n  More details: https://newrelic.com/docs/ruby/ruby-agent-configuration\n\n*
-  Fix a race condition affecting some Rails applications at startup\n\n  Some Rails
-  applications using newrelic_rpm were affected by a race condition\n  at startup
-  that manifested as an error when model classes with associations\n  were first loaded.
-  The cause of these errors has been addressed by moving the\n  generation of the
-  agent's EnvironmentReport on startup from a background\n  thread to the main thread.\n\n##
-  3.6.3 ##\n\n* Better Sinatra Support\n\n  A number of improvements have been made
-  to our Sinatra instrumentation.\n  More details: https://newrelic.com/docs/ruby/sinatra-support-in-the-ruby-agent\n\n
-  \ Sinatra instrumentation has been updated to more accurately reflect the final\n
-  \ route that was actually executed, taking pass and conditions into account.\n\n
-  \ New Relic middlewares for error collection, real user monitoring, and cross\n
-  \ application tracing are automatically inserted into the middleware stack.\n\n
-  \ Ignoring routes, similar to functionality available to Rails controllers, is\n
-  \ now available in Sinatra as well.\n\n  Routes in 1.4 are properly formatting in
-  transaction names. Thanks Zachary\n  Anker for the contribution!\n\n* Padrino Support\n\n
-  \ Along with improving our support of Sinatra, we've also extended that to\n  supporting
-  Padrino, a framework that builds on Sinatra. Web transactions\n  should show up
-  in New Relic now for Padrino apps automatically. The agent has\n  been tested against
-  the latest Padrino in versions 0.11.x and 0.10.x.\n\n* Main overview graph only
-  shows web transactions\n\n  In the past database times from background jobs mixed
-  with other web transaction\n  metrics in the main overview graph. This often skewed
-  graphs. A common workaround\n  was to send background jobs to a separate application,
-  but that should no longer\n  be necessary as the overview graphs now only represent
-  web transactions.\n\nSee https://github.com/newrelic/rpm/blob/master/CHANGELOG for
-  a full list of\nchanges.\n"
+post_install_message: ! "# New Relic Ruby Agent Release Notes #\n\n## v3.6.5 ##\n\n*
+  Rails 4.0 Support\n\n  The Ruby agent is all set for the recent general release
+  of Rails 4.0! We've\n  been tracking the RC's, and that work paid off. Versions
+  3.6.5 and 3.6.4 of\n  the Ruby agent should work fine with Rails 4.0.0.\n\n* Excon
+  and Typhoeus support\n\n  The Ruby agent now supports the Excon and Typhoeus HTTP
+  libraries! For more\n  details see https://newrelic.com/docs/ruby/ruby-http-clients.\n\nSee
+  https://github.com/newrelic/rpm/blob/master/CHANGELOG for a full list of\nchanges.\n"
 rdoc_options:
 - --line-numbers
 - --inline-source

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

@@ -1,19 +0,0 @@
-# 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'
-
-redis_port = ENV["NEWRELIC_MULTIVERSE_REDIS_PORT"]
-$redis = Redis.new(:port => redis_port)
-Resque.redis = $redis
-
-class JobForTesting
-  @queue = :resque_test
-
-  def self.perform(key, val, sleep_duration=0)
-    sleep sleep_duration
-    $redis.set(key, val)
-  end
-end

data/test/new_relic/agent/uri_util_test.rb

@@ -1,75 +0,0 @@
-# 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__),'..','..','test_helper'))
-require 'new_relic/agent/agent_logger'
-require 'new_relic/agent/null_logger'
-
-class URIUtilTest < Test::Unit::TestCase
-  def setup
-    fixture_tcp_socket(nil)
-  end
-
-  def dummy_request(uri_string, opts={})
-    uri = URI(uri_string)
-    http = Net::HTTP.new(uri.host, uri.port)
-    http.use_ssl = opts.has_key?(:use_ssl) ? opts[:use_ssl] : false
-    req = Net::HTTP::Get.new(opts[:path] || uri.request_uri)
-    [http, req]
-  end
-
-  def filter(uri_string, opts={})
-    NewRelic::Agent::URIUtil.filtered_uri_for(*dummy_request(uri_string, opts))
-  end
-
-  def test_filtered_uri_for
-    uri = "http://foo.com/bar/baz"
-    assert_equal("http://foo.com/bar/baz", filter(uri))
-  end
-
-  def test_filtered_uri_for_custom_port
-    uri = "http://foo.com:1234/bar/baz"
-    assert_equal("http://foo.com:1234/bar/baz", filter(uri))
-  end
-
-  def test_filtered_uri_omits_query_params
-    uri = "http://foo.com/bar/baz?a=1&b=2"
-    assert_equal("http://foo.com/bar/baz", filter(uri))
-  end
-
-  def test_filtered_uri_omits_fragment
-    uri = "http://foo.com/bar/baz#fragment"
-    assert_equal("http://foo.com/bar/baz", filter(uri, :path => '/bar/baz#fragment'))
-  end
-
-  def test_filtered_uri_omits_query_params_and_fragment
-    uri = "http://foo.com/bar/baz?a=1&b=2#fragment"
-    assert_equal("http://foo.com/bar/baz", filter(uri, :path => '/bar/baz?a=1&b=2#fragment'))
-  end
-
-  def test_filtered_uri_reflects_use_of_ssl
-    uri = 'https://foo.com/bar/baz'
-    assert_equal("https://foo.com/bar/baz", filter(uri, :use_ssl => true))
-  end
-
-  def test_filtered_uri_reflects_use_of_ssl_with_custom_port
-    uri = 'https://foo.com:9999/bar/baz'
-    assert_equal("https://foo.com:9999/bar/baz", filter(uri, :use_ssl => true))
-  end
-
-  def test_filtered_uri_for_with_full_uri_request_path
-    uri = "http://foo.com/bar/baz?a=1&b=2#fragment"
-    assert_equal("http://foo.com/bar/baz", filter(uri, :path => uri))
-  end
-
-  def test_filtered_uri_for_with_full_uri_request_path_https
-    uri = "https://foo.com/bar/baz?a=1&b=2#fragment"
-    assert_equal("https://foo.com/bar/baz", filter(uri, :path => uri, :use_ssl => true))
-  end
-
-  def test_strips_credentials_embedded_in_uri
-    uri = "http://user:pass@foo.com/bar/baz"
-    assert_equal("http://foo.com/bar/baz", filter(uri, :path => uri))
-  end
-end