RubyGems - profit - Versions diffs - 0.1.5 → 0.1.6 - Mend

profit 0.1.5 → 0.1.6

Files changed (31) hide show

checksums.yaml +7 -0
data/README.md +1 -1
data/bin/profit_app +24 -0
data/lib/profit.rb +12 -0
data/lib/profit/app/chart_app.rb +25 -0
data/lib/profit/app/public/css/bootstrap-responsive.css +1109 -0
data/lib/profit/app/public/css/bootstrap-responsive.min.css +9 -0
data/lib/profit/app/public/css/bootstrap.css +6158 -0
data/lib/profit/app/public/css/bootstrap.min.css +9 -0
data/lib/profit/app/public/css/main.css +22 -0
data/lib/profit/app/public/img/glyphicons-halflings-white.png +0 -0
data/lib/profit/app/public/img/glyphicons-halflings.png +0 -0
data/lib/profit/app/public/js/main.js +22 -0
data/lib/profit/app/public/js/vendor/Chart.js +1426 -0
data/lib/profit/app/public/js/vendor/bootstrap.js +2268 -0
data/lib/profit/app/public/js/vendor/bootstrap.min.js +6 -0
data/lib/profit/app/public/js/vendor/html5shiv.js +5 -0
data/lib/profit/app/public/js/vendor/jquery-1.9.1.js +9597 -0
data/lib/profit/app/views/index.erb +67 -0
data/lib/profit/client.rb +18 -30
data/lib/profit/key.rb +32 -0
data/lib/profit/metric.rb +41 -0
data/lib/profit/server.rb +16 -6
data/lib/profit/version.rb +1 -1
data/spec/lib/client_spec.rb +13 -9
data/spec/lib/key_spec.rb +56 -0
data/spec/lib/metric_spec.rb +104 -0
data/spec/lib/server_spec.rb +58 -1
data/spec/profit_app/chart_app_spec.rb +28 -0
data/spec/spec_helper.rb +10 -0
metadata +130 -43

data/lib/profit/app/views/index.erb ADDED Viewed

@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<html class="no-js">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <title></title>
+    <meta name="description" content="">
+    <meta name="viewport" content="width=device-width">
+    <link rel="stylesheet" href="css/bootstrap.min.css">
+    <style>
+      body {
+        padding-top: 60px;
+        padding-bottom: 40px;
+      }
+    </style>
+    <link rel="stylesheet" href="css/bootstrap-responsive.min.css">
+    <link rel="stylesheet" href="css/main.css">
+    <!--[if lt IE 9]>
+      <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+      <script>window.html5 || document.write('<script src="js/vendor/html5shiv.js"><\/script>')</script>
+    <![endif]-->
+  </head>
+  <body>
+    <script type="text/javascript">
+      window.data = <%= data.to_json %>;
+    </script>
+    <div class="navbar navbar-inverse navbar-fixed-top">
+      <div class="navbar-inner">
+        <div class="container">
+          <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </a>
+          <a class="brand" href="#">Profit Charts</a>
+        </div>
+      </div>
+    </div>
+    <div class="tabbable tabs-left">
+      <ul id="key_links" class="nav nav-tabs">
+        <% data.keys.each_with_index do |key, index| %>
+          <% first = index == 0 %>
+          <li class="<%= 'active' if first %>"><a href="#tab_<%= key %>" id="<%= key %>" data-toggle="tab"><%= key %></a></li>
+        <% end %>
+      </ul>
+      <div class="tab-content">
+        <% data.keys.each_with_index do |key, index| %>
+          <% first = index == 0 %>
+          <div class="tab-pane <%= 'active' if first %>" id="tab_<%= key %>">
+            <canvas id="chart_<%= key %>" width="1200" height="400"></canvas>
+          </div>
+        <% end %>
+      </div>
+    </div>
+    <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.js"></script>
+    <script>window.jQuery || document.write('<script src="js/vendor/jquery-1.9.1.js"><\/script>')</script>
+    <script src="js/vendor/bootstrap.min.js"></script>
+    <script src="js/vendor/Chart.js"></script>
+    <script src="js/main.js"></script>
+  </body>
+</html>

data/lib/profit/client.rb CHANGED Viewed

@@ -1,7 +1,7 @@
 module Profit
-  def self.client
-    @client ||= Client.new
+  def self.client(options = {})
+    @client ||= Client.new(options)
   end
   class Client
