Updated with version 2.7.1

lib/new_relic/agent/agent.rb

@@ -8,7 +8,7 @@
 
 
 # This must be turned off before we ship
-VALIDATE_BACKGROUND_THREAD_LOADING = true
+VALIDATE_BACKGROUND_THREAD_LOADING = false
 
 # The NewRelic Agent collects performance data from ruby applications in realtime as the
 # application runs, and periodically sends that data to the NewRelic server.
@@ -559,15 +559,15 @@ def harvest_and_send_timeslice_data
       now = Time.now
 
       # Fixme: remove the harvest thread tracking
-      @harvest_thread ||= Thread.current
-
-      if @harvest_thread != Thread.current
-        log! "ERROR - two harvest threads are running (current=#{Thread.current}, havest=#{@harvest_thread}"
-        @harvest_thread = Thread.current
-      end
+#      @harvest_thread ||= Thread.current
+#      
+#      if @harvest_thread != Thread.current
+#        log! "ERROR - two harvest threads are running (current=#{Thread.current}, havest=#{@harvest_thread}"
+#        @harvest_thread = Thread.current
+#      end
 
       # Fixme: remove this check
-      log! "Agent sending data too frequently - #{now - @last_harvest_time} seconds" if (now.to_f - @last_harvest_time.to_f) < 45
+#      log! "Agent sending data too frequently - #{now - @last_harvest_time} seconds" if (now.to_f - @last_harvest_time.to_f) < 45
 
       @unsent_timeslice_data ||= {}
       @unsent_timeslice_data = @stats_engine.harvest_timeslice_data(@unsent_timeslice_data, @metric_ids)

lib/new_relic/agent/instrumentation/rails/dispatcher.rb

@@ -1,4 +1,4 @@
-#require_dependency 'dispatcher'
+require_dependency 'dispatcher'
 
 # NewRelic RPM instrumentation for http request dispatching (Routes mapping)
 # Note, the dispatcher class from no module into into the ActionController modile 

lib/new_relic/version.rb

@@ -2,17 +2,18 @@
 module NewRelic
   module VERSION #:nodoc:
   MAJOR = 2
-  MINOR = 5
-  TINY  = 6
+  MINOR = 7
+  TINY  = 0
   STRING = [MAJOR, MINOR, TINY].join('.')
   def self.changes
     puts "NewRelic RPM Plugin Version: #{NewRelic::VERSION}"
     puts CHANGELOG
   end
 
   CHANGELOG = <<EOF
-2008-11-23 version 2.5.6
-  THIS IS A BETA of 2.7.0
+2008-11-22 verison 2.7.1
+  * fix problem with skipped dispatcher instrumentation
+2008-11-22 version 2.7.0
   * Repackage to support both plugin and Gem installation
   * Support passenger/litespeed/jruby application naming
   * Update method for calculating dispatcher queue time

newrelic.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name = %q{newrelic}
-  s.version = "2.5.6"
+  s.version = "2.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bill Kayser"]
-  s.date = %q{2008-11-21}
+  s.date = %q{2008-11-23}
   s.description = %q{Performance Monitoring Agent for New Relic Ruby Performance Monitoring Service}
   s.email = %q{bkayser@newrelic.com}
   s.extra_rdoc_files = ["README", "LICENSE"]