log_query 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cefdd467431992b29c7feb20907d6c0f7a5f8f5
-  data.tar.gz: 523ca2c9fb0133d2a932aa42ad3adcafb785bf1b
+  metadata.gz: b6a5eace67508a8f9b304887399b8850934c394e
+  data.tar.gz: 40b0398eed248d957935748636fb9cbdb1b6b1a9
 SHA512:
-  metadata.gz: d63f2f6f56815c31facb0179102e8e9041cdf2d265065cb545a18c955438c0e6eb214bf891bab89fd7af71a71f62425ed34ded6e93ea4b90ee2fc4aed2e69aaf
-  data.tar.gz: c49ff3dcedd003d37e63e962d07093281531821711a37643633d3eedf3966452121bc0710e03382e53b3d5379c9367817cf447c2269126bd190e68c8b6f31950
+  metadata.gz: 1fea3044667c84a0d59691382da0216465d3738480cbd87bb5ab4929e238528e499d8fe378baaea9b4391f29edaa1790e0399a0bac08703249a465ef0c9cc276
+  data.tar.gz: 66ca2acebdd27e20842e861848dc2da2eb08fe5eb27d795d6a6513d29b9de801e9d57693f2c79cb5a706850fb14d21d8e791fa2a5d74211190e31cdfe250a816

data/README.md