@@ -11,37 +11,25 @@ module Profit
     def initialize(options = {})
       @ctx            = options[:ctx]            || ZMQ::Context.new
       @server_address = options[:server_address] || "tcp://127.0.0.1:5556"
-      @pending = {}
+      @pending        = {}
     end
-    def start(metric_type)
-      now = Time.now
-      start_file = caller[0][/(.+):(.+):/,1]
-      start_line = caller[0][/(.+):(.+):/,2].to_i + 1
-      # TODO: wrap in a Mutex & make the key a combo of metric_type,
-      #       pid, and/or thread object_id to make this thread safe and
-      #       thread-robust.
-      @pending[key_for(metric_type)] = { start_file: start_file,
-                                         start_line: start_line,
-                                         start_time: now }
+    def start(metric_key)
+      pending_key = pending_key_for(Key.new(metric_key).to_s)
+      metric      = Metric.new(metric_key: metric_key,
+                               start_line: caller[0],
+                               start_time: Time.now)
+      pending[pending_key] = metric
     end
-    def stop(metric_type)
-      now           = Time.now
-      metric        = @pending.delete key_for(metric_type)
-      recorded_time = now - metric[:start_time]
-      start_time    = metric[:start_time].to_i
-      stop_file     = caller[0][/(.+):(.+):/,1]
-      stop_line     = caller[0][/(.+):(.+):/,2].to_i - 1
-      socket.send({ metric_type: metric_type,
-                    recorded_time: recorded_time,
-                    start_time: start_time,
-                    start_file: metric[:start_file],
-                    start_line: metric[:start_line],
-                    stop_file: stop_file,
-                    stop_line: stop_line }.to_json)
+    def stop(metric_key)
+      pending_key          = pending_key_for(Key.new(metric_key).to_s)
+      metric               = pending.delete pending_key
+      metric.recorded_time = Time.now - metric.start_time
+      metric.stop_line     = caller[0]
+      socket.send(metric.to_json)
     end
     def socket
@@ -50,7 +38,7 @@ module Profit
     private
-    def key_for(metric_type)
+    def pending_key_for(metric_type)
       "#{metric_type}:#{Thread.current.object_id}"
     end
   end

data/lib/profit/key.rb ADDED Viewed

@@ -0,0 +1,32 @@
+module Profit
+  class Key
+    class << self
+      def all
+        redis.smembers("profit:keys").map { |key| new(key.split(":").last) }
+      end
+      def redis
+        Profit.redis
+      end
+    end
+    def initialize(key)
+      @key = key
+    end
+    def to_s
+      @key
+    end
+    def metrics
+      self.class.redis.lrange(full, 0, -1).map {|key_data| Metric.new(key_data)}.reverse
+    end
+    def full
+      "profit:metric:#{@key}"
+    end
+  end
+end

data/lib/profit/metric.rb ADDED Viewed

@@ -0,0 +1,41 @@
+module Profit
+  class Metric
+    attr_accessor :data,
+                  :metric_key,
+                  :recorded_time,
+                  :start_line,
+                  :start_time,
+                  :stop_line
+    def initialize(metric)
+      @data = HashWithIndifferentAccess.new(metric.is_a?(String) ? JSON.parse(metric) : metric)
+      @metric_key,
+      @recorded_time,
+      @start_line,
+      @start_time,
+      @stop_line = data.values_at(:metric_key,
+                                  :recorded_time,
+                                  :start_line,
+                                  :start_time,
+                                  :stop_line)
+    end
+    def to_json
+      { metric_key: metric_key,
+        recorded_time: recorded_time,
+        start_line: start_line,
+        start_time: start_time.to_i,
+        stop_line: stop_line }.to_json
+    end
+    def point
+      { recorded_time: recorded_time, start_time: start_time }
+    end
+    def display_start_time
+      DateTime.strptime(start_time.to_s,'%s').strftime("%H:%M:%S")
+    end
+  end
+end

data/lib/profit/server.rb CHANGED Viewed

@@ -4,6 +4,8 @@ module Profit
     attr_reader :ctx
+    METRIC_LIMIT_PER_KEY = 100
     def initialize(options = {})
       @options = {}
       @options[:redis_address] = options[:redis_address] || "127.0.0.1"
@@ -36,13 +38,21 @@ module Profit
           # take a worker from the pool to save the metric to Redis
           redis_pool.perform do |conn|
