oneapm_rpm 1.2.7 → 1.2.8.rc1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjBhMmVmZjFjNTJiOTQ2MTQ1NzE5YjgwZGY1ZmYxMDk4MjRiOTQ0MA==
+    YWYxMWE0NzBlZGRjYTFjZjBmYmU0ODRmZDA4YWQ1M2M2ZjFhN2IxOQ==
   data.tar.gz: !binary |-
-    MmZiNWU5Y2I1NDNjNjE5OTQxZmE4NzRjMDc0ZmY1ZDhjZTNlODVlMg==
+    ZjdmODc5NzYwMGQxNjg5NDY5Mjc1OWJkNzlmMGNiYmZiZTAwY2MxYg==
 SHA512:
   metadata.gz: !binary |-
-    MjgyZTMzY2E5OGZjZjdlNjIzYzFhZGFjMWIwNGMwZjY5NDg5MmQyZDYwM2U1
-    ODdhMGY5ZGZlZjZhMDdmNjJiMWQzMmMyYThkYzM0ZmQyNTVhOGQ4MWU5MGYy
-    YTkwMmYzYTc4MzEzMGJkZWI5ZmU1MWYxZjY3MTkwOGVkNzljODU=
+    N2ViN2E1ZDBhMTM1MWFiZTU3ZWYwOWE5NzI2MTA5NDY2MTdiYzNkZWEyMGZl
+    Y2JlMjk2NGY2YjUyYzlkYzNkMTNjMDUwZjk0NjQwMmRhOWVjOWZhM2VmYjM4
+    OTJhNTc5MzI0MjNmNzE3YzJjODViMTY5ZTlkYmU5YzNjMTY4YjU=
   data.tar.gz: !binary |-
-    MjZhMzM2MWNkMGQ4MGIxNDNkYmQ4ZmEwOTRkOTM4N2I3YTY2Yjg1YWRiMzc5
-    ZjUwNjJjMzJjMjRiMzUyYTExZGUwZDc4MDJmNTllYWY1OThmM2UyNzI2ZGY1
-    ZGI1YjlhMGQxOTQ0NDgwZTAwODY2NDQ5MjQ5YTA3OWMxYmNkYmQ=
+    ODZjMjQ1ZTgzNDViOTRjMTA2YWYyOWZhZDgxNGVmZWM5YTM2ODRjYzEwZjkz
+    ODM0M2JkZmViMWJjNTk0MmQ5YzA0ODhmZTJjYjU3MjEyYjY5YzhiZWI0YTlm
+    ZmE5NDk1OGFiNWRkNThiOTc3ZGQ0YzVjNTI4MDAwNjdkYjNkYmI=

data/lib/one_apm/collector/containers/transaction_sampler.rb

@@ -205,7 +205,9 @@ module OneApm
       # than the specified duration
       def append_backtrace(segment, duration)
         if duration >= OneApm::Manager.config[:'transaction_tracer.stack_trace_threshold']
-          segment[:backtrace] = caller.join("\n")
+          backtrace = caller
+          backtrace.reject! { |t| t.include?('one_apm') }
+          segment[:backtrace] = backtrace.join("\n")
         end
       end
 

data/lib/one_apm/configuration/default_source.rb

@@ -1201,6 +1201,13 @@ module OneApm
         :notified     => true,
         :description  => 'Defines a path to the agent restart file, excluding the filename.'
       },
+      :disable_rabbitmq => {
+        :default      => false,
+        :public       => true,
+        :type         => Boolean,
+        :notified     => false,
+        :description  => 'Enable or disable rabbitmq instrumentation.'
+      },
       :'notified.enable' => {
         :default      => true,
         :public       => true,

data/lib/one_apm/inst/background_job/rabbitmq.rb

@@ -0,0 +1,55 @@
+# encoding: utf-8
+
+LibraryDetection.defer do
+  @name = :rabbitmq
+
+  depends_on do
+    defined?(::Bunny::VERSION) && !OneApm::Manager.config[:disable_rabbitmq]
+  end
+
+  executes do
+    OneApm::Manager.logger.info 'Installing RabbitMQ instrumentation'
+  end
+
+  executes do
+    ::Bunny::Session.class_eval do 
+
+      include OneApm::Agent::Instrumentation::TransactionBase
+
+      def trace_args(frame)
+        class_name = frame.respond_to?(:method_class) ? frame.method_class.name : frame.class.name.downcase
+        {
+          :name => 'perform',
+          :class_name => class_name,
+          :category => 'OtherTransaction/RabbitMQ'
+        }
+      end
+
+      def send_frame_with_oneapm(frame, signal_activity = true)
+        perform_action_with_oneapm_trace(trace_args(frame)) do
+          send_frame_without_oneapm(frame, signal_activity)
+        end
+      end
+      alias :send_frame_without_oneapm :send_frame
+      alias :send_frame :send_frame_with_oneapm
+
+      def send_frameset_with_oneapm(frames, channel)
+        perform_action_with_oneapm_trace(trace_args(frames[0])) do
+          send_frameset_without_oneapm(frames, channel)
+        end
+      end
+      alias :send_frameset_without_oneapm :send_frameset
+      alias :send_frameset :send_frameset_with_oneapm
+
+      def send_frame_without_timeout_with_oneapm(frame, signal_activity = true)
+         perform_action_with_oneapm_trace(trace_args(frame)) do
+           send_frame_without_timeout_wihout_oneapm(frame, signal_activity)
+        end
+      end
+      alias :send_frame_without_timeout_wihout_oneapm :send_frame_without_timeout
+      alias :send_frame_without_timeout :send_frame_without_timeout_with_oneapm
+
+    end
+
+  end
+end

data/lib/one_apm/transaction/sample_buffer/developer_mode_sample_buffer.rb

@@ -47,7 +47,7 @@ module OneApm
       end
 
       def strip_oneapm_frames(trace)
-        while trace.first =~/\/lib\/one_apm\/agent\//
+        while trace.first =~ /lib\/one_apm/
           trace.shift
         end
         trace

data/lib/one_apm/version.rb

@@ -5,9 +5,10 @@ module OneApm
 
     MAJOR = 1
     MINOR = 2
-    TINY  = 7
+    TINY  = 8
+    TAG   = 'rc1'
 
-    STRING = [MAJOR, MINOR, TINY].compact.join('.')
+    STRING = [MAJOR, MINOR, TINY, TAG].compact.join('.')
 
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oneapm_rpm
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.8.rc1
 platform: ruby
 authors:
 - oneapm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-06 00:00:00.000000000 Z
+date: 2015-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -319,6 +319,7 @@ files:
 - lib/one_apm/inst/background_job/delayed_job.rb
 - lib/one_apm/inst/background_job/delayed_job_injection.rb
 - lib/one_apm/inst/background_job/event_machine_standalone.rb
+- lib/one_apm/inst/background_job/rabbitmq.rb
 - lib/one_apm/inst/background_job/resque.rb
 - lib/one_apm/inst/background_job/sidekiq.rb
 - lib/one_apm/inst/dispatcher/passenger.rb