newrelic_rpm 2.12.1.alpha → 2.12.1

data/CHANGELOG

@@ -1,5 +1,7 @@
 v2.12.1
+  * fix bug in profile mode
   * fix race condition in Delayed::Job instrumentation loading
+  * fix glassfish detection in latest glassfish gem
 
 v2.12.0
   * support basic instrumentation for ActsAsSolr and Sunspot

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

@@ -279,20 +279,22 @@ module NewRelic
     # Profile the instrumented call.  Dev mode only.  Experimental. 
     def perform_action_with_newrelic_profile(args)
       frame_data = _push_metric_frame(block_given? ? args : [])
+      val = nil
       NewRelic::Agent.trace_execution_scoped frame_data.metric_name do
         MetricFrame.current(true).start_transaction
         NewRelic::Agent.disable_all_tracing do
           # turn on profiling
           profile = RubyProf.profile do
             if block_given?
-              yield
+              val = yield
             else
-              perform_action_without_newrelic_trace(*args)
+              val = perform_action_without_newrelic_trace(*args)
             end
           end
           NewRelic::Agent.instance.transaction_sampler.notice_profile profile
         end
       end
+      return val
     ensure
       frame_data.pop
     end

data/lib/new_relic/local_environment.rb

@@ -203,10 +203,11 @@ module NewRelic
 
     def check_for_glassfish
       return unless defined?(::JRuby) &&
-         (((com.sun.grizzly.jruby.rack.DefaultRackApplicationFactory rescue nil) &&
-         defined?(com::sun::grizzly::jruby::rack::DefaultRackApplicationFactory)) ||
+        (((com.sun.grizzly.jruby.rack.DefaultRackApplicationFactory rescue nil) &&
+          defined?(com::sun::grizzly::jruby::rack::DefaultRackApplicationFactory)) ||
          ((org.jruby.rack.DefaultRackApplicationFactory rescue nil) &&
-         defined?(org::jruby::rack::DefaultRackApplicationFactory)))
+          defined?(org::jruby::rack::DefaultRackApplicationFactory)) ||
+         defined?(::GlassFish::Server))
       @dispatcher = :glassfish
     end
 

data/lib/new_relic/version.rb

@@ -4,7 +4,7 @@ module NewRelic
     MAJOR = 2
     MINOR = 12
     TINY  = 1
-    BUILD = 'alpha' #'0' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
+    BUILD = nil #'0' # 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,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{newrelic_rpm}
-  s.version = "2.12.1.alpha"
+  s.version = "2.12.1"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bill Kayser"]
-  s.date = %q{2010-05-17}
+  s.date = %q{2010-05-20}
   s.description = %q{New Relic RPM is a Ruby performance management system, developed by
 New Relic, Inc (http://www.newrelic.com).  RPM provides you with deep
 information about the performance of your Ruby on Rails or Merb

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: newrelic_rpm
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
   - 2
   - 12
   - 1
-  - alpha
-  version: 2.12.1.alpha
+  version: 2.12.1
 platform: ruby
 authors: 
 - Bill Kayser
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-17 00:00:00 -07:00
+date: 2010-05-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -241,13 +240,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: