torquebox-messaging 2.0.1-java → 2.0.2-java

data/lib/torquebox-messaging.rb

@@ -1,6 +1,6 @@
 module TorqueboxMessaging
-  VERSION = '2.0.1'
-  MAVEN_VERSION = '2.0.1'
+  VERSION = '2.0.2'
+  MAVEN_VERSION = '2.0.2'
 end
 begin
   require 'java'

data/lib/torquebox/messaging/backgroundable.rb

@@ -27,13 +27,6 @@ module TorqueBox
     # Backgroundable provides mechanism for executing an object's
     # methods asynchronously.
     module Backgroundable
-      NEWRELIC_AVAILABLE ||= 
-        begin
-          require 'newrelic_rpm'
-          true
-        rescue LoadError
-          false
-        end
 
       def self.included(base)
         base.extend(ClassMethods)
@@ -83,6 +76,18 @@ module TorqueBox
           end
         end
 
+        def __enable_backgroundable_newrelic_tracing(method)
+          if defined?(NewRelic::Agent)
+            include(NewRelic::Agent::Instrumentation::ControllerInstrumentation) unless
+              include?(NewRelic::Agent::Instrumentation::ControllerInstrumentation)
+            begin
+              add_transaction_tracer(method, :name => method.sub("__sync_", ""), :category => :task)
+            rescue Exception => e
+              log.error "Error loading New Relic for backgrounded method #{method.sub("__sync_", "")}: #{e}"
+            end
+          end
+        end
+
         private
         def __enable_backgrounding(method)
           privatize = Util.private_instance_methods_include?(self, method)

data/lib/torquebox/messaging/backgroundable_processor.rb

@@ -25,17 +25,7 @@ module TorqueBox
 
       def on_message(hash)
         FutureResponder.new( Queue.new( hash[:future_queue] ), hash[:future_id] ).respond do
-          # TORQUE-741 allow always_background methods to report as background tasks in NewRelic
-          begin
-            if TorqueBox::Messaging::Backgroundable::NEWRELIC_AVAILABLE
-              class << hash[:receiver]
-                include NewRelic::Agent::Instrumentation::ControllerInstrumentation
-                add_transaction_tracer hash[:method], :name => hash[:method].sub("__sync_", ""), :category => :task
-              end
-            end
-          rescue
-            log.error "Error loading New Relic for backgrouded process #{hash[:method]}"
-          end
+          hash[:receiver].class.__enable_backgroundable_newrelic_tracing(hash[:method])
           hash[:receiver].send(hash[:method], *hash[:args])
         end
       end

metadata

@@ -2,7 +2,7 @@
 name: torquebox-messaging
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.0.1
+  version: 2.0.2
 platform: java
 authors: 
   - The TorqueBox Team
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-16 00:00:00 Z
+date: 2012-05-01 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: torquebox-core
@@ -20,7 +20,7 @@ dependencies:
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 2.0.1
+            version: 2.0.2
     type: :runtime
     version_requirements: *id001
   - !ruby/object:Gem::Dependency 
@@ -31,7 +31,7 @@ dependencies:
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 2.0.1
+            version: 2.0.2
     type: :runtime
     version_requirements: *id002
   - !ruby/object:Gem::Dependency 
@@ -88,41 +88,41 @@ files:
   - lib/gem_hook.rb
   - lib/org.torquebox.messaging-client.rb
   - lib/torquebox/messaging.rb
-  - lib/torquebox/messaging/connection.rb
-  - lib/torquebox/messaging/topic.rb
-  - lib/torquebox/messaging/clojure_message.rb
-  - lib/torquebox/messaging/message.rb
-  - lib/torquebox/messaging/session.rb
-  - lib/torquebox/messaging/core.rb
-  - lib/torquebox/messaging/text_message.rb
-  - lib/torquebox/messaging/json_message.rb
-  - lib/torquebox/messaging/backgroundable_processor.rb
+  - lib/torquebox/messaging/queue.rb
   - lib/torquebox/messaging/xa_connection.rb
-  - lib/torquebox/messaging/xa_connection_factory.rb
-  - lib/torquebox/messaging/xa_session.rb
   - lib/torquebox/messaging/const_missing.rb
-  - lib/torquebox/messaging/queue.rb
-  - lib/torquebox/messaging/destination.rb
-  - lib/torquebox/messaging/marshal_base64_message.rb
   - lib/torquebox/messaging/processor_wrapper.rb
-  - lib/torquebox/messaging/marshal_message.rb
+  - lib/torquebox/messaging/destination.rb
   - lib/torquebox/messaging/future.rb
-  - lib/torquebox/messaging/task.rb
-  - lib/torquebox/messaging/future_status.rb
-  - lib/torquebox/messaging/datamapper_marshaling.rb
-  - lib/torquebox/messaging/message_processor.rb
-  - lib/torquebox/messaging/backgroundable.rb
+  - lib/torquebox/messaging/clojure_message.rb
+  - lib/torquebox/messaging/text_message.rb
+  - lib/torquebox/messaging/xa_session.rb
   - lib/torquebox/messaging/connection_factory.rb
+  - lib/torquebox/messaging/session.rb
   - lib/torquebox/messaging/future_responder.rb
+  - lib/torquebox/messaging/backgroundable_processor.rb
+  - lib/torquebox/messaging/topic.rb
+  - lib/torquebox/messaging/future_status.rb
+  - lib/torquebox/messaging/marshal_base64_message.rb
+  - lib/torquebox/messaging/task.rb
+  - lib/torquebox/messaging/message.rb
+  - lib/torquebox/messaging/backgroundable.rb
+  - lib/torquebox/messaging/json_message.rb
+  - lib/torquebox/messaging/connection.rb
+  - lib/torquebox/messaging/xa_connection_factory.rb
+  - lib/torquebox/messaging/message_processor.rb
+  - lib/torquebox/messaging/core.rb
+  - lib/torquebox/messaging/marshal_message.rb
+  - lib/torquebox/messaging/datamapper_marshaling.rb
   - lib/torquebox/messaging/ext/javax_jms_queue_browser.rb
-  - spec/message_spec.rb
   - spec/json_message_spec.rb
   - spec/future_spec.rb
   - spec/task_spec.rb
-  - spec/datamapper_marshaling_spec.rb
-  - spec/backgroundable_spec.rb
-  - spec/message_processor_spec.rb
   - spec/destination_spec.rb
+  - spec/message_processor_spec.rb
+  - spec/message_spec.rb
+  - spec/backgroundable_spec.rb
+  - spec/datamapper_marshaling_spec.rb
   - spec/future_responder_spec.rb
 homepage: http://torquebox.org/
 licenses: 
@@ -152,12 +152,12 @@ signing_key:
 specification_version: 3
 summary: TorqueBox Messaging Client
 test_files: 
-  - spec/message_spec.rb
   - spec/json_message_spec.rb
   - spec/future_spec.rb
   - spec/task_spec.rb
-  - spec/datamapper_marshaling_spec.rb
-  - spec/backgroundable_spec.rb
-  - spec/message_processor_spec.rb
   - spec/destination_spec.rb
+  - spec/message_processor_spec.rb
+  - spec/message_spec.rb
+  - spec/backgroundable_spec.rb
+  - spec/datamapper_marshaling_spec.rb
   - spec/future_responder_spec.rb