newrelic_rpm 2.10.6 → 2.10.8

data/test/new_relic/control_test.rb

@@ -90,16 +90,23 @@ class NewRelic::ControlTest < Test::Unit::TestCase
   
   def test_transaction_threshold__default
     
-    forced_start :transaction_tracer => {}
+    forced_start :transaction_tracer => { :transaction_threshold => nil}
     assert_nil c['transaction_tracer']['transaction_threshold']
     assert_equal 2.0, NewRelic::Agent::Agent.instance.instance_variable_get('@slowest_transaction_threshold')
   end
   
   def test_transaction_threshold__override
-    forced_start :transaction_tracer => { 'transaction_threshold' => 1}
+    forced_start :transaction_tracer => { :transaction_threshold => 1}
     assert_equal 1, c['transaction_tracer']['transaction_threshold']
     assert_equal 1, NewRelic::Agent::Agent.instance.instance_variable_get('@slowest_transaction_threshold')
   end
+  def test_merging_options
+    NewRelic::Control.send :public, :merge_options
+    @c.merge_options :api_port => 66, :transaction_tracer => { :explain_threshold => 2.0 }
+    assert_equal 66, NewRelic::Control.instance['api_port']
+    assert_equal 2.0, NewRelic::Control.instance['transaction_tracer']['explain_threshold']
+    assert_equal 'raw', NewRelic::Control.instance['transaction_tracer']['record_sql']
+  end
   private
   def forced_start overrides = {}
     NewRelic::Agent.manual_start overrides

data/test/new_relic/stats_test.rb

@@ -129,7 +129,35 @@ class NewRelic::StatsTest < Test::Unit::TestCase
     s1.total_exclusive_time = 20
     assert_equal((2.0 / 3.0), s1.exclusive_time_percentage)
   end
-  
+
+  def test_sum_merge
+    s1 = NewRelic::MethodTraceStats.new
+    s2 = NewRelic::MethodTraceStats.new
+    s1.trace_call 10
+    s2.trace_call 20
+    s2.freeze
+    
+    validate s1, 1, 10, 10, 10
+    validate s2, 1, 20, 20, 20
+    s1.sum_merge! s2
+    validate s1, 1, (10+20), 10 + 20, 20 + 10
+    validate s2, 1, 20, 20, 20
+  end
+
+  def test_sum_merge_with_exclusive
+    s1 = NewRelic::MethodTraceStats.new
+    s2 = NewRelic::MethodTraceStats.new
+
+    s1.trace_call 10, 5
+    s2.trace_call 20, 10
+    s2.freeze
+
+    validate s1, 1, 10, 10, 10, 5
+    validate s2, 1, 20, 20, 20, 10
+    s1.sum_merge! s2
+    validate s1, 1, (10+20), 10 + 20, 20 + 10, (10+5)
+  end
+
   def test_merge
     s1 = NewRelic::MethodTraceStats.new
     s2 = NewRelic::MethodTraceStats.new

data/test/new_relic/version_number_test.rb

@@ -48,6 +48,19 @@ class NewRelic::VersionNumberTest < Test::Unit::TestCase
                 999]
     assert_equal values, values.map{|v| NewRelic::VersionNumber.new v}.sort.map(&:to_s)
   end
+  def test_prerelease
+    v0 = NewRelic::VersionNumber.new '1.2.0.beta'
+    assert_equal [1,2,0,'beta'], v0.parts
+    assert v0 > '1.1.9.0'
+    assert v0 > '1.1.9.alpha'
+    assert v0 > '1.2.0.alpha'
+    assert v0 == '1.2.0.beta'
+    assert v0 < '1.2.1'
+    assert v0 < '1.2.0'
+    assert v0 < '1.2.0.c'
+    assert v0 < '1.2.0.0'
+    
+  end
   def test_compare_string
     v0 = NewRelic::VersionNumber.new '1.2.0'
     v1 = NewRelic::VersionNumber.new '2.2.2'

data/ui/helpers/newrelic_helper.rb

@@ -1,7 +1,6 @@
 require 'pathname'
-require 'new_relic/agent/collection_helper'
 module NewrelicHelper
