ghazel-newrelic_rpm 3.1.0.1 → 3.4.0.2

data/vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/metric_parser.rb

@@ -8,12 +8,22 @@ module NewRelic
       # Load in the parsers classes in the plugin:
       Dir[File.join(File.dirname(__FILE__), "metric_parser", "*.rb")].each { | file | require file }
 
+      def self.category_is_constant(category)
+        @string_constants ||= (
+          NewRelic::MetricParser.constants.inject({}){|memo, const| memo[const.to_s] = true; memo}
+        )
+        @string_constants[category]
+      end
       # return a string that is parsable via the Metric parser APIs
       def self.for_metric_named(s)
         category = (s =~ /^([^\/]*)/) && $1
         parser_class = self
-        if category
-          parser_class = NewRelic::MetricParser.const_get(category) if (NewRelic::MetricParser.const_defined?(category) rescue nil)
+        if category_is_constant(category)
+          begin
+            parser_class = NewRelic::MetricParser.const_get(category)
+          rescue
+            nil
+          end
         end
         parser_class.new s
       end
@@ -71,9 +81,12 @@ module NewRelic
         segments[0]
       end
 
+
+      EMPTY_SEGMENTS_HASH = [].freeze
+      SEGMENTS_CACHE = {}
       def segments
-        return [] if !name
-        @segments ||= name.split(SEPARATOR).freeze
+        name || (return EMPTY_SEGMENTS_HASH)
+        SEGMENTS_CACHE[name] ||= name.split(SEPARATOR).freeze
       end
 
       # --

data/vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/view.rb

@@ -16,6 +16,8 @@ module NewRelic
           "#{file_name(segments[-2])} Template"
         when "Partial"
           "#{file_name(segments[-2])} Partial"
+        when "Collection"
+          "#{file_name(segments[-2])} Collection"
         when ".rhtml Processing"
           "ERB compilation"
         else
@@ -28,6 +30,8 @@ module NewRelic
           "#{file_name(segments[1..-2].join(NewRelic::MetricParser::MetricParser::SEPARATOR))} Template"
         when "Partial"
           "#{file_name(segments[1..-2].join(NewRelic::MetricParser::MetricParser::SEPARATOR))} Partial"
+        when "Collection"
+          "#{file_name(segments[1..-2].join(NewRelic::MetricParser::MetricParser::SEPARATOR))} Collection"
         when ".rhtml Processing"
           "ERB compilation"
         else

metadata

@@ -1,34 +1,33 @@
 --- !ruby/object:Gem::Specification 
 name: ghazel-newrelic_rpm
 version: !ruby/object:Gem::Version 
-  hash: 117
-  prerelease: 
+  prerelease: false
   segments: 
   - 3
-  - 1
+  - 4
   - 0
-  - 1
-  version: 3.1.0.1
+  - 2
+  version: 3.4.0.2
 platform: ruby
 authors: 
 - Bill Kayser
+- Jon Guymon
 - Justin George
+- Darin Swanson
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-06-15 00:00:00 -07:00
+date: 2012-06-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: jeweler
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -38,11 +37,9 @@ dependencies:
   name: mocha
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -52,11 +49,9 @@ dependencies:
   name: shoulda
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -72,9 +67,9 @@ description: |
 
 email: support@newrelic.com
 executables: 
-- newrelic_cmd
-- newrelic
 - mongrel_rpm
+- newrelic
+- newrelic_cmd
 extensions: []
 
 extra_rdoc_files: 
@@ -101,9 +96,11 @@ files:
 - 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
@@ -120,25 +117,31 @@ files:
 - 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
@@ -149,6 +152,7 @@ files:
 - 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
@@ -160,9 +164,9 @@ files:
 - 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
@@ -171,10 +175,6 @@ files:
 - 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
@@ -197,6 +197,7 @@ files:
 - 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
@@ -207,6 +208,7 @@ files:
 - 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
@@ -223,27 +225,38 @@ files:
 - 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
@@ -255,6 +268,11 @@ files:
 - 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
@@ -289,11 +307,8 @@ files:
 - 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
@@ -360,10 +375,11 @@ post_install_message: |
   
   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.
