wildsight 0.1.20 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ee42269fa992f53798cec753fcca9badb6fad51
-  data.tar.gz: 7f13c14c90891d7f58bb557e7a8187b8a23810a6
+  metadata.gz: 7f2c893cb28bf60914cc72261d5092185894366c
+  data.tar.gz: 598a0176686af5ffe7206a1a933c1d74295e11bb
 SHA512:
-  metadata.gz: 295b99bd465d01440b07add3deea6281707366171589b867e365fc0b30e288e0e8105a17c27700c669ba94ce6d33f47654abe203007d8284c29295af34e14297
-  data.tar.gz: 3a1563a2cea1d09fae697c808c1cba0c5e1ae11aa5d72b650793c7edecae346d0a4582f1dae70ffa06a06c141146379fe34f1a0817e4a258d7a6ac5061b170fb
+  metadata.gz: 3c550393fd8fc5d74777a4d655a1b05d4416798781b002388c719cb9d71f4ed8201c6054e574e3c663ac88f5e1cf6d6ef4187846d5e522853ddbc71274d53d92
+  data.tar.gz: 6f741f0b59f14cda66c95464e178e214938ea8135988456ef4c3d9775a1259fcd9495af2f53578558baaf0f163c35e8ca4702f2fd3ba3c502e917562776f0d5e

data/lib/wildsight/profiler/profiler.rb

@@ -9,7 +9,8 @@ module Wildsight
       end
 
       def duration(name, time = nil, options = {}, &block)
-        p = @profile = Profile.new(@profile)
+        p = @profile = Profile.new(name, @profile)
+        @profile.options = options
 
         if block_given?
           @profile.profile!(&block)
@@ -38,7 +39,10 @@ module Wildsight
 
     class Profile
 
-      def initialize(parent)
+      attr_accessor :options
+
+      def initialize(name, parent)
+        @name = name
         @parent = parent
         @subtimes = []
         @result = nil
@@ -61,7 +65,7 @@ module Wildsight
       end
 
       def close
-        @parent << duration if @parent
+        @parent << raw if @parent
         @parent
       end
 
@@ -77,8 +81,13 @@ module Wildsight
         @subtimes << time
       end
 
+      def subtimes
+        @subtimes.inject(0.0) { |c,x| c + x }
+      end
+
       def duration
-        return raw - @subtimes.inject(0.0) { |c,x| c + x }
+        return raw if options[:raw]
+        return raw - subtimes
       end
 
       def raw

data/lib/wildsight/rack/top_middleware.rb

@@ -36,7 +36,11 @@ module Wildsight
 
         env[Wildsight::Rack::RACK_ENV_KEY] = context
 
-        response = context.profiler.duration(:middleware) { @app.call(env) }
+        response = context.profiler.duration(:request, nil, raw: true) {
+          context.profiler.duration(:middleware) {
+            @app.call(env)
+          }
+        }
 
         if !context.data[:session] && !env['rack.session'].nil? && env['rack.session'].respond_to?(:id)
           context.data[:session] ||= {id: env['rack.session'].id}
@@ -53,7 +57,7 @@ module Wildsight
         context.event(:action_controller, context.data[:rack])
 
         context.profiler.data.keys.each do |key|
-          context.metric(key, context.profiler.data[key][:duration])
+          context.metric("rails.#{key}", context.profiler.data[key][:duration])
         end
 
         return response

data/lib/wildsight/version.rb

@@ -1,3 +1,3 @@
 module Wildsight
-  VERSION = '0.1.20'
+  VERSION = '0.1.21'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wildsight
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.21
 platform: ruby
 authors:
 - Marek Jelen