-  include NewRelic::Agent::CollectionHelper
+  include NewRelic::CollectionHelper
   
   # return the host that serves static content (css, metric documentation, images, etc)
   # that supports the desktop edition.

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 10
-  - 6
-  version: 2.10.6
+  - 8
+  version: 2.10.8
 platform: ruby
 authors: 
 - Bill Kayser
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-05 00:00:00 -08:00
+date: 2010-03-26 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -47,7 +47,6 @@ files:
 - lib/new_relic/agent/agent.rb
 - lib/new_relic/agent/busy_calculator.rb
 - lib/new_relic/agent/chained_call.rb
-- lib/new_relic/agent/collection_helper.rb
 - lib/new_relic/agent/error_collector.rb
 - lib/new_relic/agent/instrumentation/active_merchant.rb
 - lib/new_relic/agent/instrumentation/active_record_instrumentation.rb
@@ -65,6 +64,8 @@ files:
 - lib/new_relic/agent/instrumentation/rails/action_controller.rb
 - lib/new_relic/agent/instrumentation/rails/action_web_service.rb
 - lib/new_relic/agent/instrumentation/rails/errors.rb
+- lib/new_relic/agent/instrumentation/rails3/action_controller.rb
+- lib/new_relic/agent/instrumentation/rails3/errors.rb
 - lib/new_relic/agent/instrumentation/sinatra.rb
 - lib/new_relic/agent/method_tracer.rb
 - lib/new_relic/agent/sampler.rb
@@ -79,12 +80,14 @@ files:
 - lib/new_relic/agent/stats_engine/transactions.rb
 - lib/new_relic/agent/transaction_sampler.rb
 - lib/new_relic/agent/worker_loop.rb
+- lib/new_relic/collection_helper.rb
 - lib/new_relic/commands/deployments.rb
 - lib/new_relic/commands/new_relic_commands.rb
 - lib/new_relic/control.rb
 - lib/new_relic/control/external.rb
 - lib/new_relic/control/merb.rb
 - lib/new_relic/control/rails.rb
+- lib/new_relic/control/rails3.rb
 - lib/new_relic/control/ruby.rb
 - lib/new_relic/control/sinatra.rb
 - lib/new_relic/delayed_job_injection.rb
@@ -124,6 +127,195 @@ files:
 - lib/tasks/tests.rake
 - newrelic.yml
 - newrelic_rpm.gemspec