-            message_hash = JSON.parse(message)
-            metric_type  = message_hash.delete("metric_type")
+            message_hash     = JSON.parse(message)
+            metric_key       = ["profit", "metric", message_hash.delete("metric_key")].join(":")
+            add_key_response = conn.sadd("profit:keys", metric_key)
+            add_key_response.callback { |resp| logger.debug "adding metric key callback: #{resp}" }
+            add_key_response.errback  { |resp| logger.error "adding metric key error: #{resp}"}
+            push_metric_response = conn.lpush metric_key, message_hash.to_json
+            push_metric_response.callback { |resp| logger.debug "push metric callback: #{resp}" }
+            push_metric_response.errback  { |resp| logger.error "push metric error: #{resp}"}
-            response     = conn.rpush "profit:metric:#{metric_type}", message_hash.to_json
-            response.callback { |resp| logger.debug "callback: #{resp}"}
-            response.errback  { |resp| logger.error "error: #{resp}"}
-            response
+            trim_list_response = conn.ltrim(metric_key, 0, METRIC_LIMIT_PER_KEY - 1)
+            trim_list_response.callback { |resp| logger.debug "trim list callback: #{resp}" }
+            trim_list_response.errback  { |resp| logger.error "trim list error: #{resp}"}
+            trim_list_response
           end
         end
       end

data/lib/profit/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module Profit
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/spec/lib/client_spec.rb CHANGED Viewed

@@ -9,6 +9,7 @@ describe Profit::Client do
   after do
     redis.del("profit:metric:some_foo_measurement")
+    redis.del("profit:keys")
   end
   it "sends the amount of time it takes to run some code" do
@@ -42,6 +43,13 @@ describe Profit::Client do
     expect(metric['start_time']).to be_within(1).of(now.to_i)
   end
+  describe "Profit.client" do
+    it "creates a single client instance" do
+      expect(Profit.client(ctx: server.ctx)).to be_a(Profit::Client)
+    end
+  end
   describe "#ctx" do
     it "is a ZMQ context" do
@@ -78,7 +86,7 @@ describe Profit::Client do
       key = client.pending.keys.grep(/some_foo_measurement/).first
       pending_metric = client.pending[key]
-      expect(pending_metric[:start_time].to_i).to be_within(1).of(now.to_i)
+      expect(pending_metric.start_time.to_i).to be_within(1).of(now.to_i)
     end
     it "records where the execution starts" do
@@ -86,12 +94,10 @@ describe Profit::Client do
       client.start("some_foo_measurement")
       start_line = __LINE__
-      start_file = __FILE__
       key = client.pending.keys.grep(/some_foo_measurement/).first
       pending_metric = client.pending[key]
