rails_runner 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 140270f54be56b6eb841de14c8d0b6489c3ad786
-  data.tar.gz: e93221ca8696a833cad6421d2a30d6ccca1f805f
+  metadata.gz: 41d4daada8041fb8cb32f31f1abf2213e2b272b1
+  data.tar.gz: 864d7359d31123a2ffdb2014ef7a9490f00870b5
 SHA512:
-  metadata.gz: 336638f0a7e7bdde650884ef05d823ea2633a09ba7c2735ec03e8fe2a2f875f95559895130ad6a5d3932f86e78cae38bd10b715ff6527fa1e100b3c669f5ef31
-  data.tar.gz: 96e042ca7425e45c388de5ffa75f94ae081e7a78c7efbc58495cbc7a8f3945cf16ca3419f8cf5aa978b66a61c914b6fba49c0f6186ec67f30120c6fc57bb545b
+  metadata.gz: 6dc7e7f3ae396845b873df5966ca48bcb20735fc3f9280f37c3ccd98475c888f6cd163798715bd4082241a2dc80f3e939adb46ad88a7059b75899407728e95a5
+  data.tar.gz: 4e549cc52732cd1903f36393f3507103d8ab979518fb094e967f7005d1b83413000b04da54c821151207aa9a029c6c17fdc852acbe28f4a409756ee446da9e0e

data/lib/rails_runner.rb

@@ -2,23 +2,9 @@ require 'beefcake'
 
 module RailsRunner
   require 'rails_runner/util'
-  require 'rails_runner/messages/action'
-  require 'rails_runner/messages/endpoint'
-  require 'rails_runner/messages/request'
-  require 'rails_runner/messages/minute'
-  require 'rails_runner/messages/batch'
-
-  require 'rails_runner/notifications/default'
-  require 'rails_runner/notifications'
-  require 'rails_runner/notifications/process_action'
-  require 'rails_runner/notifications/render_partial'
-  require 'rails_runner/notifications/render_template'
-  require 'rails_runner/notifications/sql'
-
   require 'rails_runner/instrumenter'
   require 'rails_runner/middleware'
   require 'rails_runner/railtie'
-  require 'rails_runner/subscriber'
   require 'rails_runner/worker'
   require 'rails_runner/config'
 

data/lib/rails_runner/instrumenter.rb

@@ -3,14 +3,6 @@ module RailsRunner
     MUTEX = Mutex.new
 
     class << self
-      def current_request
-        Thread.current[:rails_runner_current_request]
-      end
-
-      def current_request=(request)
-        Thread.current[:rails_runner_current_request] = request
-      end
-
       def start!
         return @instance if @instance
 
@@ -27,21 +19,11 @@ module RailsRunner
 
     def start
       @worker     = Worker.start!
-      @subscriber = Subscriber.new.register
-
       self
     end
 
-    def record(*args)
-      self.class.current_request = Request.new
-    end
-
-    def reset
-      self.class.current_request = nil
-    end
-
-    def publish(request)
-      @worker.push(request)
+    def publish(time)
+      @worker.push(time)
     end
   end
 end

data/lib/rails_runner/middleware.rb

@@ -5,19 +5,20 @@ module RailsRunner
     end
 
     def call(env)
+      @start = Time.now
       begin
-        request = instrumenter.record 'Rack', 'rack.request'
-        resp  = @app.call(env)
-        request.finish if request
-        resp
-      rescue Exception
-        request.finish(true) if request
-        raise
+        @app.call(env)
       ensure
-        instrumenter.reset
+        record_time(@start)
       end
     end
 
+    def record_time(start)
+      milliseconds = ((Time.now - start) * 1000).to_i
+      instrumenter.publish(milliseconds)
+    end
+
+    # @return [RailsRunner::Instrumenter]
     def instrumenter
       RailsRunner::Instrumenter.instance
     end

data/lib/rails_runner/railtie.rb

@@ -1,11 +1,16 @@
 module RailsRunner
   class Railtie < Rails::Railtie
     initializer 'rails_runner.configure' do |app|
-      Instrumenter.start!
-      app.middleware.insert 0, Middleware
       RailsRunner.config = RailsRunner::Config.new(app.root.join('config/railsrunner.yml'))
 
-      puts "[RAILSRUNNER] started"
+      Rails.logger.debug RailsRunner.config.to_yaml
+
+      if RailsRunner.config.active?
+        Instrumenter.start!
+        app.middleware.insert 0, Middleware
+
+        Rails.logger.debug "[RAILSRUNNER] started #{RailsRunner.config.collector_url}"
+      end
     end
   end
 end

data/lib/rails_runner/util.rb

@@ -9,13 +9,18 @@ module RailsRunner
       end
 
       def post(body)
-        uri     = URI.parse(URI.join("#{RailsRunner.config.collector_url}").to_s)
-        http    = Net::HTTP.new(uri.host, uri.port)
+        uri               = URI.parse(URI.join("#{RailsRunner.config.collector_url}").to_s)
+        http              = Net::HTTP.new(uri.host, uri.port)
+        http.open_timeout = 3
+        http.read_timeout = 3
+
         gzipped = Base64.encode64(gzip(body))
 
-        request                     = Net::HTTP::Post.new(uri.request_uri)
-        request.body                = gzipped
-        request['Authorization']    = "#{RailsRunner.config.client_id}"
+        request                  = Net::HTTP::Post.new(uri.request_uri)
+        request.body             = gzipped
+        request['Authorization'] = "#{RailsRunner.config.client_id}"
+
+        Rails.logger.debug "uri: #{uri.host}:#{uri.port} #{uri.request_uri}, header: #{RailsRunner.config.client_id} body length: #{gzipped.length}"
 
         http.request(request)
       end

data/lib/rails_runner/version.rb

@@ -1,3 +1,3 @@
 module RailsRunner
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/rails_runner/worker.rb

@@ -2,7 +2,7 @@ module RailsRunner
   class Worker
     MUTEX = Mutex.new
 
-    attr_accessor :requests, :batch
+    attr_accessor :requests
 
     class << self
       def start!
@@ -20,8 +20,16 @@ module RailsRunner
 
     def initialize
       @queue    = Queue.new
-      @requests = 0
-      @batch    = Batch.new
+      reset
+    end
+
+    def reset
+      @requests = Hash.new { |h,k| h[k] = Hash.new { |h,k| h[k] = 0 } }
+    end
+
+    def current_minute
+      time = Time.now.to_i
+      time - (time % 60)
     end
 
     def start
@@ -29,17 +37,26 @@ module RailsRunner
         while (request = @queue.pop)
           begin
             case request
-              when Request
-                batch.current_minute.add_request(request)
-                @requests += 1
+              when Integer
+                @requests[current_minute][request] += 1
               when :flush
                 send_to_collector
             end
           rescue Exception => e
             puts e.message
+            puts e.backtrace.join("\n")
           end
         end
       end
+
+      Thread.new do
+        loop do
+          sleep 10.seconds
+          Rails.logger.debug "Sending flush message"
+          push(:flush)
+        end
+      end
+
       self
     end
 
@@ -48,12 +65,12 @@ module RailsRunner
     end
 
     def send_to_collector
-      @batch.encode(buffer = '')
+      Rails.logger.debug "Sending to collector"
+      Rails.logger.flush
 
-      Util.post(buffer)
+      Util.post(requests.to_json)
 
-      @requests = 0
-      @batch    = Batch.new
+      reset
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_runner
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Benoist Claassen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-22 00:00:00.000000000 Z
+date: 2013-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -61,20 +61,8 @@ extra_rdoc_files: []
 files:
 - lib/rails_runner/config.rb
 - lib/rails_runner/instrumenter.rb
-- lib/rails_runner/messages/action.rb
-- lib/rails_runner/messages/batch.rb
-- lib/rails_runner/messages/endpoint.rb
-- lib/rails_runner/messages/minute.rb
-- lib/rails_runner/messages/request.rb
 - lib/rails_runner/middleware.rb
-- lib/rails_runner/notifications/default.rb
-- lib/rails_runner/notifications/process_action.rb
-- lib/rails_runner/notifications/render_partial.rb
-- lib/rails_runner/notifications/render_template.rb
-- lib/rails_runner/notifications/sql.rb
-- lib/rails_runner/notifications.rb
 - lib/rails_runner/railtie.rb
-- lib/rails_runner/subscriber.rb
 - lib/rails_runner/util.rb
 - lib/rails_runner/version.rb
 - lib/rails_runner/worker.rb

data/lib/rails_runner/messages/action.rb

