newrelic_rpm 2.8.9 → 2.8.10

data/lib/new_relic/agent/transaction_sampler.rb

@@ -27,6 +27,11 @@ module NewRelic::Agent
       end
     end
     
+    def current_sample_id
+      b=builder
+      b and b.sample_id
+    end
+
     def disable
       NewRelic::Agent.instance.stats_engine.remove_scope_stack_listener self
     end
@@ -196,6 +201,10 @@ module NewRelic::Agent
       @current_segment = @sample.root_segment
     end
 
+    def sample_id
+      @sample.sample_id
+    end
+
     def trace_entry(metric_name, time)
       segment = @sample.create_segment(time - @sample_start, metric_name)
       @current_segment.add_called_segment(segment)

data/lib/new_relic/config/rails.rb

@@ -103,8 +103,7 @@ class NewRelic::Config::Rails < NewRelic::Config
       log.debug "Unable to get the Rails info: #{e.inspect}"
     end
     
-    # Would like to get this from config, but how?
-    plugins = Dir[File.join(File.expand_path(__FILE__+"/../../../../.."),"/*")].collect { |p| File.basename p }
+    plugins = Dir[File.expand_path(File.join(RAILS_ROOT,"vendor","plugins","*"))].collect { |p| File.basename p }
     i << ['Plugin List', plugins]
     
     # Look for a capistrano file indicating the current revision:

data/lib/new_relic/local_environment.rb

@@ -33,6 +33,8 @@ module NewRelic
       end
     end
     def check_for_webrick
+      # Some indication this is causing problems.  To be fixed in 2.9.0
+      return
       # This will not succeed on rails 2.2 and later
       if defined?(WEBrick) && defined?(OPTIONS) && ::OPTIONS.respond_to?(:fetch) 
         # OPTIONS is set by script/server 
@@ -61,10 +63,9 @@ module NewRelic
       # Still can't find the port.  Let's look at ARGV to fall back
       @identifier = default_port if @identifier.nil?
     end
-    
-    def check_for_thin
+    def check_for_thin    
       if defined? Thin::Server
-        # This case covers the thin web server
+        # This case covers the thin web dispatcher
         # Same issue as above- we assume only one instance per process
         ObjectSpace.each_object(Thin::Server) do |thin_server|
           @environment = :thin
@@ -80,6 +81,10 @@ module NewRelic
           end
         end # each thin instance
       end
+      if defined?(Thin::VERSION) && !@identifier
+        @environment = :thin
+        @identifier = default_port
+      end
     end
     
     def check_for_jruby
@@ -127,7 +132,7 @@ module NewRelic
       default_port = 3000
       OptionParser.new do |opts|
         opts.on("-p", "--port=port", String) { | default_port | }
-        opts.parse!(ARGV.clone)
+        opts.parse(ARGV.clone) rescue nil
       end
       default_port
     end

data/lib/new_relic/version.rb

@@ -3,7 +3,7 @@ module NewRelic
   module VERSION #:nodoc:
   MAJOR = 2
   MINOR = 8
-  TINY  = 9
+  TINY  = 10
   STRING = [MAJOR, MINOR, TINY].join('.')
   def self.changes
     puts "NewRelic RPM Plugin Version: #{NewRelic::VERSION::STRING}"
@@ -11,6 +11,10 @@ module NewRelic
   end
 
   CHANGELOG = <<EOF
+2009-04-29 version 2.8.10
+  * fix thin support with rails 2.3.2 when using script/server
+  * fix incompatibility with rails 2.3.2 and script/server options processing
+  * minor tweak to environment gathering for gem mode
 2009-04-17 version 2.8.9
   * fix problem finding the newrelic controller in dev mode
   * fix incompatibility with older versions of optparse

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: newrelic_rpm
 version: !ruby/object:Gem::Version 
-  version: 2.8.9
+  version: 2.8.10
 platform: ruby
 authors: 
 - Bill Kayser
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-17 00:00:00 -07:00
+date: 2009-05-05 00:00:00 -07:00
 default_executable: newrelic_cmd
 dependencies: []