dolores_rpm 3.2.0.6 → 3.3.4.fork

data/test/script/ci.sh

@@ -0,0 +1,94 @@
+#!/bin/bash
+
+# Script to run test suites in CI or in development mode.  This script handles
+# checking out test dependencies (currently rpm_test_app and it's dependencies)
+# and executing them.
+#
+# It relies on 3 environment variables:
+#
+# RUBY - The rvm ruby you want to use (e.g. 1.8.7, ree, jruby)
+#
+# BRANCH - The rpm_test_app branch you want to use (e.g. rails20, rails31)
+#
+# RPM_TEST_APP_CLONE_URL - where to clone the test app from (e.g.
+# git://github.com/newrelic/rpm_test_app.git, /path/in/my/filesystem)
+#
+# Example usage:
+# RPM_TEST_APP_CLONE_URL=git://github.com/newrelic/rpm_test_app.git \
+# RUBY=ree BRANCH=rails20 test/script/ci.sh
+#
+# RPM_TEST_APP_CLONE_URL=git://github.com/newrelic/rpm_test_app.git \
+# RUBY=ree BRANCH=rails20 test/script/ci.sh
+#
+# RPM_TEST_APP_CLONE_URL=~/dev/rpm_test_app/ \
+# RUBY=jruby BRANCH=rails22 test/script/ci.sh
+
+echo "Executing $0"
+echo "Running in $(pwd)"
+
+
+
+# print commands in this script as they're invoked
+# set -x
+# fail if any command fails
+set -e
+
+# check for require environment variables
+if [ "x$RUBY" == "x" ]; then
+  echo '$RUBY is undefined'
+  exit 1
+fi
+if [ "x$BRANCH" == "x" ]; then
+  echo '$BRANCH is undefined'
+  exit 1
+fi
+if [ "x$RPM_TEST_APP_CLONE_URL" == "x" ]; then
+  echo '$RPM_TEST_APP_CLONE_URL is undefined'
+  exit 1
+fi
+
+. "$HOME/.rvm/scripts/rvm"
+rvm use $RUBY || rvm install $RUBY
+echo `which ruby`
+
+# make sure that we're in the project root
+script_dirname=`dirname $0`
+cd "$script_dirname/../../"
+pwd
+
+rm -rf tmp
+mkdir -p tmp
+cd tmp
+git clone --depth=1 $RPM_TEST_APP_CLONE_URL rpm_test_app
+cd rpm_test_app
+git checkout -t origin/$BRANCH || git checkout $BRANCH
+mkdir -p log
+mkdir -p tmp
+if [ "x$BRANCH" == "xrails20" ]; then
+  printf "\e[0;31;49mWarning:\e[0m "
+  echo "Testing against the rails20 branch requires your changes to be committed. Uncommitted changes will not be used."
+  mkdir -p vendor/plugins
+  git clone ../.. vendor/plugins/newrelic_rpm
+else
+  perl -p -i'.bak' -e 's#gem .newrelic_rpm.*$#gem "newrelic_rpm", :path => "\.\.\/\.\.\/"#' Gemfile
+fi
+
+rvm --force gemset delete ruby_agent_tests_$BRANCH
+rvm gemset create ruby_agent_tests_$BRANCH
+rvm gemset use ruby_agent_tests_$BRANCH
+
+if [ "x$RUBY" == "x1.8.6" ]; then
+  # Bundler 1.1 dropped support for ruby 1.8.6
+  gem install bundler -v'~>1.0.0' --no-rdoc --no-ri
+else
+  gem install bundler --no-rdoc --no-ri
+fi
+
+
+export RAILS_ENV=test
+bundle
+bundle exec rake --trace db:create:all ci:setup:testunit test:newrelic
+
+
+
+

data/test/script/ci_bench.sh

@@ -0,0 +1,52 @@
+#!/bin/bash
+
+# Script to benchmark the ruby agent under various versions of ruby in ci.
+
+echo "Executing $0"
+echo "Running in $(pwd)"
+
+# print commands in this script as they're invoked
+# set -x
+# fail if any command fails
+set -e
+
+# check for require environment variables
+if [ "x$RUBY" == "x" ]; then
+  echo '$RUBY is undefined'
+  exit 1
+fi
+
+
+. "$HOME/.rvm/scripts/rvm"
+rvm use $RUBY || rvm install $RUBY
+echo `which ruby`
+
+# make sure that we're in the project root
+script_dirname=`dirname $0`
+cd "$script_dirname/../../"
+pwd
+
+rm -rf tmp
+mkdir -p tmp
+cd tmp
+git clone --depth=1 git@github.com:newrelic/agent_prof.git agent_prof
+cd agent_prof
+
+perl -p -i'.bak' -e 's#gem +.newrelic_rpm.*$#gem "newrelic_rpm", :path => "\.\.\/\.\.\/"#' Gemfile
+
+rvm --force gemset delete ruby_bench_$RUBY
+rvm gemset create ruby_bench_$RUBY
+rvm gemset use ruby_bench_$RUBY
+
+if [ "x$RUBY" == "x1.8.6" ]; then
+  # Bundler 1.1 dropped support for ruby 1.8.6
+  gem install bundler -v'~>1.0.0' --no-rdoc --no-ri
+else
+  gem install bundler --no-rdoc --no-ri
+fi
+
+bundle
+script/run
+bundle exec script/post_log_to_dashboard
+
+

data/test/test_helper.rb

@@ -14,6 +14,7 @@ require 'rubygems'
 
 begin
   require 'config/environment'
+  # require File.join(File.dirname(__FILE__),'..','..','rpm_test_app','config','environment')
   begin
     require 'test_help'
   rescue LoadError

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

@@ -21,6 +21,11 @@ module DependencyDetection
     @@items.find {|i| i.name == name }
   end
 
+  def installed?(name)
+    item = dependency_by_name(name)
+    item && item.executed
+  end
+
   class Dependent
     attr_reader :executed
     attr_reader :name

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
 
       # --

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: dolores_rpm
 version: !ruby/object:Gem::Version 
-  hash: 99
-  prerelease: 
+  hash: -101810583
+  prerelease: 6
   segments: 
   - 3
-  - 2
-  - 0
-  - 6
-  version: 3.2.0.6
+  - 3
+  - 4
+  - fork
+  version: 3.3.4.fork
 platform: ruby
 authors: 
 - Bill Kayser
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-10 00:00:00 Z
+date: 2012-04-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: jeweler
@@ -71,8 +71,8 @@ description: |
 email: support@newrelic.com
 executables: 
 - mongrel_rpm
-- newrelic_cmd
 - newrelic
+- newrelic_cmd
 extensions: []
 
 extra_rdoc_files: 
@@ -90,10 +90,6 @@ files:
 - cert/cacert.pem
 - cert/oldsite.pem
 - cert/site.pem
-- dolores_rpm-3.2.0.2.gem
-- dolores_rpm-3.2.0.5.gem
-- dolores_rpm-3.3.4.fork.gem
-- dolores_rpm.gemspec
 - install.rb
 - lib/conditional_vendored_dependency_detection.rb
 - lib/conditional_vendored_metric_parser.rb
@@ -107,6 +103,7 @@ files:
 - 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
@@ -123,10 +120,8 @@ 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/sinatra.rb
 - lib/new_relic/agent/instrumentation/sunspot.rb
@@ -140,9 +135,11 @@ files:
 - 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
@@ -193,10 +190,12 @@ files:
 - lib/tasks/install.rake
 - lib/tasks/tests.rake
 - newrelic.yml
+- dolores_rpm.gemspec
 - recipes/newrelic.rb
 - 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
@@ -232,6 +231,7 @@ files:
 - 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
@@ -246,6 +246,7 @@ files:
 - test/new_relic/delayed_job_injection_test.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
@@ -261,6 +262,9 @@ 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_bench.sh
 - test/test_contexts.rb
 - test/test_helper.rb
 - ui/helpers/developer_mode_helper.rb
@@ -362,7 +366,7 @@ 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.2 of the Ruby Agent.
+  in version 3.3 of the Ruby Agent.
     
 
 rdoc_options: 
@@ -384,12 +388,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 

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

@@ -1,115 +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)
-                NewRelic::Agent.instance.sql_sampler.notice_sql(sql, metric, supported_config, (Time.now - t0).to_f)
-              end
-            end
-          end
-        end
-
-      end
-    end
-  end
-end
-
-DependencyDetection.defer do
-  @name = :rails2_active_record
-  
-  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
-    NewRelic::Agent.logger.debug 'Installing Rails 2 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,122 +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(*args, &block)
-
-          return log_without_newrelic_instrumentation(*args, &block) unless NewRelic::Agent.is_execution_traced?
-
-          sql, name, binds = args
-
-          # 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', 'count', 'exists' 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(*args, &block)
-          else
-            metrics = [metric, "ActiveRecord/all"]
-            metrics << "ActiveRecord/#{metric_name}" if metric_name
-            self.class.trace_execution_scoped(metrics) do
-              sql, name, binds = args
-              t0 = Time.now
-              begin
-                log_without_newrelic_instrumentation(*args, &block)
-              ensure
-                NewRelic::Agent.instance.transaction_sampler.notice_sql(sql, supported_config, (Time.now - t0).to_f)
-                NewRelic::Agent.instance.sql_sampler.notice_sql(sql, metric, supported_config, (Time.now - t0).to_f)
-              end
-            end
-          end
-        end
-
-      end
-    end
-  end
-end
-
-DependencyDetection.defer do
-  @name = :rails3_active_record
-  
-  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
-    NewRelic::Agent.logger.debug 'Installing Rails 3 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