@@ -1,8 +1,6 @@
 # LogQuery
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/log_query`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+TODO: Add description
 
 ## Installation
 
@@ -16,13 +14,15 @@ And then execute:
 
     $ bundle
 
-Or install it yourself as:
+Or install the binary as:
 
     $ gem install log_query
 
 ## Usage
 
-TODO: Write usage instructions here
+`heroku logs --tail -n 1500 | lq --group_by path --measure service --average --varience --percentile 99`
+
+![log_query usage](/log_query.gif?raw=true)
 
 ## Development
 

data/bin/lq

@@ -16,6 +16,7 @@ global_option('-g', '--group_by ATTRIBUTE', 'Attribute to group by')
 global_option('-m', '--measure ATTRIBUTE', 'Attribute to measure')
 global_option('-a', '--average', 'Perform average')
 global_option('-p', '--percentile NUMBER', Integer,'Find nth percentile')
+global_option('-c', '--count', 'Count instances of attribute')
 global_option('--variance', 'Perform variance')
 
 default_command :run
@@ -26,16 +27,35 @@ command :run do |c|
    screen = Screen.new
    ARGF.each_line do |line|
      entry = LogEntry.from_heroku_log_line(line)
-     entries << entry if entry.message.is_a?(Messages::HerokuRouter)
+     message = entry.message
 
-     screen.reset
-     entries.group_by { |e| e.message.send(options.group_by) }.
-       map { |k, es| [k, DescriptiveStatistics::Stats.new(es.map { |e| e.message.send(options.measure) })] }.
+     # check which type group_by is in
+     if options.group_by
+       unless Messages.class_from_attribute(options.group_by).detect { |klass| message.is_a?(klass) }
+         #screen.line("#{options.group_by} is not in #{message.class} with attributes #{message.class&.attributes}")
+         next
+       end
+     end
+
+     # check which type measure is in
+     unless Messages.class_from_attribute(options.measure).detect { |klass| message.is_a?(klass) }
+       #screen.line("#{options.measure} is not in #{message.class} with attributes #{message.class&.attributes}")
+       next
+     end
+
+     entries << entry
+     
+     data = entries.group_by { |e| e.message.send(options.group_by) } if options.group_by
+     data ||= { all: entries }
+
+     data.
+       map { |k, es| [k, DescriptiveStatistics::Stats.new(es.map { |e| e.message.send(options.measure) } )] }.
        map do |k, stats|
          line = "#{k}: "
          line += "mean: #{stats.mean.round(2)} " if options.average
          line += "variance: #{stats.variance.round(2)} " if options.variance
          line += "#{options.percentile}th: #{stats.percentile(options.percentile).round(2)} " if options.percentile
+         line += "count: #{stats.number} " if options.count
          screen.line(line)
        end
 

data/lib/log_query/messages.rb

@@ -1,12 +1,28 @@
 require_relative './messages/heroku_router'
+require_relative './messages/heroku_web/rails'
 
 module Messages
+  def self.class_from_attribute(attr)
+    [HerokuRouter, HerokuWeb::Rails].select do |klass|
+      klass.attributes.include?(attr.to_sym)
+    end
+  end
+
   def self.resolve_message(source, dyno)
     case [source, dyno]
+    when HerokuWeb::Rails
+      HerokuWeb::Rails
     when HerokuRouter
       HerokuRouter
     else
       String
     end
   end
+
+  # A wrapper for native string class
+  class String < String
+    def self.attributes
+      []
+    end
+  end
 end

data/lib/log_query/messages/heroku_router.rb

@@ -9,6 +9,10 @@ module Messages
     ATTRIBUTES = [:sock, :at, :code, :desc, :method, :path, :host, :request_id, :fwd, :dyno, :connect, :service, :status, :bytes]
     attr_accessor *ATTRIBUTES
 
+    def self.attributes
+      ATTRIBUTES
+    end
+
     def initialize(message)
       ATTRIBUTES.
         select { |attr| message.include?(" #{attr}=") }.
@@ -22,6 +26,7 @@ module Messages
         end
     end
 
+
     def parse_value(value, attribute)
       case attribute
       when :sock, :at, :code, :desc, :method, :host, :request_id, :fwd, :dyno, :status

data/lib/log_query/messages/heroku_web/rails.rb

@@ -0,0 +1,44 @@
+module Messages
+  module HerokuWeb
+    # 2016-10-20T17:19:51.396574+00:00 app[web.1]: Started HEAD "/" for 127.0.0.1 at 2016-10-20 17:19:51 +0000
+    # 2016-10-20T17:19:51.508781+00:00 app[web.1]: Processing by HomeController#index as HTML
+    # 2016-10-20T17:19:51.575265+00:00 app[web.1]: Rendered home/index.html.erb (53.0ms)
+    # 2016-10-20T17:19:51.575470+00:00 app[web.1]: Completed 500 Internal Server Error in 67ms (ActiveRecord: 0.0ms)
+    class Rails < MessageTypeMatcher
+      source 'app'
+      dyno 'web.*'
+
+      ATTRIBUTES = {
+        method: /Started ([^\s]+)/,
+        route: /"([^"]+)"/,
+        ip_address: /for (([0-9]{1,3}\.){4})/,
+        timestamp: /at (.*)$/,
+        controller: /Processing by ([^\s]+)/,
+        format: /as (.*)$/,
+        template: /Rendered ([^\s]+)/,
+        render_time: /\(([0-9\.]+?)ms\)/,
+        status: /Completed ([^\s]+)/,
+        total_time: /in ([0-9\.]+)ms/,
+        active_record_time: /ActiveRecord: ([0-9\.])ms/
+      }
+
+      attr_accessor *(ATTRIBUTES.keys)
+
+      def self.attributes
+        ATTRIBUTES.keys
+      end
+
+      def initialize(message)
+        ATTRIBUTES.
+          select { |attr, regexp| message.match(regexp) }.
+          map do |attr, regexp|
+            value = message.match(regexp)[0]
+            value = Integer(value) rescue value
+            [attr, value]
+          end.each do |(key, value)|
+            instance_variable_set("@#{key}", value)
+          end
+      end
+    end
+  end
+end

data/lib/log_query/messages/message_type_matcher.rb

@@ -13,7 +13,7 @@ module Messages
     end
 
     def self.===((source, dyno))
-      @source == source and @dyno == dyno
+      source.match("^#{@source}$") and dyno.match("^#{dyno}$")
     end
   end
 end

data/lib/log_query/screen.rb

@@ -1,20 +1,53 @@
 class Screen
   def initialize
-    @buffer = ""
-    @lines = 0
+    @old_lines = []
+    @new_lines = []
+    @current_line = 0
   end
 
   def line(value)
-    @buffer += "#{value}\n"
-    @lines += 1
+    @new_lines << value
+  end
+
+  def move_to(row)
+    #puts "moving to #{row}"
+    #puts "current line #{@current_line}"
+    diff = row - @current_line
+    if diff > 0
+      #puts "moving down #{diff.abs}"
+      @buffer += "\e[#{diff.abs}B"
+    elsif diff < 0
+      #puts "moving up #{diff.abs}"
+      @buffer += "\e[#{diff.abs}A"
+    end
+    @current_line += diff
   end
 
-  def reset
-    @buffer = "\e[K\e[1A" * [0, @lines].max
-    @lines = 0
+  def delete_current_line
+    @buffer += "\e[2K"
+  end
+
+  def print_line(line)
+    @buffer += "#{line}\n"
+    @current_line += 1
   end
 
   def draw
+    @buffer = ""
+    # pad line buffers
+    line_count = [@old_lines.size, @new_lines.size].max
+    @old_lines.fill(nil, @old_lines.size, line_count) if @old_lines.size < line_count
+    @new_lines.fill(nil, @new_lines.size, line_count) if @new_lines.size < line_count
+
+    @old_lines.zip(@new_lines).each_with_index do |(old, new), index|
+      if old != new
+        move_to(index)
+        delete_current_line
+        print_line(new) 
+      end
+    end
+    @old_lines = @new_lines
+    @new_lines = []
     print @buffer
   end
 end

data/lib/log_query/version.rb

@@ -1,3 +1,3 @@
 module LogQuery
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: log_query
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jasper Lyons
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-20 00:00:00.000000000 Z
+date: 2016-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: descriptive_statistics
@@ -74,10 +74,12 @@ files:
 - lib/log_query/log_entry.rb
 - lib/log_query/messages.rb
 - lib/log_query/messages/heroku_router.rb
+- lib/log_query/messages/heroku_web/rails.rb
 - lib/log_query/messages/message_type_matcher.rb
 - lib/log_query/screen.rb
 - lib/log_query/version.rb
 - log_query.gemspec
+- log_query.gif
 homepage: https://github.com/releaseplatform/log_query
 licenses:
 - MIT