newrelic_rpm 3.0.0.beta2 → 3.0.0

data/lib/new_relic/agent/agent.rb

@@ -845,6 +845,7 @@ module NewRelic
 
         def send_request(opts)
           request = Net::HTTP::Post.new(opts[:uri], 'CONTENT-ENCODING' => opts[:encoding], 'HOST' => opts[:collector].name)
+          request['user-agent'] = user_agent
           request.content_type = "application/octet-stream"
           request.body = opts[:data]
 
@@ -897,6 +898,15 @@ module NewRelic
           uri
         end
 
+        def user_agent
+          ruby_description = ''
+          # note the trailing space!
+          ruby_description << "(ruby #{::RUBY_VERSION} #{::RUBY_PLATFORM}) " if defined?(::RUBY_VERSION) && defined?(::RUBY_PLATFORM)
+          zlib_version = ''
+          zlib_version << "zlib/#{Zlib.zlib_version}" if defined?(::Zlib) && Zlib.respond_to?(:zlib_version)
+          "NewRelic-RubyAgent/#{NewRelic::VERSION::STRING} #{ruby_description}#{zlib_version}"
+        end
+
         # send a message via post
         def invoke_remote(method, *args)
           now = Time.now

data/lib/new_relic/agent/method_tracer.rb

@@ -314,7 +314,7 @@ module NewRelic
             "Custom/#{self.name}/#{method_name.to_s}"
           end
 
-          def method_exists?(method_name)
+          def newrelic_method_exists?(method_name)
             exists = method_defined?(method_name) || private_method_defined?(method_name)
             NewRelic::Control.instance.log.warn("Did not trace #{self.name}##{method_name} because that method does not exist") unless exists
             exists
@@ -378,7 +378,7 @@ module NewRelic
         include AddMethodTracer
 
         def add_method_tracer(method_name, metric_name_code=nil, options = {})
-          return unless method_exists?(method_name)
+          return unless newrelic_method_exists?(method_name)
           metric_name_code ||= default_metric_name_code(method_name)
           return if traced_method_exists?(method_name, metric_name_code)
 

data/lib/new_relic/version.rb

@@ -4,7 +4,7 @@ module NewRelic
     MAJOR = 3
     MINOR = 0
     TINY  = 0
-    BUILD = 'beta2' #'0' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
+    BUILD = nil #'0' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end
 

data/newrelic_rpm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{newrelic_rpm}
-  s.version = "3.0.0.beta2"
+  s.version = "3.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bill Kayser", "Justin George"]
-  s.date = %q{2011-05-06}
+  s.date = %q{2011-05-11}
   s.description = %q{New Relic RPM is a Ruby performance management system, developed by
 New Relic, Inc (http://www.newrelic.com).  RPM provides you with deep
 information about the performance of your Ruby on Rails or Merb

data/test/new_relic/agent/method_tracer/class_methods/add_method_tracer_test.rb

@@ -38,19 +38,19 @@ module NewRelic
               assert_equal "Custom/#{name}/test_method", default_metric_name_code('test_method')
             end
 
-            def test_method_exists_positive
+            def test_newrelic_method_exists_positive
               self.expects(:method_defined?).returns(true)
-              assert method_exists?('test_method')
+              assert newrelic_method_exists?('test_method')
             end
 
-            def test_method_exists_negative
+            def test_newrelic_method_exists_negative
               self.expects(:method_defined?).returns(false)
               self.expects(:private_method_defined?).returns(false)
 
               fake_log = mock('log')
               NewRelic::Control.instance.expects(:log).returns(fake_log)
               fake_log.expects(:warn).with("Did not trace #{name}#test_method because that method does not exist")
-              assert !method_exists?('test_method')
+              assert !newrelic_method_exists?('test_method')
             end
 
             def test_set_deduct_call_time_based_on_metric_positive

data/test/new_relic/agent/transaction_sampler_test.rb

@@ -740,7 +740,7 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
     run_sample_trace
 
     slowest = @sampler.harvest(nil, 0)[0]
-    assert((slowest.duration >= 0.1), "expected sample duration >= 0.1, but was: #{slowest.duration.inspect}")
+    assert((slowest.duration >= 0.09), "expected sample duration >= 0.09, but was: #{slowest.duration.inspect}")
     # this assert is here to make sure the test remains valid
     assert((slowest.duration <= 0.15), "expected sample duration <= 0.15, but was: #{slowest.duration.inspect}")
     
@@ -749,7 +749,7 @@ class NewRelic::Agent::TransactionSamplerTest < Test::Unit::TestCase
     not_as_slow = @sampler.harvest(slowest, 0)[0]
     assert((not_as_slow == slowest), "Should re-harvest the same transaction since it should be slower than the new transaction - expected #{slowest.inspect} but got #{not_as_slow.inspect}")
 
-    run_sample_trace { sleep 0.15 }
+    run_sample_trace { sleep 0.16 }
     new_slowest = @sampler.harvest(slowest, 0)[0]
     assert((new_slowest != slowest), "Should not harvest the same trace since the new one should be slower")
     assert((new_slowest.duration >= 0.15), "Slowest duration must be >= 0.15, but was: #{new_slowest.duration.inspect}")

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: newrelic_rpm
 version: !ruby/object:Gem::Version 
-  hash: 62196423
-  prerelease: 6
+  hash: 7
+  prerelease: 
   segments: 
   - 3
   - 0
   - 0
-  - beta
-  - 2
-  version: 3.0.0.beta2
+  version: 3.0.0
 platform: ruby
 authors: 
 - Bill Kayser
@@ -18,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-06 00:00:00 -07:00
+date: 2011-05-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency