newrelic_rpm 3.3.4.1 → 3.3.5.beta1

data/CHANGELOG

@@ -1,3 +1,13 @@
+v3.3.5.beta1
+ * [FIX] Allow tracing of ! and ? methods
+ * [PERF] Give up after scanning first 50k of the response in RUM
+   auto-instrumentation.
+ * [FIX] Don't raise when extracting metrics from SQL queries with non UTF-8 bytes.
+ * Replaced "Custom/DJ Locked Jobs" metric with new metrics for
+   monitoring DelayedJob: queue_length, failed_jobs, and locked_jobs, all under
+   Workers/DelayedJob.  queue_length is also broken out by queue name or priority
+   depending on the version of DelayedJob deployed.
+
 v3.3.4.1
  * Bug fix when rendering empty collection in Rails 3.1+
 
@@ -17,7 +27,7 @@ v3.3.2
   * Fix for lost database connections when using a forking framework
   * Workaround for RedHat kernel bug which prevented blocking reads of /proc fs
   * Do not trap signals when handling exceptions
-  
+
 v3.3.1
   * improved Ruby 1.8.6 support
   * fix for issues with RAILS_ROOT deprecation warnings
@@ -46,11 +56,11 @@ v3.2.0
   * Fix to mutex lib load issue
   * Performance enhancements (thanks to Jeremy Kemper)
   * Fix overly verbose STDOUT message (thanks to Anselm Helbig)
-  
+
 v3.1.2
   * Fixed some thread safety issues
   * Work around for Ruby 1.8.7 Marshal crash bug
-  * Numerous community patches (Gabriel Horner, Bradley Harris, Diego Garcia, 
+  * Numerous community patches (Gabriel Horner, Bradley Harris, Diego Garcia,
     Tommy Sullivan, Greg Hazel, John Thomas Marino, Paul Elliott, Pan Thomakos)
   * Fixed RUM instrumentation bug
 
@@ -64,13 +74,13 @@ v3.1.1
   * Support for logging to STDOUT
   * Support for Spymemcached client on jruby
 
-v3.1.0 
+v3.1.0
   * Support for aggregating data from short-running
     processes to reduce reporting overhead
   * Numerous bug fixes
   * Increased unit test coverage
 
-v3.0.1 
+v3.0.1
   * Updated Real User Monitoring to reduce javascript size and improve
     compatibility, fix a few known bugs
 
@@ -113,7 +123,7 @@ v2.13.3
   * Dalli instrumentation from Mike Perham (thanks Mike)
   * Datamapper instrumentation from Jordan Ritter (thanks Jordan)
   * Apdex now defaults to 0.5
-    !!! Please be aware that if you are not setting an apdex, 
+    !!! Please be aware that if you are not setting an apdex,
     !!! this will cause a change in the apparent performance of your app.
   * Make metric hashes threadsafe (fixes problems sending metrics in Jruby
     threaded code)
@@ -152,7 +162,7 @@ v2.13.0
     details from web and background transactions occurring outside RPM
   * fixed a bug related to enabling a gold trial / upgrade not sending
     trasaction traces correctly
-    
+
 v2.12.3
   * fix regression in startup sequence
 
@@ -177,7 +187,7 @@ v2.11.2
   * fix for unicorn not reporting when the proc line had 'master' in it
   * fix regression for passenger 2.0 and earlier
   * fix after_fork in the shim
-  
+
 v2.11.1
   * republished gem without generated rdocs
 
@@ -185,18 +195,18 @@ v2.11.0
   * rails3 instrumentation (no developer mode support yet)
   * removed the ensure_worker_thread started and instead defined an after_fork
     handler that will set up the agent properly in forked processes.
-  * change at_exit handler so the shutdown always goes after other shutdown 
+  * change at_exit handler so the shutdown always goes after other shutdown
     handlers
   * add visibility to active record db transactions in the rpm transaction
     traces (thanks to jeremy kemper)
   * fix regression in merb support which caused merb apps not to start
-  * added NewRelic::Agent.logger to the public api to write to the agent 
+  * added NewRelic::Agent.logger to the public api to write to the agent
     log file.
   * optimizations to background thread, controller instrumentation, memory
     usage
   * add logger method to public_api
   * support list notation for ignored exceptions in the newrelic.yml
-    
+
 v2.10.8
   * fix bug in delayed_job instrumentation that caused the job queue sampler
     to run in the wrong place
@@ -206,30 +216,30 @@ v2.10.8
   * fix problem with the Authlogic metric names which caused errors in
     developer mode.  Authlogic metrics now adhere to the convention of
     prefixing the name with  'Custom'
-  * allow more correct overriding of transaction trace settings in the 
+  * allow more correct overriding of transaction trace settings in the
     call to #manual_start
   * simplify WorkerLoop and add better protection for concurrency
   * preliminary support for rails3
-    
+
 v2.10.6
   * fix missing URL and referer on some traced errors and transactions
   * gather traced errors *after* executing the rescue chain in ActionController
   * always load controller instrumentation
   * pick up token validation from newrelic.yml
-  
+
 v2.10.5
   * fix bug in delayed_job instrumentation occurring when there was no DJ log
-  
+
 v2.10.4
   * fix incompatibility with Capistrano 2.5.16
   * strip down URLs reported in transactions and errors to path only
-  
+
 v2.10.3
   * optimization to reduce overhead: move background samplers into foreground thread
   * change default config file to ignore RoutingErrors
   * moved the background task instrumentation into a separate tab in the RPM UI
   * allow override of the RPM application name via NEWRELIC_APP_NAME environment variable
-  * revised Delayed::Job instrumentation so no manual_start is required 
+  * revised Delayed::Job instrumentation so no manual_start is required
   * send buffered data on shutdown
   * expanded support for queue length and queue time
   * remove calls to starts_with to fix Sinatra and non-rails deployments
@@ -241,9 +251,9 @@ v2.10.3
 
 v2.10.2.
   * beta release of 2.10
-  * fix bugs with Sinatra app instrumentation 
+  * fix bugs with Sinatra app instrumentation
   * minor doc updates
-  
+
 v2.10.1.
   * alpha release of 2.10
   * rack support, including metal; ignores 404s; requires a module inclusion (see docs)
@@ -251,14 +261,14 @@ v2.10.1.
   * add API method to abort transaction recording for in-flight transactions
   * remove account management calls from newrelic_api.rb
   * truncating extremely large transaction traces for efficiency
-  * fix error reporting in recipes; add newrelic_rails_env option to recipes to 
+  * fix error reporting in recipes; add newrelic_rails_env option to recipes to
     override the rails env used to pull the app_name out of newrelic.yml
   * added TorqueBox recognition (thanks Bob McWhirter)
   * renamed config settings: enabled => monitor_mode; developer => developer_mode;
     old names will still work in newrelic.yml
   * instrumentation for DelayedJob (thanks Travis Tilley)
-  * added config switches to turn off certain instrumentation when you aren't 
-    interested in the metrics, to save on overhead--see newrelic.yml for details. 
+  * added config switches to turn off certain instrumentation when you aren't
+    interested in the metrics, to save on overhead--see newrelic.yml for details.
   * add profiling support to dev mode; very experimental!
   * add 'multi_threaded' config option to indicate when the app is running
     multi-threaded, so we can disable some instrumentation
@@ -279,13 +289,13 @@ v2.10.1.
   * renamed the dispatcher metric
   * refactored stats_engine code for readability
   * optimization: reduce wakeup times for harvest thread
-  
+
 v2.10.0.
   * alpha release of 2.10
   * support unicorn
   * instrumentation of GC for REE and MRE with GC patch
   * support agent restarting when changes are made to the account
-  * removed #newrelic_notice_error from Object class, replaced by NewRelic::Agent#notic_error 
+  * removed #newrelic_notice_error from Object class, replaced by NewRelic::Agent#notic_error
   * collect histogram statistics
   * add custom parameters to newrelic_notice_error call to display
     extra info for errors
@@ -321,13 +331,13 @@ v2.9.4.
 v2.9.3.
   * fix startup failure in Windows due to memory sampler
   * add JRuby environment information
-   
+
 v2.9.2.
-  * change default apdex_t to 0.5 seconds 
+  * change default apdex_t to 0.5 seconds
   * fix bug in deployments introduced by multi_homed setting
   * support overriding the log in the agent api
   * fix JRuby problem using objectspace
-  * display custom parameters when looking at transactions in dev mode 
+  * display custom parameters when looking at transactions in dev mode
   * display count of sql statements on the list of transactions in dev mode
   * fixes for merb--thanks to Carl Lerche
 
@@ -335,14 +345,14 @@ v2.9.1.
   * add newrelic_ignore_apdex method to controller classes to allow
     you to omit some actions from apdex statistics
   * Add hook for Passenger shutdown events to get more timely shutdown
-    notices; this will help in more accurate memory readings in 
+    notices; this will help in more accurate memory readings in
     Passenger
   * add newrelic_notice_error to Object class
-  * optional ability to verify SSL certificates, note that this has some 
+  * optional ability to verify SSL certificates, note that this has some
     performance and reliability implications
   * support multi-homed host with multiple apps running on duplicate
     ports
-  
+
 v2.9.0.
   Noteworthy Enhancements
   * give visibility to templates and partials in Rails 2.1 and later, in
@@ -357,7 +367,7 @@ v2.9.0.
   * add API for system monitoring daemons (refer to KB articles); changed
     API for manual starting of the agent; refer to
     NewRelic::Agent.manual_start for details
-  * do certificate verification on ssl connections to 
+  * do certificate verification on ssl connections to
     collector.newrelic.com
   * support instances appearing in more than one application by allowing a
     semicolon separated list of names for the newrelic.yml app_name
@@ -371,17 +381,17 @@ v2.9.0.
   * added number of queries to transactions in the transaction list
   * added some sorting options for the transaction list
   * added a page showing the list of active threads
-      
+
   Compatibility Enhancements
   * ruby 1.9.1 compatibility
   * support concurrency when determining busy times, for 2.2 compatibility
   * in jruby, use Java used heap for memory sampling if the system memory
     is not accessible from an unsupported platform
-  * jruby will no longer start the agent now when running the console or 
+  * jruby will no longer start the agent now when running the console or
     rake tasks
   * API support for RPM as a footnote add-in
   * webrick support restored
-  
+
   Noteworthy bugfixes
   * sample memory on linux by reading /proc/#{$$}/status file
   * fixed ambiguous 'View' metrics showing up in controller breakdown
@@ -392,7 +402,7 @@ v2.9.0.
   * moved CPU sampler off background thread and onto the harvest thread
   * tests now run cleanly in any rails app using test:newrelic or
     test:plugins
-    
+
   Agent improvements to support future RPM enhancements
   * add instrumentation to capture metrics on response codes; not yet
     working in rails 2.3.*
@@ -463,7 +473,7 @@ v2.8.1.
     symlinked to /usr/bin.  Usage: newrelic_cmd deployments --help
   * Fix issue invoking api when host is not set in newrelic.yml
   * Fix deployments api so it will work from a gem
-  * Fix thin incompatibility in developer mode 
+  * Fix thin incompatibility in developer mode
 
 v2.8.0.
   * add beta of api in new_relic_api.rb
@@ -471,7 +481,7 @@ v2.8.0.
   * preliminary support for capturing deployment information via capistrano
   * change memory sampler for solaris to use /usr/bin/ps
   * allow ERB in newrelic.yml file
-  * merged support for merb into this version 
+  * merged support for merb into this version
   * fix incompatibility in the developer mode with the safe_erb plugin
   * fix module namespace issue causing an error accessing
     NewRelic::Instrumentation modules
@@ -561,7 +571,7 @@ v2.2.2.
 
 v2.2.1.
   + Add rails 2.1 support for Developer Mode
-  + Changes to memory sampler: Add support for JRuby and fix Solaris support.  
+  + Changes to memory sampler: Add support for JRuby and fix Solaris support.
   * Stop catching exceptions and start catching StandardError; other exception cleanup
   * Add protective exception catching to the stats engine
   * Improved support for thin domain sockets

data/lib/new_relic/agent.rb

@@ -93,7 +93,7 @@ module NewRelic
     require 'new_relic/agent/samplers/cpu_sampler'
     require 'new_relic/agent/samplers/memory_sampler'
     require 'new_relic/agent/samplers/object_sampler'
-    require 'new_relic/agent/samplers/delayed_job_lock_sampler'
+    require 'new_relic/agent/samplers/delayed_job_sampler'
     require 'set'
     require 'thread'
     require 'resolv'

data/lib/new_relic/agent/instrumentation/active_record.rb

@@ -18,7 +18,8 @@ module NewRelic
           end
           
           sql, name, binds = args
-          metric = metric_for_name(name) || metric_for_sql(sql)
+          metric = metric_for_name(NewRelic::Helper.correctly_encoded(name)) ||
+            metric_for_sql(NewRelic::Helper.correctly_encoded(sql))
           
           if !metric
             log_without_newrelic_instrumentation(*args, &block)

data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb

@@ -138,15 +138,17 @@ module NewRelic
                          end
               options_arg << %Q[:#{key} => #{valuestr}]
             end
+            traced_method, punctuation = method.to_s.sub(/([?!=])$/, ''), $1
+
             class_eval <<-EOC
-              def #{method.to_s}_with_newrelic_transaction_trace(*args, &block)
+              def #{traced_method.to_s}_with_newrelic_transaction_trace#{punctuation}(*args, &block)
                 perform_action_with_newrelic_trace(#{options_arg.join(',')}) do
-                  #{method.to_s}_without_newrelic_transaction_trace(*args, &block)
+                  #{traced_method.to_s}_without_newrelic_transaction_trace#{punctuation}(*args, &block)
                  end
               end
             EOC
-            alias_method "#{method.to_s}_without_newrelic_transaction_trace", method.to_s
-            alias_method method.to_s, "#{method.to_s}_with_newrelic_transaction_trace"
+            alias_method "#{traced_method.to_s}_without_newrelic_transaction_trace#{punctuation}", method.to_s
+            alias_method method.to_s, "#{traced_method.to_s}_with_newrelic_transaction_trace#{punctuation}"
             NewRelic::Control.instance.log.debug("Traced transaction: class = #{self.name}, method = #{method.to_s}, options = #{options.inspect}")
           end
         end

data/lib/new_relic/agent/instrumentation/data_mapper.rb

@@ -197,7 +197,7 @@ module NewRelic
         # the proper call scope.
         def log_with_newrelic_instrumentation(msg)
           return unless NewRelic::Agent.is_execution_traced?
-          return unless operation = case msg.query
+          return unless operation = case NewRelic::Helper.correctly_encoded(msg.query)
                                     when /^\s*select/i          then 'find'
                                     when /^\s*(update|insert)/i then 'save'
                                     when /^\s*delete/i          then 'destroy'

data/lib/new_relic/agent/samplers/delayed_job_sampler.rb

@@ -0,0 +1,89 @@
+require 'new_relic/agent/sampler'
+require 'new_relic/delayed_job_injection'
+
+module NewRelic
+  module Agent
+    module Samplers
+      # This sampler records the status of your delayed job table once a minute.
+      # It assumes jobs are cleared after being run, and failed jobs are not (otherwise
+      # the failed job metric is useless).
+      #
+      # In earlier versions it will break out the queue length by priority.  In later
+      # versions of DJ where distinct queues are supported, it breaks it out by queue name.
+      #
+      class DelayedJobSampler < NewRelic::Agent::Sampler
+        def initialize
+          super :delayed_job_queue
+          raise Unsupported, "DJ instrumentation disabled" if NewRelic::Control.instance['disable_dj']
+          raise Unsupported, "No DJ worker present" unless NewRelic::DelayedJobInjection.worker_name
+        end
+
+        def error_stats
+          stats_engine.get_stats("Workers/DelayedJob/failed_jobs", false)
+        end
+        def locked_job_stats
+          stats_engine.get_stats("Workers/DelayedJob/locked_jobs", false)
+        end
+
+        def local_env
+          NewRelic::Control.instance.local_env
+        end
+
+        def worker_name
+          local_env.dispatcher_instance_id
+        end
+
+        def queued_jobs
+          Delayed::Job.count(:conditions => ['run_at < ? and failed_at is NULL', Time.now])
+        end
+        def failed_jobs
+          Delayed::Job.count(:conditions => 'failed_at is not NULL')
+        end
+        def locked_jobs
+          Delayed::Job.count(:conditions => 'locked_by is not NULL')
+        end
+
+        def self.supported_on_this_platform?
+          defined?(Delayed::Job)
+        end
+
+        def poll
+          record error_stats, failed_jobs
+          record locked_job_stats, locked_jobs
+
+          if @queue
+            record_queue_length_across_dimension('queue')
+          else
+            record_queue_length_across_dimension('priority')
+          end
+        end
+
+        private
+
+        def record_queue_length_across_dimension(column)
+          all_count = 0
+          Delayed::Job.count(:group => column).each do | column_val, count |
+            all_count += count
+            record stats_engine.get_stats("Workers/DelayedJob/queue_length/#{column == 'queue' ? 'name' : column}/#{column_val}", false), count
+          end
+          record(stats_engine.get_stats("Workers/DelayedJob/queue_length/all", false), all_count)
+        end
+
+        # Figure out if we get the queues.
+        def setup
+          return unless @queue.nil?
+          @setup = true
+          columns = Delayed::Job.columns
+          columns.each do | c |
+            @queue = true if c.name.to_s == 'priority'
+          end
+          @queue ||= false
+        end
+
+        def record(stat, size)
+          stat.record_data_point size
+        end
+      end
+    end
+  end
+end

data/lib/new_relic/agent/stats_engine/samplers.rb

@@ -47,7 +47,7 @@ module Agent
       end
 
       def log_added_sampler(type, sampler)
-        log.debug "Adding #{type} sampler: #{sampler.inspect}"
+        log.debug "Adding #{type} sampler: #{sampler.id}"
       end
 
       public

data/lib/new_relic/control.rb

@@ -2,6 +2,7 @@ require 'yaml'
 require 'conditional_vendored_metric_parser'
 require 'conditional_vendored_dependency_detection'
 require 'new_relic/local_environment'
+require 'new_relic/helper'
 
 require 'singleton'
 require 'erb'

data/lib/new_relic/helper.rb

@@ -0,0 +1,21 @@
+module NewRelic
+  # A singleton for shared generic helper methods
+  module Helper
+    extend self
+
+    # confirm a string is correctly encoded (in >= 1.9)
+    # If not force the encoding to ASCII-8BIT (binary)
+    if RUBY_VERSION >= '1.9'
+      def correctly_encoded(string)
+        return string unless string.is_a? String
+        string.valid_encoding? ? string : string.force_encoding("ASCII-8BIT")
+      end
+    else
+      #noop
+      def correctly_encoded(string)
+        string
+      end
+    end
+
+  end
+end

data/lib/new_relic/rack/browser_monitoring.rb

@@ -9,17 +9,6 @@ module NewRelic::Rack
 
     # method required by Rack interface
     def call(env)
-      # Two experimental options for allowing TT capture based on http params
-      #
-      # if req.params['nr_capture_deep_tt']
-        # NewRelic::Agent::TransactionInfo.get.force_persist = true
-        # NewRelic::Agent::TransactionInfo.get.capture_deep_tt = true
-      # end
-
-      # if req.params['nr_capture_tt']
-        # NewRelic::Agent::TransactionInfo.get.force_persist = true
-      # end
-
       result = @app.call(env)   # [status, headers, response]
 
       if (NewRelic::Agent.browser_timing_header != "") && should_instrument?(result[0], result[1])
@@ -46,19 +35,21 @@ module NewRelic::Rack
       response.each {|fragment| source ? (source << fragment.to_s) : (source = fragment.to_s)}
       return nil unless source
 
-      body_start = source.index("<body")
-      body_close = source.rindex("</body>")
 
-      if body_start && body_close
+      # Only scan the first 50k (roughly) then give up.
+      beginning_of_source = source[0..50_000]
+      # Don't scan for body close unless we find body start
+      if (body_start = beginning_of_source.index("<body")) && (body_close = source.rindex("</body>"))
+
         footer = NewRelic::Agent.browser_timing_footer
         header = NewRelic::Agent.browser_timing_header
 
-        if source.include?('X-UA-Compatible')
+        if beginning_of_source.include?('X-UA-Compatible')
           # put at end of header if UA-Compatible meta tag found
-          head_pos = source.index("</head>")
-        elsif head_open = source.index("<head")
+          head_pos = beginning_of_source.index("</head>")
+        elsif head_open = beginning_of_source.index("<head")
           # put at the beginning of the header
-          head_pos = source.index(">", head_open) + 1
+          head_pos = beginning_of_source.index(">", head_open) + 1
         else
           # put the header right above body start
           head_pos = body_start

data/lib/new_relic/version.rb

@@ -3,8 +3,8 @@ module NewRelic
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 3
-    TINY  = 4
-    BUILD = 1 # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
+    TINY  = 5
+    BUILD = 'beta1' # 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,14 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = "newrelic_rpm"
-  s.version = "3.3.4.1"
+  s.version = "3.3.5.beta1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  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-04-24"
+  s.date = "2012-05-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 = ["newrelic_cmd", "mongrel_rpm", "newrelic"]
+  s.executables = ["newrelic", "newrelic_cmd", "mongrel_rpm"]
   s.extra_rdoc_files = [
     "CHANGELOG",
     "LICENSE",
@@ -68,7 +68,7 @@ Gem::Specification.new do |s|
     "lib/new_relic/agent/method_tracer.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",
@@ -103,6 +103,7 @@ Gem::Specification.new do |s|
     "lib/new_relic/control/server_methods.rb",
     "lib/new_relic/data_serialization.rb",
     "lib/new_relic/delayed_job_injection.rb",
+    "lib/new_relic/helper.rb",
     "lib/new_relic/language_support.rb",
     "lib/new_relic/local_environment.rb",
     "lib/new_relic/merbtasks.rb",
@@ -291,7 +292,6 @@ Gem::Specification.new do |s|
   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/new_relic/rack/browser_monitoring_test.rb

@@ -9,7 +9,7 @@ ENV['RACK_ENV'] = 'test'
 # benefit from auto-rum, but the truth of the matter is that atm
 # we only support Rails >= 2.3
 def middleware_supported?
-  ::Rails::VERSION::MAJOR >= 2 && ::Rails::VERSION::MINOR >= 3
+  ::Rails::VERSION::STRING >= '2.3'
 end
 
 if middleware_supported?
@@ -139,4 +139,7 @@ EOL
     assert(last_response.body.include?(guid), last_response.body)
   end
 end
+else
+  warn "Skipping rum auto instrumentation tests"
 end
+

data/test/script/ci.sh

@@ -4,47 +4,37 @@
 # checking out test dependencies (currently rpm_test_app and it's dependencies)
 # and executing them.
 #
-# It relies on 3 environment variables:
+# It relies on 2 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
+#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
+  echo 'defaulting to 1.9.3'
+  RUBY=1.9.3
 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
+  echo 'defaulting to rails31'
+  BRANCH=rails31
 fi
 
 . "$HOME/.rvm/scripts/rvm"
@@ -59,9 +49,58 @@ 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
+
+
+#rpm_test_app_cache=~/.rpm_test_app_cache
+rpm_test_app_cache=~/workspace/.rpm_test_app_cache
+(
+  echo "updating local cache of rpm_test_app in $rpm_test_app_cache"
+  git clone --mirror git://github.com/newrelic/rpm_test_app.git $rpm_test_app_cache || true
+  cd $rpm_test_app_cache
+)
+
+git clone $rpm_test_app_cache rpm_test_app
+cd rpm_test_app || true # rvm overrides cd and it's f-ing up the build by exiting 2
+
 git checkout -t origin/$BRANCH || git checkout $BRANCH
+
+
+# Re-write database.yml to this here doc
+( cat << "YAML" ) > config/database.yml
+# Shared properties for mysql db
+mysql: &mysql
+  adapter: mysql
+  socket: <%= (`uname -s` =~ /Linux/ ) ? "" :"/tmp/mysql.sock" %>
+  username: root
+  host: localhost
+  database: <%= [ 'rails_blog', ENV['BRANCH'], ENV['RUBY'] ].compact.join('_') %>
+
+# Shared properties for postgres.  This won't work with our schema but
+# Does work with agent tests
+sqlite3: &sqlite3
+<% if defined?(JRuby) %>
+  adapter: jdbcsqlite3
+<% else %>
+  adapter: sqlite3
+<% end %>
+  database: db/all.sqlite3
+  pool: 5
+  timeout: 5000
+  host: localhost
+  
+# SQLite version 3.x
+#   gem install sqlite3-ruby (not necessary on OS X Leopard)
+development:
+  <<: *sqlite3
+
+test:
+  <<: *mysql
+
+production:
+  <<: *mysql
+YAML
+
+
 mkdir -p log
 mkdir -p tmp
 if [ "x$BRANCH" == "xrails20" ]; then
@@ -78,7 +117,7 @@ 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
+  # Bundler 0.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

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: newrelic_rpm
 version: !ruby/object:Gem::Version 
-  hash: 117
-  prerelease: 
+  hash: 2878966781
+  prerelease: 6
   segments: 
   - 3
   - 3
-  - 4
+  - 5
+  - beta
   - 1
-  version: 3.3.4.1
+  version: 3.3.5.beta1
 platform: ruby
 authors: 
 - Bill Kayser
@@ -19,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-24 00:00:00 Z
+date: 2012-05-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: jeweler
@@ -73,9 +74,9 @@ description: |
 
 email: support@newrelic.com
 executables: 
+- newrelic
 - newrelic_cmd
 - mongrel_rpm
-- newrelic
 extensions: []
 
 extra_rdoc_files: 
@@ -132,7 +133,7 @@ files:
 - lib/new_relic/agent/method_tracer.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
@@ -167,6 +168,7 @@ files:
 - lib/new_relic/control/server_methods.rb
 - lib/new_relic/data_serialization.rb
 - lib/new_relic/delayed_job_injection.rb
+- lib/new_relic/helper.rb
 - lib/new_relic/language_support.rb
 - lib/new_relic/local_environment.rb
 - lib/new_relic/merbtasks.rb
@@ -391,16 +393,18 @@ 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: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: New Relic Ruby Agent

data/lib/new_relic/agent/samplers/delayed_job_lock_sampler.rb

@@ -1,40 +0,0 @@
-require 'new_relic/agent/sampler'
-require 'new_relic/delayed_job_injection'
-
-module NewRelic
-  module Agent
-    module Samplers
-      class DelayedJobLockSampler < NewRelic::Agent::Sampler
-        def initialize
-          super :delayed_job_lock
-          raise Unsupported, "DJ instrumentation disabled" if NewRelic::Control.instance['disable_dj']
-          raise Unsupported, "No DJ worker present" unless NewRelic::DelayedJobInjection.worker_name
-        end
-
-        def stats
-          stats_engine.get_stats("Custom/DJ Locked Jobs", false)
-        end
-
-        def local_env
-          NewRelic::Control.instance.local_env
-        end
-
-        def worker_name
-          local_env.dispatcher_instance_id
-        end
-
-        def locked_jobs
-          Delayed::Job.count(:conditions => {:locked_by => NewRelic::DelayedJobInjection.worker_name})
-        end
-
-        def self.supported_on_this_platform?
-          defined?(Delayed::Job)
-        end
-
-        def poll
-          stats.record_data_point locked_jobs
-        end
-      end
-    end
-  end
-end