+- rdoc/classes/NewRelic.html
+- rdoc/classes/NewRelic/Agent.html
+- rdoc/classes/NewRelic/Agent/Agent.html
+- rdoc/classes/NewRelic/Agent/BackgroundLoadingError.html
+- rdoc/classes/NewRelic/Agent/BusyCalculator.html
+- rdoc/classes/NewRelic/Agent/CollectionHelper.html
+- rdoc/classes/NewRelic/Agent/ErrorCollector.html
+- rdoc/classes/NewRelic/Agent/ForceDisconnectException.html
+- rdoc/classes/NewRelic/Agent/ForceRestartException.html
+- rdoc/classes/NewRelic/Agent/IgnoreSilentlyException.html
+- rdoc/classes/NewRelic/Agent/Instrumentation.html
+- rdoc/classes/NewRelic/Agent/Instrumentation/ActiveRecordInstrumentation.html
+- rdoc/classes/NewRelic/Agent/Instrumentation/ControllerInstrumentation.html
+- rdoc/classes/NewRelic/Agent/Instrumentation/ControllerInstrumentation/ClassMethods.html
+- rdoc/classes/NewRelic/Agent/Instrumentation/DelayedJobInstrumentation.html
+- rdoc/classes/NewRelic/Agent/Instrumentation/MetricFrame.html
+- rdoc/classes/NewRelic/Agent/Instrumentation/Rack.html
+- rdoc/classes/NewRelic/Agent/Instrumentation/Sinatra.html
+- rdoc/classes/NewRelic/Agent/LicenseException.html
+- rdoc/classes/NewRelic/Agent/MethodTracer.html
+- rdoc/classes/NewRelic/Agent/MethodTracer/ClassMethods.html
+- rdoc/classes/NewRelic/Agent/MethodTracer/InstanceMethods.html
+- rdoc/classes/NewRelic/Agent/PostTooBigException.html
+- rdoc/classes/NewRelic/Agent/Sampler.html
+- rdoc/classes/NewRelic/Agent/Sampler/Unsupported.html
+- rdoc/classes/NewRelic/Agent/Samplers.html
+- rdoc/classes/NewRelic/Agent/Samplers/CpuSampler.html
+- rdoc/classes/NewRelic/Agent/Samplers/DelayedJobLockSampler.html
+- rdoc/classes/NewRelic/Agent/Samplers/MemorySampler.html
+- rdoc/classes/NewRelic/Agent/Samplers/MemorySampler/Base.html
+- rdoc/classes/NewRelic/Agent/Samplers/MemorySampler/JavaHeapSampler.html
+- rdoc/classes/NewRelic/Agent/Samplers/MemorySampler/ProcStatus.html
+- rdoc/classes/NewRelic/Agent/Samplers/MemorySampler/ShellPS.html
+- rdoc/classes/NewRelic/Agent/Samplers/ObjectSampler.html
+- rdoc/classes/NewRelic/Agent/ServerError.html
+- rdoc/classes/NewRelic/Agent/ShimAgent.html
+- rdoc/classes/NewRelic/Agent/StatsEngine.html
+- rdoc/classes/NewRelic/Agent/StatsEngine/MetricStats.html
+- rdoc/classes/NewRelic/Agent/StatsEngine/Samplers.html
+- rdoc/classes/NewRelic/Agent/StatsEngine/ScopeStackElement.html
+- rdoc/classes/NewRelic/Agent/StatsEngine/Transactions.html
+- rdoc/classes/NewRelic/Agent/TransactionSampleBuilder.html
+- rdoc/classes/NewRelic/Agent/TransactionSampler.html
+- rdoc/classes/NewRelic/Agent/WorkerLoop.html
+- rdoc/classes/NewRelic/Agent/WorkerLoop/LoopTask.html
+- rdoc/classes/NewRelic/ApdexStats.html
+- rdoc/classes/NewRelic/BasicStats.html
+- rdoc/classes/NewRelic/ChainedCall.html
+- rdoc/classes/NewRelic/Commands.html
+- rdoc/classes/NewRelic/Commands/CommandFailure.html
+- rdoc/classes/NewRelic/Commands/Deployments.html
+- rdoc/classes/NewRelic/Control.html
+- rdoc/classes/NewRelic/Control/External.html
+- rdoc/classes/NewRelic/Control/Merb.html
+- rdoc/classes/NewRelic/Control/Rails.html
+- rdoc/classes/NewRelic/Control/Ruby.html
+- rdoc/classes/NewRelic/Control/Sinatra.html
+- rdoc/classes/NewRelic/DelayedJobInjection.html
+- rdoc/classes/NewRelic/Histogram.html
+- rdoc/classes/NewRelic/Histogram/Bucket.html
+- rdoc/classes/NewRelic/Histogram/Shim.html
+- rdoc/classes/NewRelic/LocalEnvironment.html
+- rdoc/classes/NewRelic/MerbBootLoader.html
+- rdoc/classes/NewRelic/MethodTraceStats.html
+- rdoc/classes/NewRelic/MetricData.html
+- rdoc/classes/NewRelic/MetricParser.html
+- rdoc/classes/NewRelic/MetricParser/ActionMailer.html
+- rdoc/classes/NewRelic/MetricParser/ActiveMerchant.html
+- rdoc/classes/NewRelic/MetricParser/ActiveRecord.html
+- rdoc/classes/NewRelic/MetricParser/Controller.html
+- rdoc/classes/NewRelic/MetricParser/ControllerCPU.html
+- rdoc/classes/NewRelic/MetricParser/Errors.html
+- rdoc/classes/NewRelic/MetricParser/External.html
+- rdoc/classes/NewRelic/MetricParser/MemCache.html
+- rdoc/classes/NewRelic/MetricParser/OtherTransaction.html
+- rdoc/classes/NewRelic/MetricParser/View.html
+- rdoc/classes/NewRelic/MetricParser/WebFrontend.html
+- rdoc/classes/NewRelic/MetricParser/WebService.html
+- rdoc/classes/NewRelic/MetricSpec.html
+- rdoc/classes/NewRelic/Metrics.html
+- rdoc/classes/NewRelic/NoticedError.html
+- rdoc/classes/NewRelic/Rack.html
+- rdoc/classes/NewRelic/Rack/MetricApp.html
+- rdoc/classes/NewRelic/Rack/Status.html
+- rdoc/classes/NewRelic/ScopedMethodTraceStats.html
+- rdoc/classes/NewRelic/Stats.html
+- rdoc/classes/NewRelic/StatsBase.html
+- rdoc/classes/NewRelic/TransactionAnalysis.html
+- rdoc/classes/NewRelic/TransactionAnalysis/SegmentSummary.html
+- rdoc/classes/NewRelic/TransactionSample.html
+- rdoc/classes/NewRelic/TransactionSample/CompositeSegment.html
+- rdoc/classes/NewRelic/TransactionSample/FakeSegment.html
+- rdoc/classes/NewRelic/TransactionSample/IDGenerator.html
+- rdoc/classes/NewRelic/TransactionSample/Segment.html
+- rdoc/classes/NewRelic/TransactionSample/SummarySegment.html
+- rdoc/classes/NewRelic/VersionNumber.html
+- rdoc/classes/NewRelicApi.html
+- rdoc/classes/NewRelicApi/Account.html
+- rdoc/classes/NewRelicApi/Account/AccountUsage.html
+- rdoc/classes/NewRelicApi/Account/AccountView.html
+- rdoc/classes/NewRelicApi/Application.html
+- rdoc/classes/NewRelicApi/Application/Agent.html
+- rdoc/classes/NewRelicApi/Deployment.html
+- rdoc/classes/NewRelicApi/Subscription.html
+- rdoc/classes/NewRelicApi/ThresholdValue.html
+- rdoc/classes/NewRelicApi/User.html
+- rdoc/created.rid
+- rdoc/files/CHANGELOG.html
+- rdoc/files/LICENSE.html
+- rdoc/files/lib/new_relic/agent/agent_rb.html
+- rdoc/files/lib/new_relic/agent/busy_calculator_rb.html
+- rdoc/files/lib/new_relic/agent/chained_call_rb.html
+- rdoc/files/lib/new_relic/agent/collection_helper_rb.html
+- rdoc/files/lib/new_relic/agent/error_collector_rb.html
+- rdoc/files/lib/new_relic/agent/instrumentation/active_merchant_rb.html
+- rdoc/files/lib/new_relic/agent/instrumentation/active_record_instrumentation_rb.html
+- rdoc/files/lib/new_relic/agent/instrumentation/authlogic_rb.html
+- rdoc/files/lib/new_relic/agent/instrumentation/controller_instrumentation_rb.html
+- rdoc/files/lib/new_relic/agent/instrumentation/data_mapper_rb.html
+- rdoc/files/lib/new_relic/agent/instrumentation/delayed_job_instrumentation_rb.html
+- rdoc/files/lib/new_relic/agent/instrumentation/memcache_rb.html
+- rdoc/files/lib/new_relic/agent/instrumentation/merb/controller_rb.html
+- rdoc/files/lib/new_relic/agent/instrumentation/merb/errors_rb.html
+- rdoc/files/lib/new_relic/agent/instrumentation/metric_frame_rb.html
+- rdoc/files/lib/new_relic/agent/instrumentation/net_rb.html
+- rdoc/files/lib/new_relic/agent/instrumentation/passenger_instrumentation_rb.html
+- rdoc/files/lib/new_relic/agent/instrumentation/rack_rb.html
+- rdoc/files/lib/new_relic/agent/instrumentation/rails/action_controller_rb.html
+- rdoc/files/lib/new_relic/agent/instrumentation/rails/action_web_service_rb.html
+- rdoc/files/lib/new_relic/agent/instrumentation/rails/errors_rb.html
+- rdoc/files/lib/new_relic/agent/instrumentation/sinatra_rb.html
+- rdoc/files/lib/new_relic/agent/method_tracer_rb.html
+- rdoc/files/lib/new_relic/agent/sampler_rb.html
+- rdoc/files/lib/new_relic/agent/samplers/cpu_sampler_rb.html
+- rdoc/files/lib/new_relic/agent/samplers/delayed_job_lock_sampler_rb.html
+- rdoc/files/lib/new_relic/agent/samplers/memory_sampler_rb.html
+- rdoc/files/lib/new_relic/agent/samplers/object_sampler_rb.html
+- rdoc/files/lib/new_relic/agent/shim_agent_rb.html
+- rdoc/files/lib/new_relic/agent/stats_engine/metric_stats_rb.html
+- rdoc/files/lib/new_relic/agent/stats_engine/samplers_rb.html
+- rdoc/files/lib/new_relic/agent/stats_engine/transactions_rb.html
+- rdoc/files/lib/new_relic/agent/stats_engine_rb.html
+- rdoc/files/lib/new_relic/agent/transaction_sampler_rb.html
+- rdoc/files/lib/new_relic/agent/worker_loop_rb.html
+- rdoc/files/lib/new_relic/agent_rb.html
+- rdoc/files/lib/new_relic/commands/deployments_rb.html
+- rdoc/files/lib/new_relic/commands/new_relic_commands_rb.html
+- rdoc/files/lib/new_relic/control/external_rb.html
+- rdoc/files/lib/new_relic/control/merb_rb.html
+- rdoc/files/lib/new_relic/control/rails_rb.html
+- rdoc/files/lib/new_relic/control/ruby_rb.html
+- rdoc/files/lib/new_relic/control/sinatra_rb.html
+- rdoc/files/lib/new_relic/control_rb.html
+- rdoc/files/lib/new_relic/delayed_job_injection_rb.html
+- rdoc/files/lib/new_relic/histogram_rb.html
+- rdoc/files/lib/new_relic/local_environment_rb.html
+- rdoc/files/lib/new_relic/merbtasks_rb.html
+- rdoc/files/lib/new_relic/metric_data_rb.html
+- rdoc/files/lib/new_relic/metric_parser/action_mailer_rb.html
+- rdoc/files/lib/new_relic/metric_parser/active_merchant_rb.html
+- rdoc/files/lib/new_relic/metric_parser/active_record_rb.html
+- rdoc/files/lib/new_relic/metric_parser/controller_cpu_rb.html
+- rdoc/files/lib/new_relic/metric_parser/controller_rb.html
+- rdoc/files/lib/new_relic/metric_parser/errors_rb.html
+- rdoc/files/lib/new_relic/metric_parser/external_rb.html
+- rdoc/files/lib/new_relic/metric_parser/mem_cache_rb.html
+- rdoc/files/lib/new_relic/metric_parser/other_transaction_rb.html
+- rdoc/files/lib/new_relic/metric_parser/view_rb.html
+- rdoc/files/lib/new_relic/metric_parser/web_frontend_rb.html
+- rdoc/files/lib/new_relic/metric_parser/web_service_rb.html
+- rdoc/files/lib/new_relic/metric_parser_rb.html
+- rdoc/files/lib/new_relic/metric_spec_rb.html
+- rdoc/files/lib/new_relic/metrics_rb.html
+- rdoc/files/lib/new_relic/noticed_error_rb.html
+- rdoc/files/lib/new_relic/rack/metric_app_rb.html
+- rdoc/files/lib/new_relic/rack_app_rb.html
+- rdoc/files/lib/new_relic/recipes_rb.html
+- rdoc/files/lib/new_relic/stats_rb.html
+- rdoc/files/lib/new_relic/transaction_analysis_rb.html
+- rdoc/files/lib/new_relic/transaction_sample_rb.html
+- rdoc/files/lib/new_relic/version_rb.html
+- rdoc/files/lib/new_relic_api_rb.html
+- rdoc/files/lib/newrelic_rpm_rb.html
+- rdoc/files/lib/tasks/all_rb.html
+- rdoc/fr_class_index.html
+- rdoc/fr_file_index.html
+- rdoc/fr_method_index.html
+- rdoc/index.html
+- rdoc/rdoc-style.css
 - recipes/newrelic.rb
 - test/active_record_fixtures.rb
 - test/config/newrelic.yml