+  in version 3.4 of the Ruby Agent.
     
 
 rdoc_options: 
+- --charset=UTF-8
 - --line-numbers
 - --inline-source
 - --title
@@ -371,27 +387,25 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: New Relic Ruby Agent

data/lib/new_relic/agent/instrumentation/rails/active_record_instrumentation.rb

@@ -1,108 +0,0 @@
-module NewRelic
-  module Agent
-    module Instrumentation
-      module ActiveRecordInstrumentation
-
-        def self.included(instrumented_class)
-          instrumented_class.class_eval do
-            alias_method :log_without_newrelic_instrumentation, :log
-            alias_method :log, :log_with_newrelic_instrumentation
-            protected :log
-          end
-        end
-
-        def log_with_newrelic_instrumentation(sql, name, &block)
-
-          return log_without_newrelic_instrumentation(sql, name, &block) unless NewRelic::Agent.is_execution_traced?
-
-          # Capture db config if we are going to try to get the explain plans
-          if (defined?(ActiveRecord::ConnectionAdapters::MysqlAdapter) && self.is_a?(ActiveRecord::ConnectionAdapters::MysqlAdapter)) ||
-              (defined?(ActiveRecord::ConnectionAdapters::Mysql2Adapter) && self.is_a?(ActiveRecord::ConnectionAdapters::Mysql2Adapter)) ||
-              (defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter) && self.is_a?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter))
-            supported_config = @config
-          end
-          if name && (parts = name.split " ") && parts.size == 2
-            model = parts.first
-            operation = parts.last.downcase
-            metric_name = case operation
-                          when 'load' then 'find'
-                          when 'indexes', 'columns' then nil # fall back to DirectSQL
-                          when 'destroy', 'find', 'save', 'create' then operation
-                          when 'update' then 'save'
-                          else
-                            if model == 'Join'
-                              operation
-                            end
-                          end
-            metric = "ActiveRecord/#{model}/#{metric_name}" if metric_name
-          end
-
-          if metric.nil?
-            metric = NewRelic::Agent::Instrumentation::MetricFrame.database_metric_name
-            if metric.nil?
-              if sql =~ /^(select|update|insert|delete|show)/i
-                # Could not determine the model/operation so let's find a better
-                # metric.  If it doesn't match the regex, it's probably a show
-                # command or some DDL which we'll ignore.
-                metric = "Database/SQL/#{$1.downcase}"
-              else
-                metric = "Database/SQL/other"
-              end
-            end
-          end
-
-          if !metric
-            log_without_newrelic_instrumentation(sql, name, &block)
-          else
-            metrics = [metric, "ActiveRecord/all"]
-            metrics << "ActiveRecord/#{metric_name}" if metric_name
-            self.class.trace_execution_scoped(metrics) do
-              t0 = Time.now
-              begin
-                log_without_newrelic_instrumentation(sql, name, &block)
-              ensure
-                NewRelic::Agent.instance.transaction_sampler.notice_sql(sql, supported_config, (Time.now - t0).to_f)
-              end
-            end
-          end
-        end
-
-      end
-    end
-  end
-end
-
-DependencyDetection.defer do
-  depends_on do
-    defined?(ActiveRecord) && defined?(ActiveRecord::Base)
-  end
-
-  depends_on do
-    defined?(Rails) && Rails::VERSION::MAJOR.to_i == 2
-  end
-
-  depends_on do
-    !NewRelic::Control.instance['skip_ar_instrumentation']
-  end
-
-  depends_on do
-    !NewRelic::Control.instance['disable_activerecord_instrumentation']
-  end
-
-  executes do
-    ActiveRecord::ConnectionAdapters::AbstractAdapter.module_eval do
-      include ::NewRelic::Agent::Instrumentation::ActiveRecordInstrumentation
-    end
-  end
-
-  executes do
-    ActiveRecord::Base.class_eval do
-      class << self
-        add_method_tracer :find_by_sql, 'ActiveRecord/#{self.name}/find_by_sql', :metric => false
-        add_method_tracer :transaction, 'ActiveRecord/#{self.name}/transaction', :metric => false
-      end
-    end
-  end
-end
-
-DependencyDetection.detect!

