mnemosyne-ruby 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb0d5bc4abf9f3fbf32db3c4b38176059b4b3041
-  data.tar.gz: 3c088755475af2fb3317d770dbdffb053971257c
+  metadata.gz: 0dd6477917eee07e244adbce53f2f07b23ee2a8a
+  data.tar.gz: 6bfaf7fa6a1a5beb52ccedc769ceb72483dd7d1e
 SHA512:
-  metadata.gz: 83904f7bfc80eb52f9919df216d07302f6a134e517cd103c84c81450bf432f0ba6bf143f5a5b503357f5357f999f9a0285247050bad9a55a15ceda2e9d0c2129
-  data.tar.gz: 22d35f5acb70ac32b2dc7dac905116b0ea3c0aa06ac4d558764897e8c517bab5a12a9d174374bfa154ca974232e0c66f4fe6bdbea8f7e4267962b420164252a5
+  metadata.gz: 3cf8bf8db8c95be6c4a40e7ad68d7303a49737c46f405d6bb67e282b7bf32371038d8a0c274df94f4476158605fd5470308f13af0b3fedc480a3af3df294aa38
+  data.tar.gz: 24fbef4b46867c7511611e1152cdd4ddd5616ffb2f7a7434332ed57288fc5fbaf8f7d16cef65b69f55c5efebd57891a7b831135a972f539a4746a6f8859ea305

data/.travis.yml

@@ -1,14 +1,29 @@
 language: ruby
 cache: bundler
+sudo: required
+services:
+- rabbitmq
 rvm:
-  - '2.4.0'
-  - '2.3.3'
-  - '2.2.6'
+- 2.4.2
+- 2.3.4
+- 2.2.6
 before_install:
-  - gem update --system
-  - gem install bundler
+- gem update --system
+- gem install bundler
 script:
-  - bundle exec rake rubocop
-  - bundle exec rake spec
-matrix:
-  fast_finish: true
+- bundle exec rake rubocop
+- bundle exec rake spec
+jobs:
+  include:
+  - stage: Release
+    rvm: 2.4.2
+    install: skip
+    script: skip
+    deploy:
+      provider: rubygems
+      api_key:
+        secure: GDEAmZLPOYQOsMJRrAcyRIrdOdbkZ5iM0Z9OHjxMwLkHtnR8XcfjNzPdXEji6o1nQaS3PfcLIdpEmis6FJqT4aXRU0F/1VwHAgiYIe3NWs5rFEo2dWS0ScfeQJQ1rY2inq/ayp3r01/eUTVVwhks8hresBlZrT6HR2Jub300lkhJQoAwHB44cekTZrv3PSTpyMhHOBUjk8bpx2m0n/dGM3lOYlAnaL4DA1l6/JdoYNS3hbyphZFnymS4cl5QIxF6NRNlC6uEzmZ0Hr4dK0amnBwUeillqxgAWiYQXyj/do7r1iXdrtORidIb3QfGAhsuxZY9Cu6+E8CfhwvnnY5ElpGrDvlVTBV4hyfudsRq87QwTS64c62dQ7s1cvcMxJcYMfWDyaFkYmGoXN0QCrN9M9JhrXh8sLKAFQIMsc2kH8dyuhlIJXvIZVzdxtey8geOYBwalB8DJl7BM/nbG/LuEagpahJco4k0/+3KDxxMFRplMG4ShkOw/otousiVlsu7idszpgxuVPrVAwAbhIPxJV0i1Ak0Vt/nohkR2DOxdf4E40jDrP2d2A4DMVKU8R92BDH8Qj/nle20TeL/Wx2/3mLBAIH+stUtKILnpwoWEfVhe+Ys3LLEaDtYBLcOr4W9czlFH43GxctbBMiadVQAVBQOIUOTkA84gADFLCIOCA0=
+      gem: mnemosyne-ruby
+      on:
+        tags: true
+        repo: jgraichen/mnemosyne-ruby

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.3.0
+
+* Add exception serialization to trace and protocol
+* Add exception reporting to Sidekiq, Msgr, Rack and Rails
+
 ## 1.2.1
 
 * Improve AMQP connection recovery

data/Gemfile

@@ -11,7 +11,10 @@ group :development, :test do
 end
 
 group :test do
+  gem 'msgr', require: false
   gem 'restify', require: false
   gem 'sidekiq', require: false
   gem 'webmock', require: false
 end
+
+gem 'rubocop', '~> 0.50.0'

data/lib/mnemosyne.rb

@@ -30,6 +30,7 @@ module Mnemosyne
     require 'mnemosyne/probes/acfs/request'
     require 'mnemosyne/probes/action_controller/process_action'
     require 'mnemosyne/probes/action_controller/renderers'
+    require 'mnemosyne/probes/action_dispatch/show_exceptions'
     require 'mnemosyne/probes/action_view/render_partial'
     require 'mnemosyne/probes/action_view/render_template'
     require 'mnemosyne/probes/active_record/query'

data/lib/mnemosyne/middleware/rack.rb

@@ -4,9 +4,9 @@ module Mnemosyne
   module Middleware
     class Rack
       class Proxy
-        def initialize(body, &block)
+        def initialize(body, trace)
           @body = body
