metrix 0.0.13 → 0.0.14

data/lib/metrix/graphite.rb

@@ -1,45 +1,21 @@
 require "socket"
 require "metrix"
+require "metrix/tcp_reporter"
 
 module Metrix
-  class Graphite
+  class Graphite < TcpReporter
     attr_reader :host, :port
 
     def initialize(host, port = 2003)
-      @host = host
-      @port = port
+      super(host, port, 100)
     end
 
-    def <<(metric)
-      metric.metrics.each do |m|
-        logger.debug "adding #{m.to_graphite}"
-        buffers << m.to_graphite
-        flush if buffers.count > 90
-      end
+    def window_size
+      90
     end
 
-    def buffers
-      @buffers ||= []
-    end
-
-    def flush
-      Timeout.timeout(1) do
-        if buffers.empty?
-          logger.info "nothing to send"
-          return
-        end
-        started = Time.now
-        Socket.tcp(@host, @port) do |socket|
-          socket.puts(buffers.join("\n"))
-        end
-        logger.info "sent #{buffers.count} in %.06fs" % [Time.now - started]
-      end
-    ensure
-      buffers.clear
-    end
-
-    def logger
-      Metrix.logger
+    def serialize_metric(m)
+      m.to_graphite
     end
   end
 end

data/lib/metrix/opentsdb.rb

@@ -1,39 +1,22 @@
 require "socket"
 require "timeout"
+require "benchmark"
+require "metrix/tcp_reporter"
 
 module Metrix
-  class OpenTSDB
-    attr_reader :host, :port
-
-    def initialize(host, port = 4242)
-      @host = host
-      @port = port
-    end
-
+  class OpenTSDB < TcpReporter
     def <<(metric)
       metric.metrics.each do |m|
         Metrix.logger.debug "buffering #{m.to_opentsdb}"
         buffers << m.to_opentsdb
-        flush if buffers.count >= 90
+        flush if buffers.count >= 1000
       end
     rescue => err
       Metrix.logger.error "#{err.message} #{err.inspect}"
     end
 
-    def flush
-      Timeout.timeout(1) do
-        return if buffers.empty?
-        Metrix.logger.info "sending #{buffers.count} to #{@host}:#{@port}"
-        Socket.tcp(@host, @port) do |socket|
-          socket.puts buffers.join("\n")
-        end
-      end
-    ensure
-      buffers.clear
-    end
-
-    def buffers
-      @buffers ||= []
+    def serialize_metric(m)
+      m.to_opentsdb
     end
   end
 end

data/lib/metrix/process_metric.rb

@@ -19,7 +19,11 @@ module Metrix
     end
 
     def name
-      comm.gsub(/^\(/, "").gsub(/\)$/, "")
+      normalize_name(comm)
+    end
+
+    def normalize_name(the_name)
+      the_name.gsub(/^\(/, "").gsub(/\)$/, "").gsub(/[^\w]+/i, "_")
     end
 
     def chunks

data/lib/metrix/tcp_reporter.rb

@@ -0,0 +1,53 @@
+module Metrix
+  class TcpReporter
+    attr_reader :host, :port
+
+    def initialize(host, port = 4242, window_size = nil)
+      @host = host
+      @port = port
+      @window_size = window_size
+    end
+
+    def window_size
+      @window_size || 1000
+    end
+
+    def buffers
+      @buffers ||= []
+    end
+
+    def <<(metric)
+      metric.metrics.each do |m|
+        line = serialize_metric(m)
+        Metrix.logger.debug "buffering #{line}"
+        buffers << line
+        flush if buffers.count >= window_size
+      end
+    rescue => err
+      logger.error "#{err.message} #{err.inspect}"
+    end
+
+    def flush
+      Timeout.timeout(1) do
+        return if buffers.empty?
+        cnt = buffers.count
+        Metrix.logger.info "sending #{cnt} to #{@host}:#{@port}"
+        ms = Benchmark.measure do
+          Socket.tcp(@host, @port) do |socket|
+            buffers.each do |line|
+              socket.puts line
+            end
+            socket.flush
+          end
+        end
+        logger.info "sent %d metrics in %.06f" % [cnt, ms.real]
+      end
+    ensure
+      buffers.clear
+    end
+
+    def logger
+      Metrix.logger
+    end
+  end
+end

data/lib/metrix/version.rb

@@ -1,3 +1,3 @@
 module Metrix
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

data/spec/fixtures/proc.5.txt

@@ -0,0 +1 @@
+5 (kworker/0:0H) S 2 0 0 0 -1 69238880 0 0 0 0 0 0 0 0 0 -20 1 0 12 0 0 18446744073709551615 0 0 0 0 0 0 0 2147483647 0 18446744071579336871 0 0 17 0 0 0 0 0 0 0 0 0 0 0 0 0 0

data/spec/lib/metrix/process_metric_spec.rb

@@ -13,6 +13,24 @@ describe "Metrix::ProcessMetric" do
   it { subject.utime.should eq(32337) }
   it { subject.stime.should eq(34740) }
 
+  describe "#normalize_name", :wip do
+    {
+      "kworker/0:0H" => "kworker_0_0H",
+      "(java)" => "java"
+    }.each do |from, to|
+      it "normalized #{from.inspect} to #{to.inspect}" do
+        subject.normalize_name(from).should eq(to)
+      end
+    end
+  end
+
+  describe "with crazy characters", :wip do
+    let(:data) { FIXTURES_PATH.join("proc.5.txt").read }
+    subject(:process) { Metrix::ProcessMetric.new(data) }
+
+    it { subject.name.should eq("kworker_0_0H") }
+  end
+
   describe "#metrics" do
     subject(:metrics) do
       hash_metrics(process.metrics)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metrix
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000 Z
+date: 2013-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: SyslogLogger
@@ -107,6 +107,7 @@ files:
 - lib/metrix/process_metric.rb
 - lib/metrix/reporter/stdout.rb
 - lib/metrix/system.rb
+- lib/metrix/tcp_reporter.rb
 - lib/metrix/version.rb
 - metrix.gemspec
 - spec/fixtures/df.txt
@@ -120,6 +121,7 @@ files:
 - spec/fixtures/nginx.status.txt
 - spec/fixtures/php.fpm.status.txt
 - spec/fixtures/proc.26928.txt
+- spec/fixtures/proc.5.txt
 - spec/fixtures/proc.stat.txt
 - spec/lib/metrix/base_spec.rb
 - spec/lib/metrix/cli_spec.rb
@@ -174,6 +176,7 @@ test_files:
 - spec/fixtures/nginx.status.txt
 - spec/fixtures/php.fpm.status.txt
 - spec/fixtures/proc.26928.txt
+- spec/fixtures/proc.5.txt
 - spec/fixtures/proc.stat.txt
 - spec/lib/metrix/base_spec.rb
 - spec/lib/metrix/cli_spec.rb