ffwd-statsd 0.1.6 → 0.1.7

data/lib/ffwd/plugin/statsd/connection.rb

@@ -19,25 +19,57 @@ require 'ffwd/connection'
 require_relative 'parser'
 
 module FFWD::Plugin::Statsd
-  class Connection < FFWD::Connection
-    include FFWD::Logging
-
-    def self.plugin_type
-      "statsd_in"
+  module Connection
+    module ConnectionBase
+      def receive_statsd_frame(data)
+        metric = Parser.parse(data)
+        return if metric.nil?
+        @core.input.metric metric
+        @bind.increment :received_metrics
+      rescue ParserError => e
+        log.error "Invalid frame '#{data}': #{e}"
+        @bind.increment :failed_metrics
+      rescue => e
+        log.error "Error when parsing metric '#{data}'", e
+        @bind.increment :failed_metrics
+      end
     end
 
-    def initialize bind, core
-      @bind = bind
-      @core = core
+    class UDP < FFWD::Connection
+      include ConnectionBase
+      include FFWD::Logging
+
+      def initialize bind, core
+        @bind = bind
+        @core = core
+      end
+
+      def self.plugin_type
+        "statsd_udp_in"
+      end
+
+      def receive_data data
+        receive_statsd_frame data
+      end
     end
 
-    def receive_data(data)
-      metric = Parser.parse(data)
-      return if metric.nil?
-      @core.input.metric metric
-      @bind.increment :received_metrics
-    rescue => e
-      log.error "Failed to receive data", e
+    class TCP < FFWD::Connection
+      include ConnectionBase
+      include FFWD::Logging
+      include EM::Protocols::LineText2
+
+      def initialize bind, core
+        @bind = bind
+        @core = core
+      end
+
+      def self.plugin_type
+        "statsd_tcp_in"
+      end
+
+      def receive_line(data)
+        receive_statsd_frame data
+      end
     end
   end
 end

data/lib/ffwd/plugin/statsd/parser.rb

@@ -14,9 +14,12 @@
 # the License.
 
 module FFWD::Plugin::Statsd
+  class ParserError < Exception; end
+
   module Parser
     COUNT = "count"
     HISTOGRAM = "histogram"
+    RATE = "rate"
 
     def self.gauge name, value
       {:proc => nil, :key => name, :value => value}
@@ -26,21 +29,39 @@ module FFWD::Plugin::Statsd
       {:proc => COUNT, :key => name, :value => value}
     end
 
+    def self.meter name, value
+      {:proc => RATE, :key => name, :value => value}
+    end
+
     def self.timing name, value
       {:proc => HISTOGRAM, :key => name, :value => value}
     end
 
-    def self.parse line
-      name, value = line.split ':', 2
-      raise "invalid frame" if value.nil?
-      value, type = value.split '|', 2
-      raise "invalid frame" if type.nil?
-      type, sample_rate = type.split '|@', 2
+    def self.parse m
+      name, value = m.split ':', 2
+
+      if value.nil?
+        raise ParserError.new("Missing value")
+      end
+
+      value, type_block = value.split '|', 2
+
+      if type_block.nil?
+        raise ParserError.new("Missing type")
+      end
 
-      return nil if type.nil? or type.empty?
-      return nil if value.nil? or value.empty?
+      type, sample_rate = type_block.split '|@', 2
+
+      if type.nil? or type.empty?
+        raise ParserError.new("Missing type")
+      end
+
+      if value.nil? or value.empty?
+        raise ParserError.new("Missing value")
+      end
+
+      value = value.to_f
 
-      value = value.to_f unless value.nil?
       sample_rate = sample_rate.to_f unless sample_rate.nil?
 
       value /= sample_rate unless sample_rate.nil?
@@ -53,12 +74,16 @@ module FFWD::Plugin::Statsd
         return count(name, value)
       end
 
-      if type == "ms"
+      if type == "m"
+        return meter(name, value)
+      end
+
+      if type == "ms" or type == "h"
         return timing(name, value)
       end
 
-      log.warning "Not supported type: #{type}"
-      return nil
+      raise ParserError.new(
+        "Received message of unsupported type '#{type}'")
     end
   end
 end

data/lib/ffwd/plugin/statsd/version.rb

@@ -16,7 +16,7 @@
 module FFWD
   module Plugin
     module Statsd
-      VERSION = "0.1.6"
+      VERSION = "0.1.7"
     end
   end
 end

data/lib/ffwd/plugin/statsd.rb

@@ -28,16 +28,28 @@ module FFWD::Plugin::Statsd
   DEFAULT_HOST = "localhost"
   DEFAULT_PORT = 8125
 
+  INPUTS = {:tcp => Connection::TCP, :udp => Connection::UDP}
+
   def self.setup_input opts, core
     opts[:host] ||= DEFAULT_HOST
     opts[:port] ||= DEFAULT_PORT
     protocol = FFWD.parse_protocol(opts[:protocol] || "udp")
-    protocol.bind opts, core, log, Connection
+
+    unless connection = INPUTS[protocol.family]
+      raise "No connection for protocol family: #{protocol.family}"
+    end
+
+    protocol.bind opts, core, log, connection
   end
 
   def self.setup_tunnel opts, core, tunnel
     opts[:port] ||= DEFAULT_PORT
     protocol = FFWD.parse_protocol(opts[:protocol] || "tcp")
-    protocol.tunnel opts, core, tunnel, log, Connection
+
+    unless connection = INPUTS[protocol.family]
+      raise "No connection for protocol family: #{protocol.family}"
+    end
+
+    protocol.tunnel opts, core, tunnel, log, connection
   end
 end

metadata

@@ -1,32 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: ffwd-statsd
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
+  prerelease: 
 platform: ruby
 authors:
 - John-John Tedro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-29 00:00:00.000000000 Z
+date: 2014-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffwd
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.7
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -59,32 +66,33 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/ffwd/plugin/statsd.rb
 - lib/ffwd/plugin/statsd/version.rb
 - lib/ffwd/plugin/statsd/parser.rb
 - lib/ffwd/plugin/statsd/connection.rb
-- lib/ffwd/plugin/statsd.rb
 homepage: https://github.com/spotify/ffwd
 licenses:
 - Apache 2.0
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: StatsD support for FFWD.
 test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MTQ4OGUwYzIwMDE0ZWYwNDA3NzkxYmQwNWI4NDEyYTM2NTQ2MzUzMA==
-  data.tar.gz: !binary |-
-    ODcwY2UwZjU5Y2Q5MTJmMWYzNDk2Yjc2MDBiMDYzM2U4OGNhY2E3NA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ZWUyMzc5MDRlZTE0YWE5YWRmYmFjNWVlY2MzZjkxNDdmZWRmY2MyMGFkYjc5
-    MDUzMjA5MDU0MDhmMmI5MWNlMTBjNDE4NzRjYTU1YjZhZTViMDBlY2QxMWI0
-    NDk3MTdhYjJjOWIwZTM0NmMzMjkwZmNiYmY2OWYxZmUwNTBjOWU=
-  data.tar.gz: !binary |-
-    ZTJlZGExNDA0MjAyOGFlZWY1NTVjMGViYzBiYmQ3YTAwNjVkNDU3NTM2NTY5
-    YjJlZGJlOTQwZTgzYzk5YjM1OGNmMjFkYWRmZjFmOWViMDNlZDliZjdhYTli
-    Nzc0MDVmMDZiODlmMzdiYTc0YzAyYWIxMjBhZWM2Y2Y4MTI0OTg=