-      expect(pending_metric[:start_file]).to eq start_file
-      expect(pending_metric[:start_line]).to eq start_line
+      expect(pending_metric.start_line).to match(%r{#{__FILE__}:#{start_line - 1}})
     end
   end
@@ -125,15 +131,14 @@ describe Profit::Client do
       expect(first_measurement_list.count).to eq 2
       expect(second_measurement_list.count).to eq 1
-      expect(JSON.parse(first_measurement_list[0])['recorded_time']).to be_within(0.1).of(1.3)
-      expect(JSON.parse(first_measurement_list[1])['recorded_time']).to be_within(0.1).of(0.2)
+      expect(JSON.parse(first_measurement_list[0])['recorded_time']).to be_within(0.1).of(0.2)
+      expect(JSON.parse(first_measurement_list[1])['recorded_time']).to be_within(0.1).of(1.3)
       expect(JSON.parse(second_measurement_list[0])['recorded_time']).to be_within(0.1).of(1.2)
     end
     it "records where the execution stops" do
       client.start("m_1")
       sleep 0.1
-      stop_file = __FILE__
       stop_line = __LINE__
       client.stop("m_1")
@@ -141,8 +146,7 @@ describe Profit::Client do
       measurements = redis.lrange("profit:metric:m_1", 0, -1)
       metric = JSON.parse(measurements[0])
-      expect(metric['stop_file']).to eq stop_file
-      expect(metric['stop_line']).to eq stop_line
+      expect(metric['stop_line']).to match(%r{#{__FILE__}:#{stop_line + 1}})
     end
   end
 end

data/spec/lib/key_spec.rb ADDED Viewed

@@ -0,0 +1,56 @@
+module Profit
+  describe Profit::Key do
+    let!(:redis) { Redis.new(host: "127.0.0.1", port: 6379) }
+    after do
+      redis.del("profit:keys")
+    end
+    describe ".all" do
+      it "retrieves keys from redis" do
+        redis.sadd("profit:keys", "profit:metric:some_great_key")
+        expect(Key.all.map(&:to_s)).to eq(%w{ some_great_key })
+      end
+    end
+    describe "#to_s" do
+      it "gets back what you put in" do
+        expect(Key.new("some_great_key").to_s).to eq "some_great_key"
+      end
+    end
+    describe "#metrics" do
+      after do
+        redis.del("profit:keys:some_metric")
+      end
+      it "returns the metrics associated with a key" do
+        test_metric = { recorded_time: 0.402520,
+                        start_time: 1371520170,
+                        start_line: "/Users/me/foo.rb:20",
+                        stop_line: "/Users/me/foo.rb:22" }
+        expect(DateTime.strptime("1371520170",'%s').strftime("%H:%M:%S")).to eq "01:49:30"
+        redis.rpush("profit:metric:some_metric", test_metric.to_json)
+        key = Key.new("some_metric")
+        metric = key.metrics.first
+        expect(metric.recorded_time).to eq 0.402520
+        expect(metric.start_time).to eq 1371520170
+      end
+    end
+    describe "#full" do
+      it "returns the full redis key" do
+        expect(Key.new("some_foobar").full).to eq  "profit:metric:some_foobar"
+      end
+    end
+  end
+end

data/spec/lib/metric_spec.rb ADDED Viewed

@@ -0,0 +1,104 @@
+require 'spec_helper'
+module Profit
+  describe Profit::Metric do
+    let(:test_data) do
+      { metric_key: 'some_metric',
+        recorded_time: 0.10051,
+        start_line: "/Users/me/foo.rb:20",
+        start_time: 1371420170,
+        stop_line: "/Users/me/foo.rb:22" }
+    end
+    describe "#new" do
+      it "accepts a json string or a hash to initialize" do
+        with_hash = Metric.new(test_data)
+        with_json = Metric.new(test_data.to_json)
+        expect(with_hash).to be_a(Metric)
+        expect(with_json).to be_a(Metric)
+      end
+    end
+    describe "#data" do
+      it "returns the hash with which it was initiliazed" do
+        with_hash = Metric.new(test_data)
+        with_json = Metric.new(test_data.to_json)
+        expect(with_hash.data).to be_a(ActiveSupport::HashWithIndifferentAccess)
+        expect(with_json.data).to be_a(ActiveSupport::HashWithIndifferentAccess)
+        expect(with_hash.data).to eq with_json.data
+      end
+    end
+    describe "#display_start_time" do
+      it "gives the time as %H:%M:%S" do
+        metric = Metric.new(test_data.to_json)
+        expect(metric.display_start_time).to eq "22:02:50"
+      end
+    end
+    describe "#start_time" do
+      it "gives the unix time the metric started" do
+        metric = Metric.new(test_data.to_json)
+        expect(metric.start_time).to eq 1371420170
+      end
+    end
+    describe "#recorded_time" do
+      it "gives the difference in time as a float" do
+        metric = Metric.new(test_data.to_json)
+        expect(metric.recorded_time).to eq 0.10051
+      end
+    end
+    describe "#point" do
+      it "returns the recorded_time and start_time" do
+        metric = Metric.new(test_data.to_json)
+        expect(metric.point).to eq({ recorded_time: metric.recorded_time,
+                                     start_time: metric.start_time })
+      end
+    end
+    describe "#start_line" do
+      it "returns a string" do
+        metric = Metric.new(test_data)
+        expect(metric.start_line).to eq "/Users/me/foo.rb:20"
+      end
+    end
+    describe "#stop_line" do
+      it "returns a string" do
+        metric = Metric.new(test_data)
+        expect(metric.stop_line).to eq "/Users/me/foo.rb:22"
+      end
+    end
+    describe "#metric_key" do
+      it "returns the key name" do
+        metric = Metric.new(test_data)
+        expect(metric.metric_key).to eq "some_metric"
+      end
+    end
+    describe "#to_json" do
+      it "converts to a json string" do
+        metric = Metric.new(test_data)
+        expect(metric.to_json).to eq test_data.to_json
+      end
+    end
+  end
+end