@@ -1,25 +0,0 @@
-module RailsRunner
-  class Action
-    include Beefcake::Message
-
-    required :category, :string, 1
-    required :object, :string, 2
-    required :start, :int64, 3
-    required :end, :int64, 4
-    required :duration, :int64, 5
-    required :explain, :string, 6
-    required :level, :int32, 7
-
-    def initialize(category, object, explain = '')
-      @category = category
-      @object   = object
-      @explain  = explain.to_s
-      @start    = Util.time_in_usec
-    end
-
-    def finish
-      @end      = Util.time_in_usec
-      @duration = @end - @start
-    end
-  end
-end

data/lib/rails_runner/messages/batch.rb

@@ -1,38 +0,0 @@
-module RailsRunner
-  class Batch
-    include Beefcake::Message
-
-    required :client_id, :string, 1
-    required :app_name, :string, 2
-    required :hostname, :string, 3
-
-    repeated :minutes, Minute, 5
-
-    def initialize
-      @client_id = RailsRunner.config.client_id
-      @app_name  = RailsRunner.config.app_name
-      @hostname  = RailsRunner.config.hostname
-
-      @_minutes   = {}
-    end
-
-    def current_minute
-      @_minutes[minute] ||= RailsRunner::Minute.new(minute)
-    end
-
-    def encode(*)
-      @minutes = @_minutes.values
-      super
-    end
-
-    def minutes
-      @minutes ||= @_minutes.values
-    end
-
-    private
-
-    def minute
-      Time.now.to_i / 60
-    end
-  end
-end

data/lib/rails_runner/messages/endpoint.rb

@@ -1,31 +0,0 @@
-module RailsRunner
-  class Endpoint
-    include Beefcake::Message
-    required :name, :string, 1
-    required :errors, :int64, 2
-    repeated :times, :int64, 3, packed: true
-    repeated :counts, :int64, 4, packed: true
-
-    def initialize(*args)
-      super
-      @errors = 0
-      @times  = Hash.new { |h, k| h[k] = 0 }
-    end
-
-    def add_time(time)
-      @times[time.to_i] += 1
-    end
-
-    def add_error
-      @errors += 1
-    end
-
-    def times
-      @times.keys
-    end
-
-    def counts
-      @times.values
-    end
-  end
-end

data/lib/rails_runner/messages/minute.rb

@@ -1,80 +0,0 @@
-module RailsRunner
-  class Minute
-    include Beefcake::Message
-
-    required :minute, :int64, 1
-    repeated :endpoints, Endpoint, 2, packed: true
-    repeated :traces, Request, 3, packed: true
-
-    def initialize(minute = Time.now.to_i)
-      @minute          = minute
-      @errors          = 0
-      @endpoints       = {}
-      @trace_endpoints = {}
-    end
-
-    def add_request(request)
-      add_error(request)
-
-      add_time(request)
-
-      add_trace(request)
-    end
-
-    def add_trace(request)
-      return if request.traceable?
-      return if slower_request_registered?(request)
-      @trace_endpoints[request.name] = request
-    end
-
-    def add_time(request)
-      time = rounded(request.duration)
-      endpoint(request.name).add_time(time) if request.name.present?
-      endpoint('total').add_time(time)
-    end
-
-    def traces
-      @trace_endpoints.values
-    end
-
-    def add_error(request)
-      return unless request.error?
-      endpoint(request.name || 'total').add_error
-    end
-
-    def endpoints
-      @endpoints.values
-    end
-
-    private
-
-    def endpoint(name)
-      @endpoints[name] ||= Endpoint.new(name: name)
-    end
-
-    def rounded(duration)
-      if duration < 500_000
-        mod = 10_000
-      elsif duration < 1000_000
-        mod = 50_000
-      elsif duration < 1500_000
-        mod = 100_000
-      elsif duration < 2250_000
-        mod = 150_000
-      elsif duration < 3000_000
-        mod = 200_000
-      else
-        return 3000_000
-      end
-      duration - (duration % mod)
-    end
-
-    def slower_request_registered?(request)
-      if @trace_endpoints[request.name]
-        @trace_endpoints[request.name].duration > request.duration
-      else
-        false
-      end
-    end
-  end
-end

data/lib/rails_runner/messages/request.rb

@@ -1,48 +0,0 @@
-module RailsRunner
-  class Request
-    include Beefcake::Message
-
-    optional :name, :string, 1
-    required :start, :int64, 2
-    required :end, :int64, 3
-    required :duration, :int64, 4
-    required :error, :bool, 5
-    repeated :actions, Action, 6, packed: true
-
-    attr_accessor :notifications
-
-    def initialize
-      @start         = Util.time_in_usec
-      @current_level = 0
-      @actions       = []
-      @notifications = []
-    end
-
-    def finish(error = false)
-      @end      = Util.time_in_usec
-      @duration = @end - @start
-      @error    = error
-      Instrumenter.instance.publish(self)
-    end
-
-    def add_action(action)
-      action.level   = @current_level
-      @current_level += 1
-      @actions << action
-    end
-
-    def finish_action(action)
-      return unless action
-      action.finish
-      @current_level -= 1
-    end
-
-    def traceable?
-      name.blank? || error?
-    end
-
-    def error?
-      @error
-    end
-  end
-end