data/lib/new_relic/agent/instrumentation/rails3/active_record_instrumentation.rb

@@ -1,112 +0,0 @@
-module NewRelic
-  module Agent
-    module Instrumentation
-      module ActiveRecordInstrumentation
-
-        def self.included(instrumented_class)
-          instrumented_class.class_eval do
-            unless instrumented_class.method_defined?(:log_without_newrelic_instrumentation)
-              alias_method :log_without_newrelic_instrumentation, :log
-              alias_method :log, :log_with_newrelic_instrumentation
-              protected :log
-            end
-          end
-        end
-
-        def log_with_newrelic_instrumentation(sql, name, &block)
-
-          return log_without_newrelic_instrumentation(sql, name, &block) unless NewRelic::Agent.is_execution_traced?
-
-          # Capture db config if we are going to try to get the explain plans
-          if (defined?(ActiveRecord::ConnectionAdapters::MysqlAdapter) && self.is_a?(ActiveRecord::ConnectionAdapters::MysqlAdapter)) ||
-              (defined?(ActiveRecord::ConnectionAdapters::Mysql2Adapter) && self.is_a?(ActiveRecord::ConnectionAdapters::Mysql2Adapter)) ||
-              (defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter) && self.is_a?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter))
-            supported_config = @config
-          end
-          if name && (parts = name.split " ") && parts.size == 2
-            model = parts.first
-            operation = parts.last.downcase
-            metric_name = case operation
-                          when 'load' then 'find'
-                          when 'indexes', 'columns' then nil # fall back to DirectSQL
-                          when 'destroy', 'find', 'save', 'create' then operation
-                          when 'update' then 'save'
-                          else
-                            if model == 'Join'
-                              operation
-                            end
-                          end
-            metric = "ActiveRecord/#{model}/#{metric_name}" if metric_name
-          end
-
-          if metric.nil?
-            metric = NewRelic::Agent::Instrumentation::MetricFrame.database_metric_name
-            if metric.nil?
-              if sql =~ /^(select|update|insert|delete|show)/i
-                # Could not determine the model/operation so let's find a better
-                # metric.  If it doesn't match the regex, it's probably a show
-                # command or some DDL which we'll ignore.
-                metric = "Database/SQL/#{$1.downcase}"
-              else
-                metric = "Database/SQL/other"
-              end
-            end
-          end
-
-          if !metric
-            log_without_newrelic_instrumentation(sql, name, &block)
-          else
-            metrics = [metric, "ActiveRecord/all"]
-            metrics << "ActiveRecord/#{metric_name}" if metric_name
-            self.class.trace_execution_scoped(metrics) do
-              t0 = Time.now
-              begin
-                log_without_newrelic_instrumentation(sql, name, &block)
-              ensure
-                NewRelic::Agent.instance.transaction_sampler.notice_sql(sql, supported_config, (Time.now - t0).to_f)
-              end
-            end
-          end
-        end
-
-      end
-    end
-  end
-end
-
-DependencyDetection.defer do
-  depends_on do
-    defined?(ActiveRecord) && defined?(ActiveRecord::Base)
-  end
-
-  depends_on do
-    defined?(Rails) && Rails::VERSION::MAJOR.to_i == 3
-  end
-
-  depends_on do
-    !NewRelic::Control.instance['skip_ar_instrumentation']
-  end
-
-  depends_on do
-    !NewRelic::Control.instance['disable_activerecord_instrumentation']
-  end
-
-  executes do
-    Rails.configuration.after_initialize do
-      ActiveRecord::ConnectionAdapters::AbstractAdapter.module_eval do
-        include ::NewRelic::Agent::Instrumentation::ActiveRecordInstrumentation
-      end
-    end
-  end
-
-  executes do
-    Rails.configuration.after_initialize do
-      ActiveRecord::Base.class_eval do
-        class << self
-          add_method_tracer :find_by_sql, 'ActiveRecord/#{self.name}/find_by_sql', :metric => false
-          add_method_tracer :transaction, 'ActiveRecord/#{self.name}/transaction', :metric => false
-        end
-      end
-    end
-  end
-end