ghazel-newrelic_rpm 3.1.0.1 → 3.4.0.2

data/lib/new_relic/transaction_sample/segment.rb

@@ -15,11 +15,13 @@ module NewRelic
         @metric_name = metric_name || '<unknown>'
         @segment_id = segment_id || object_id
       end
-
+      
+      # sets the final timestamp on a segment to indicate the exit
+      # point of the segment
       def end_trace(timestamp)
         @exit_timestamp = timestamp
       end
-
+      
       def add_called_segment(s)
         @called_segments ||= []
         @called_segments << s
@@ -30,7 +32,7 @@ module NewRelic
         to_debug_str(0)
       end
 
-      def to_json
+      def to_json(options={})
         hash = {
           :entry_timestamp => @entry_timestamp,
           :exit_timestamp => @exit_timestamp,
@@ -95,12 +97,15 @@ module NewRelic
         end
         d
       end
+      
       def count_segments
         count = 1
         called_segments.each { | seg | count  += seg.count_segments }
         count
       end
-      # Walk through the tree and truncate the segments
+      
+      # Walk through the tree and truncate the segments in a
+      # depth-first manner
       def truncate(max)
         return 1 unless @called_segments
         total, self.called_segments = truncate_each_child(max - 1)
@@ -148,6 +153,21 @@ module NewRelic
         end
       end
 
+      # call the provided block for this segment and each
+      # of the called segments while keeping track of nested segments
+      def each_segment_with_nest_tracking(&block)
+        summary = block.call self
+        summary.current_nest_count += 1 if summary
+
+        if @called_segments
+          @called_segments.each do |segment|
+            segment.each_segment_with_nest_tracking(&block)
+          end
+        end
+
+        summary.current_nest_count -= 1 if summary
+      end
+
       def find_segment(id)
         return self if @segment_id == id
         called_segments.each do |segment|
@@ -156,88 +176,20 @@ module NewRelic
         end
         nil
       end
-
-      # Perform this in the runtime environment of a managed
-      # application, to explain the sql statement(s) executed within a
-      # segment of a transaction sample. Returns an array of
-      # explanations (which is an array rows consisting of an array of
-      # strings for each column returned by the the explain query)
-      # Note this happens only for statements whose execution time
-      # exceeds a threshold (e.g. 500ms) and only within the slowest
-      # transaction in a report period, selected for shipment to New
-      # Relic
+      
       def explain_sql
-        sql = params[:sql]
-        return nil unless sql && params[:connection_config]
-        statements = sql.split(";\n")
-        statements.map! do |statement|
-          # a small sleep to make sure we yield back to the parent
-          # thread regularly, if there are many explains
-          sleep(0.0001)
-          explain_statement(statement, params[:connection_config])
-        end
-        statements.compact!
-        statements
-      end
-
-      def explain_statement(statement, config)
-        if is_select?(statement)
-          handle_exception_in_explain do
-            connection = NewRelic::TransactionSample.get_connection(config)
-            process_resultset(connection.execute("EXPLAIN #{statement}")) if connection
-          end
-        end
+        NewRelic::Agent::Database.explain_sql(params[:sql],
+                                              params[:connection_config])
       end
-
-      def is_select?(statement)
-        # split the string into at most two segments on the
-        # system-defined field separator character
-        first_word, rest_of_statement = statement.split($;, 2)
-        (first_word.upcase == 'SELECT')
-      end
-
-      def process_resultset(items)
-        # The resultset type varies for different drivers.  Only thing you can count on is
-        # that it implements each.  Also: can't use select_rows because the native postgres
-        # driver doesn't know that method.
-
-        if items.respond_to?(:each)
-          rows = []
-          items.each do |row|
-            columns = []
-            row.each do |column|
-              columns << column.to_s
-            end
-            rows << columns
-          end
-          rows
-        else
-          [items]
-        end
-      end
-
-
-      def handle_exception_in_explain
-        yield
-      rescue Exception => e
-        begin
-          # guarantees no throw from explain_sql
-          NewRelic::Control.instance.log.error("Error getting explain plan: #{e.message}")
-          NewRelic::Control.instance.log.debug(e.backtrace.join("\n"))
-        rescue Exception
-          # double exception. throw up your hands
-        end
+      
+      def obfuscated_sql
+        NewRelic::Agent::Database.obfuscate_sql(params[:sql])
       end
-
-
+      
       def params=(p)
         @params = p
       end
 
-      def obfuscated_sql
-        TransactionSample.obfuscate_sql(params[:sql])
-      end
-
       def called_segments=(segments)
         @called_segments = segments
       end

data/lib/new_relic/version.rb

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

data/lib/newrelic_rpm.rb

@@ -18,7 +18,7 @@
 # directly.
 #
 require 'new_relic/control'
-if defined? Merb
+if defined?(Merb) && defined?(Merb::BootLoader)
   module NewRelic
     class MerbBootLoader < Merb::BootLoader
       after Merb::BootLoader::ChooseAdapter

data/newrelic.yml

@@ -63,7 +63,7 @@ common: &default_settings
   # root directory (may be relative or absolute, e.g. 'log/' or
   # '/var/log/') The agent will attempt to create this directory if it
   # does not exist.
-  # log_file_path: 'log/'
+  # log_file_path: 'log'
   
   # Optionally set the name of the log file, defaults to 'newrelic_agent.log'
   # log_file_name: 'newrelic_agent.log'
@@ -96,7 +96,7 @@ common: &default_settings
   # as Tolerating transactions; and more than four times the apdex_t
   # value as Frustrating transactions. 
   # For more about the Apdex standard, see
-  # http://support.newrelic.com/faqs/general/apdex
+  # http://newrelic.com/docs/general/apdex
 
   apdex_t: 0.5
   

data/newrelic_rpm.gemspec

@@ -1,24 +1,18 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{ghazel-newrelic_rpm}
-  s.version = "3.1.0.1"
+  s.name = "ghazel-newrelic_rpm"
+  s.version = "3.4.0.2"
 
-  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-06-15}
-  s.description = %q{New Relic is a performance management system, developed by New Relic,
-Inc (http://www.newrelic.com).  New Relic provides you with deep
-information about the performance of your web application as it runs
-in production. The New Relic Ruby Agent is dual-purposed as a either a
-Gem or plugin, hosted on
-http://github.com/newrelic/rpm/
-}
-  s.email = %q{support@newrelic.com}
-  s.executables = ["newrelic_cmd", "newrelic", "mongrel_rpm"]
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Bill Kayser", "Jon Guymon", "Justin George", "Darin Swanson"]
+  s.date = "2012-06-25"
+  s.description = "New Relic is a performance management system, developed by New Relic,\nInc (http://www.newrelic.com).  New Relic provides you with deep\ninformation about the performance of your web application as it runs\nin production. The New Relic Ruby Agent is dual-purposed as a either a\nGem or plugin, hosted on\nhttp://github.com/newrelic/rpm/\n"
+  s.email = "support@newrelic.com"
+  s.executables = ["mongrel_rpm", "newrelic", "newrelic_cmd"]
   s.extra_rdoc_files = [
     "CHANGELOG",
     "LICENSE",
@@ -44,9 +38,11 @@ http://github.com/newrelic/rpm/
     "lib/new_relic/agent/browser_monitoring.rb",
     "lib/new_relic/agent/busy_calculator.rb",
     "lib/new_relic/agent/chained_call.rb",
+    "lib/new_relic/agent/database.rb",
     "lib/new_relic/agent/error_collector.rb",
     "lib/new_relic/agent/instrumentation.rb",
     "lib/new_relic/agent/instrumentation/active_merchant.rb",
+    "lib/new_relic/agent/instrumentation/active_record.rb",
     "lib/new_relic/agent/instrumentation/acts_as_solr.rb",
     "lib/new_relic/agent/instrumentation/authlogic.rb",
     "lib/new_relic/agent/instrumentation/controller_instrumentation.rb",
@@ -63,25 +59,31 @@ http://github.com/newrelic/rpm/
     "lib/new_relic/agent/instrumentation/rack.rb",
     "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/active_record_instrumentation.rb",
     "lib/new_relic/agent/instrumentation/rails/errors.rb",
     "lib/new_relic/agent/instrumentation/rails3/action_controller.rb",
-    "lib/new_relic/agent/instrumentation/rails3/active_record_instrumentation.rb",
     "lib/new_relic/agent/instrumentation/rails3/errors.rb",
+    "lib/new_relic/agent/instrumentation/resque.rb",
     "lib/new_relic/agent/instrumentation/sinatra.rb",
     "lib/new_relic/agent/instrumentation/sunspot.rb",
     "lib/new_relic/agent/instrumentation/unicorn_instrumentation.rb",
+    "lib/new_relic/agent/instrumentation/rainbows_instrumentation.rb",
     "lib/new_relic/agent/method_tracer.rb",
+    "lib/new_relic/agent/new_relic_service.rb",
+    "lib/new_relic/agent/pipe_channel_manager.rb",
+    "lib/new_relic/agent/pipe_service.rb",
     "lib/new_relic/agent/sampler.rb",
     "lib/new_relic/agent/samplers/cpu_sampler.rb",
-    "lib/new_relic/agent/samplers/delayed_job_lock_sampler.rb",
+    "lib/new_relic/agent/samplers/delayed_job_sampler.rb",
     "lib/new_relic/agent/samplers/memory_sampler.rb",
     "lib/new_relic/agent/samplers/object_sampler.rb",
     "lib/new_relic/agent/shim_agent.rb",
+    "lib/new_relic/agent/sql_sampler.rb",
     "lib/new_relic/agent/stats_engine.rb",
+    "lib/new_relic/agent/stats_engine/gc_profiler.rb",
     "lib/new_relic/agent/stats_engine/metric_stats.rb",
     "lib/new_relic/agent/stats_engine/samplers.rb",
     "lib/new_relic/agent/stats_engine/transactions.rb",
+    "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/worker_loop.rb",
@@ -92,6 +94,7 @@ http://github.com/newrelic/rpm/
     "lib/new_relic/control.rb",
     "lib/new_relic/control/class_methods.rb",
     "lib/new_relic/control/configuration.rb",
+    "lib/new_relic/control/frameworks.rb",
     "lib/new_relic/control/frameworks/external.rb",
     "lib/new_relic/control/frameworks/merb.rb",
     "lib/new_relic/control/frameworks/rails.rb",
@@ -103,9 +106,9 @@ http://github.com/newrelic/rpm/
     "lib/new_relic/control/logging_methods.rb",
     "lib/new_relic/control/profiling.rb",
     "lib/new_relic/control/server_methods.rb",
-    "lib/new_relic/data_serialization.rb",
     "lib/new_relic/delayed_job_injection.rb",
-    "lib/new_relic/histogram.rb",
+    "lib/new_relic/helper.rb",
+    "lib/new_relic/language_support.rb",
     "lib/new_relic/local_environment.rb",
     "lib/new_relic/merbtasks.rb",
     "lib/new_relic/metric_data.rb",
@@ -114,10 +117,6 @@ http://github.com/newrelic/rpm/
     "lib/new_relic/noticed_error.rb",
     "lib/new_relic/rack/browser_monitoring.rb",
     "lib/new_relic/rack/developer_mode.rb",
-    "lib/new_relic/rack/metric_app.rb",
-    "lib/new_relic/rack/mongrel_rpm.ru",
-    "lib/new_relic/rack/newrelic.yml",
-    "lib/new_relic/rack_app.rb",
     "lib/new_relic/recipes.rb",
     "lib/new_relic/stats.rb",
     "lib/new_relic/timer_lib.rb",
@@ -140,6 +139,7 @@ http://github.com/newrelic/rpm/
     "test/active_record_fixtures.rb",
     "test/config/newrelic.yml",
     "test/config/test_control.rb",
+    "test/fixtures/proc_cpuinfo.txt",
     "test/new_relic/agent/agent/connect_test.rb",
     "test/new_relic/agent/agent/start_test.rb",
     "test/new_relic/agent/agent/start_worker_thread_test.rb",
@@ -150,6 +150,7 @@ http://github.com/newrelic/rpm/
     "test/new_relic/agent/beacon_configuration_test.rb",
     "test/new_relic/agent/browser_monitoring_test.rb",
     "test/new_relic/agent/busy_calculator_test.rb",
+    "test/new_relic/agent/database_test.rb",
     "test/new_relic/agent/error_collector/notice_error_test.rb",
     "test/new_relic/agent/error_collector_test.rb",
     "test/new_relic/agent/instrumentation/active_record_instrumentation_test.rb",
@@ -166,27 +167,38 @@ http://github.com/newrelic/rpm/
     "test/new_relic/agent/method_tracer/instance_methods/trace_execution_scoped_test.rb",
     "test/new_relic/agent/method_tracer_test.rb",
     "test/new_relic/agent/mock_scope_listener.rb",
+    "test/new_relic/agent/new_relic_service_test.rb",
+    "test/new_relic/agent/pipe_channel_manager_test.rb",
+    "test/new_relic/agent/pipe_service_test.rb",
     "test/new_relic/agent/rpm_agent_test.rb",
     "test/new_relic/agent/sampler_test.rb",
     "test/new_relic/agent/shim_agent_test.rb",
+    "test/new_relic/agent/sql_sampler_test.rb",
     "test/new_relic/agent/stats_engine/metric_stats/harvest_test.rb",
     "test/new_relic/agent/stats_engine/metric_stats_test.rb",
     "test/new_relic/agent/stats_engine/samplers_test.rb",
     "test/new_relic/agent/stats_engine_test.rb",
+    "test/new_relic/agent/transaction_info_test.rb",
     "test/new_relic/agent/transaction_sample_builder_test.rb",
     "test/new_relic/agent/transaction_sampler_test.rb",
     "test/new_relic/agent/worker_loop_test.rb",
+    "test/new_relic/agent_test.rb",
     "test/new_relic/collection_helper_test.rb",
     "test/new_relic/command/deployments_test.rb",
     "test/new_relic/control/class_methods_test.rb",
+    "test/new_relic/control/configuration_test.rb",
     "test/new_relic/control/logging_methods_test.rb",
     "test/new_relic/control_test.rb",
-    "test/new_relic/data_serialization_test.rb",
+    "test/new_relic/delayed_job_injection_test.rb",
+    "test/new_relic/fake_collector.rb",
+    "test/new_relic/fake_service.rb",
     "test/new_relic/local_environment_test.rb",
     "test/new_relic/metric_data_test.rb",
+    "test/new_relic/metric_parser/metric_parser_test.rb",
     "test/new_relic/metric_spec_test.rb",
     "test/new_relic/rack/all_test.rb",
     "test/new_relic/rack/browser_monitoring_test.rb",
+    "test/new_relic/rack/developer_mode_helper_test.rb",
     "test/new_relic/rack/developer_mode_test.rb",
     "test/new_relic/stats_test.rb",
     "test/new_relic/transaction_analysis/segment_summary_test.rb",
@@ -198,6 +210,11 @@ http://github.com/newrelic/rpm/
     "test/new_relic/transaction_sample_subtest_test.rb",
     "test/new_relic/transaction_sample_test.rb",
     "test/new_relic/version_number_test.rb",
+    "test/script/build_test_gem.sh",
+    "test/script/ci.sh",
+    "test/script/ci_agent-tests_runner.sh",
+    "test/script/ci_bench.sh",
+    "test/script/ci_multiverse_runner.sh",
     "test/test_contexts.rb",
     "test/test_helper.rb",
     "ui/helpers/developer_mode_helper.rb",
@@ -232,11 +249,8 @@ http://github.com/newrelic/rpm/
     "ui/views/newrelic/show_source.rhtml",
     "ui/views/newrelic/threads.rhtml",
     "vendor/gems/dependency_detection-0.0.1.build/LICENSE",
-    "vendor/gems/dependency_detection-0.0.1.build/README",
     "vendor/gems/dependency_detection-0.0.1.build/lib/dependency_detection.rb",
     "vendor/gems/dependency_detection-0.0.1.build/lib/dependency_detection/version.rb",
-    "vendor/gems/metric_parser-0.1.0.pre1/LICENSE",
-    "vendor/gems/metric_parser-0.1.0.pre1/README",
     "vendor/gems/metric_parser-0.1.0.pre1/lib/metric_parser.rb",
     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser.rb",
     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/action_mailer.rb",
@@ -281,35 +295,13 @@ http://github.com/newrelic/rpm/
     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/web_service.rb",
     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/web_transaction.rb"
   ]
-  s.homepage = %q{http://www.github.com/newrelic/rpm}
-  s.post_install_message = %q{
-PLEASE NOTE:
-
-Developer Mode is now a Rack middleware.
-
-Developer Mode is no longer available in Rails 2.1 and earlier.
-However, starting in version 2.12 you can use Developer Mode in any
-Rack based framework, in addition to Rails.  To install developer mode
-in a non-Rails application, just add NewRelic::Rack::DeveloperMode to
-your middleware stack.
-
-If you are using JRuby, we recommend using at least version 1.4 or 
-later because of issues with the implementation of the timeout library.
-
-Refer to the README.md file for more information.
-
-Please see http://github.com/newrelic/rpm/blob/master/CHANGELOG
-for a complete description of the features and enhancements available
-in version 3.1 of the Ruby Agent.
-  
-}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "New Relic Ruby Agent"]
+  s.homepage = "http://www.github.com/newrelic/rpm"
+  s.post_install_message = "\nPLEASE NOTE:\n\nDeveloper Mode is now a Rack middleware.\n\nDeveloper Mode is no longer available in Rails 2.1 and earlier.\nHowever, starting in version 2.12 you can use Developer Mode in any\nRack based framework, in addition to Rails.  To install developer mode\nin a non-Rails application, just add NewRelic::Rack::DeveloperMode to\nyour middleware stack.\n\nIf you are using JRuby, we recommend using at least version 1.4 or \nlater because of issues with the implementation of the timeout library.\n\nRefer to the README.md file for more information.\n\nPlease see http://github.com/newrelic/rpm/blob/master/CHANGELOG\nfor a complete description of the features and enhancements available\nin version 3.4 of the Ruby Agent.\n  \n"
+  s.rdoc_options = ["--charset=UTF-8", "--line-numbers", "--inline-source", "--title", "New Relic Ruby Agent"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{New Relic Ruby Agent}
+  s.summary = "New Relic Ruby Agent"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/test/active_record_fixtures.rb

@@ -12,7 +12,7 @@ module ActiveRecordFixtures
     ActiveRecordFixtures::Order.teardown
     begin
       super
-    rescue Exception => e
+    rescue => e
     end
   end
   class Order < ActiveRecord::Base
@@ -30,7 +30,7 @@ module ActiveRecordFixtures
 
     def self.check_for_table
       connection.table_exists?(self.table_name)
-    rescue Exception => e
+    rescue => e
       false
     end
     
@@ -66,7 +66,7 @@ module ActiveRecordFixtures
     end
     def self.check_for_table
       connection.table_exists?(self.table_name) && connection.table_exists?('orders_shipments')
-    rescue Exception => e
+    rescue => e
       false
     end