data/lib/rails_runner/notifications.rb

@@ -1,17 +0,0 @@
-module RailsRunner
-  class Notifications
-    class << self
-      DEFAULT_NOTIFICATION = Default.new
-
-      def add_notification(name, notification)
-        @notifications       ||= {}
-        @notifications[name] = notification.new
-      end
-
-      def to_action(request, name, payload)
-        notification = @notifications[name] || DEFAULT_NOTIFICATION
-        notification.to_action(request, payload)
-      end
-    end
-  end
-end

data/lib/rails_runner/notifications/default.rb

@@ -1,42 +0,0 @@
-module RailsRunner
-  class Notifications
-    class Default
-      class << self
-        def notification(name)
-          RailsRunner::Notifications.add_notification(name, self)
-        end
-      end
-
-      def to_action(request, payload)
-        nil #
-      end
-    end
-
-    class RenderDefault < Default
-      class << self
-        def mapped_paths
-          return @mapped_paths if @mapped_paths
-          @mapped_paths = {
-              Rails.root.to_s => ''
-          }
-          Gem.path.each do |path|
-            @mapped_paths[File.join(path, 'gems')] = 'gem'
-          end if defined?(Gem)
-
-          @mapped_paths
-        end
-
-        def prune_path(raw_path)
-          mapped_paths.each do |path, replacement|
-            raw_path = raw_path.gsub(path, replacement)
-          end
-          raw_path
-        end
-      end
-
-      def prune_path(path)
-        self.class.prune_path(path)
-      end
-    end
-  end
-end

data/lib/rails_runner/notifications/process_action.rb

@@ -1,12 +0,0 @@
-module RailsRunner
-  class Notifications
-    class ProcessAction < Default
-      notification 'process_action.action_controller'
-
-      def to_action(request, payload)
-        request.name = "#{payload[:controller]}##{payload[:action]}"
-        Action.new('Controller', request.name)
-      end
-    end
-  end
-end

data/lib/rails_runner/notifications/render_partial.rb

@@ -1,11 +0,0 @@
-module RailsRunner
-  class Notifications
-    class RenderPartial < RenderDefault
-      notification 'render_partial.action_view'
-
-      def to_action(request, payload)
-        Action.new('View', prune_path(payload[:identifier]))
-      end
-    end
-  end
-end

data/lib/rails_runner/notifications/render_template.rb

@@ -1,11 +0,0 @@
-module RailsRunner
-  class Notifications
-    class RenderTemplate < RenderDefault
-      notification 'render_template.action_view'
-
-      def to_action(request, payload)
-        Action.new('View', prune_path(payload[:identifier]))
-      end
-    end
-  end
-end

data/lib/rails_runner/notifications/sql.rb

@@ -1,14 +0,0 @@
-module RailsRunner
-  class Notifications
-    class Sql < Default
-      IGNORED_NAMES = %w(SCHEMA EXPLAIN CACHE) << nil
-
-      notification 'sql.active_record'
-
-      def to_action(request, payload)
-        return if IGNORED_NAMES.include? payload[:name]
-        Action.new('Database', payload[:name], payload[:sql])
-      end
-    end
-  end
-end

data/lib/rails_runner/subscriber.rb

@@ -1,34 +0,0 @@
-module RailsRunner
-  class Subscriber
-    Notification = Struct.new(:name, :action)
-
-    def register
-      unregister if @subscriber
-      @subscriber = ActiveSupport::Notifications.subscribe nil, self
-    end
-
-    def start(name, id, payload)
-      request = Instrumenter.current_request
-      return unless request
-
-      if (action = Notifications.to_action(request, name, payload))
-        request.add_action(action)
-      end
-
-      request.notifications << Notification.new(name, action)
-    end
-
-    def finish(name, id, payload)
-      request = Instrumenter.current_request
-      return unless request
-
-      while (notification = request.notifications.pop)
-        if notification.name == name
-          request.finish_action(notification.action)
-          return
-        end
-      end
-    end
-
-  end
-end