-          @block = block
+          @trace = trace
           @closed = false
         end
 
@@ -33,7 +33,7 @@ module Mnemosyne
           begin
             @body.close if @body.respond_to? :close
           ensure
-            @block.call
+            @trace.submit
           end
         end
 
@@ -42,11 +42,10 @@ module Mnemosyne
         end
 
         def each(*args)
-          if block_given?
-            @body.each(*args, &Proc.new)
-          else
-            @body.each(*args)
-          end
+          @body.each(*args, &Proc.new)
+        rescue StandardError, LoadError, SyntaxError => e
+          @trace.attach_error(e)
+          raise
         end
       end
 
@@ -73,13 +72,17 @@ module Mnemosyne
 
           scan_response(trace, response)
 
-          response[2] = Proxy.new(response[2]) { trace.submit }
+          response[2] = Proxy.new(response[2], trace)
           response
         else
           @app.call env
         end
-      rescue Exception # rubocop:disable RescueException
-        trace.submit if trace
+      rescue StandardError, LoadError, SyntaxError => e
+        if trace
+          trace.attach_error(e)
+          trace.submit
+        end
+
         raise
       ensure
         trace.release if trace

data/lib/mnemosyne/middleware/sidekiq.rb

@@ -22,6 +22,9 @@ module Mnemosyne
         trace.start! if trace
 
         yield
+      rescue StandardError, LoadError, SyntaxError => err # rubocop:disable RescueException
+        trace.attach_error(err)
+        raise
       ensure
         if trace
           trace.submit

data/lib/mnemosyne/probes/action_dispatch/show_exceptions.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Mnemosyne
+  module Probes
+    module ActionDispatch
+      module ShowExceptions
+        class Probe < ::Mnemosyne::Probe
+          def setup
+            ::ActionDispatch::ShowExceptions.send :prepend, Instrumentation
+          end
+
+          module Instrumentation
+            def render_exception(env, exception)
+              if (trace = ::Mnemosyne::Instrumenter.current_trace)
+                trace.attach_error(exception)
+              end
+
+              super
+            end
+          end
+        end
+      end
+    end
+
+    register 'ActionDispatch::ShowExceptions',
+      'action_dispatch/middleware/show_exceptions',
+      ActionDispatch::ShowExceptions::Probe.new
+  end
+end

data/lib/mnemosyne/probes/msgr/consumer.rb

@@ -56,6 +56,9 @@ module Mnemosyne
             end
 
             super
+          rescue StandardError, LoadError, SyntaxError => e
+            trace.attach_error(e) if trace
+            raise
           ensure
             if trace
               trace.submit

data/lib/mnemosyne/trace.rb

@@ -2,13 +2,14 @@
 
 module Mnemosyne
   class Trace < Span
-    attr_reader :uuid, :transaction, :origin, :span
+    attr_reader :uuid, :transaction, :origin, :span, :errors
 
     def initialize(instrumenter, name, transaction: nil, origin: nil, **kwargs)
       super(name, **kwargs)
 
-      @uuid = ::SecureRandom.uuid
-      @span = []
+      @uuid   = ::SecureRandom.uuid
+      @span   = []
+      @errors = []
 
       @origin      = origin
       @transaction = transaction
@@ -20,6 +21,10 @@ module Mnemosyne
       @span << span
     end
 
+    def attach_error(error)
+      @errors << Error.new(error)
+    end
+
     def submit
       finish! unless finish
 
@@ -39,8 +44,27 @@ module Mnemosyne
         start: start,
         stop: finish,
         meta: meta,
-        span: @span.map(&:serialize)
+        span: @span.map(&:serialize),
+        errors: @errors.map(&:serialize)
       }
     end
+
+    Error = Struct.new(:error) do
+      BT_REGEXP = /^((?:[a-zA-Z]:)?[^:]+):(\d+)(?::in `([^']+)')?$/
+
+      # rubocop:disable AbcSize
+      def serialize
+        {
+          type: error.class.name,
+          text: error.message,
+          stacktrace: error.backtrace.map do |bt|
+            md = BT_REGEXP.match(bt.to_s).to_a
+
+            {file: md[1], line: md[2], call: md[3], raw: md[0]}
+          end
+        }
+      end
+      # rubocop:enable all
+    end
   end
 end

data/lib/mnemosyne/version.rb

@@ -3,8 +3,8 @@
 module Mnemosyne
   module VERSION
     MAJOR = 1
-    MINOR = 2
-    PATCH = 1
+    MINOR = 3
+    PATCH = 0
     STAGE = nil
 
     STRING = [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mnemosyne-ruby
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-20 00:00:00.000000000 Z
+date: 2017-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -140,6 +140,7 @@ files:
 - lib/mnemosyne/probes/acfs/request.rb
 - lib/mnemosyne/probes/action_controller/process_action.rb
 - lib/mnemosyne/probes/action_controller/renderers.rb
+- lib/mnemosyne/probes/action_dispatch/show_exceptions.rb
 - lib/mnemosyne/probes/action_view/render_partial.rb
 - lib/mnemosyne/probes/action_view/render_template.rb
 - lib/mnemosyne/probes/active_record/query.rb