ffwd-protobuf 0.1.7 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 84b35690dd6945a213fe79d32afb2dea240912fc
+  data.tar.gz: dd4a200177efac7375d734e9a3d926f3c59ce291
+SHA512:
+  metadata.gz: bb76a0e1314cf2165024788c7a1ed4bedc753e21e7fe3011039a244ba045087a1cf965f2bf995d4c2d0947d2be797e57d4ee5f7882e603eac29193387cf903e8
+  data.tar.gz: bb96764eeaf676988049a13f5ffa0bf77cd24bf59acb48bcaab5654615d72406da89516a40d8597bba40ddbc364616965d95076e93282ef8b1702ff0d804a9f7

data/lib/ffwd/plugin/protobuf/serializer/protocol0.rb

@@ -28,82 +28,64 @@ module FFWD::Plugin::Protobuf::Serializer
   module Protocol0
     P = ::FFWD::Protocol0
 
+    METRIC_FIELDS = [:key, :value, :host]
+    EVENT_FIELDS = [:key, :value, :host, :state, :description, :ttl]
+
     def self.load string
-      message = P::Message.new
-      message.parse_from_string string
+      message = P::Message.decode(string)
 
-      if message.has_field?(:event)
+      if message.event
         yield :event, receive_event(message.event)
       end
 
-      if message.has_field?(:metric)
+      if message.metric
         yield :metric, receive_metric(message.metric)
       end
     end
 
-    def self.receive_event e
-      d = {}
-      d[:time] = Time.at(e.time.to_f / 1000) if e.has_field?(:time)
-      d[:key] = e.key if e.has_field?(:key)
-      d[:value] = e.value if e.has_field?(:value)
-      d[:host] = e.host if e.has_field?(:host)
-      d[:state] = e.state if e.has_field?(:state)
-      d[:description] = e.description if e.has_field?(:description)
-      d[:ttl] = e.ttl if e.has_field?(:ttl)
-      d[:tags] = from_tags e.tags if e.tags
-      d[:attributes] = from_attributes e.attributes if e.attributes
+    def self.map_fields fields, s
+      Hash[fields.map{|f| [f, s.send(f)]}.reject{|f, v| v.nil?}]
+    end
+
+    def self.receive_event event
+      d = map_fields EVENT_FIELDS, event
+      d[:time] = Time.at(event.time.to_f / 1000) if event.time
+      d[:tags] = from_tags event.tags if event.tags
+      d[:attributes] = from_attributes event.attributes if event.attributes
       return d
     end
 
-    def self.receive_metric m
-      d = {}
-      d[:proc] = m.host if m.has_field?(:proc)
-      d[:time] = Time.at(m.time.to_f / 1000) if m.has_field?(:time)
-      d[:key] = m.key if m.has_field?(:key)
-      d[:value] = m.value if m.has_field?(:value)
-      d[:host] = m.host if m.has_field?(:host)
-      d[:tags] = from_tags m.tags if m.tags
-      d[:attributes] = from_attributes m.attributes if m.attributes
+    def self.receive_metric metric
+      d = map_fields METRIC_FIELDS, metric
+      d[:proc] = metric.proc if metric.proc
+      d[:time] = Time.at(metric.time.to_f / 1000) if metric.time
+      d[:tags] = from_tags metric.tags if metric.tags
+      d[:attributes] = from_attributes metric.attributes if metric.attributes
       return d
     end
 
-    def self.from_attributes attributes
-      Hash[attributes.map{|a| [a.key, a.value]}]
+    def self.from_attributes source
+      Hash[source.map{|a| [a.key, a.value]}]
     end
 
-    def self.from_tags tags
-      Array.new tags
+    def self.from_tags source
+      Array.new source
     end
 
     def self.dump_event event
-      e = P::Event.new
+      e = P::Event.new map_fields(EVENT_FIELDS, event)
       e.time = (event.time.to_f * 1000).to_i if event.time
-      e.key = event.key if event.key
-      e.value = event.value.to_f if event.value
-      e.host = event.host if event.host
-      e.state = event.state if event.state
-      e.description = event.description if event.description
-      e.ttl = event.ttl if event.ttl
       e.tags = to_tags event.tags if event.tags
       e.attributes = to_attributes event.attributes if event.attributes
-
-      message = P::Message.new
-      message.event = e
-      message.serialize_to_string
+      P::Message.new(:event => e).encode
     end
 
     def self.dump_metric metric
-      m = P::Metric.new
+      m = P::Metric.new map_fields(METRIC_FIELDS, metric)
       m.time = (metric.time.to_f * 1000).to_i if metric.time
-      m.key = metric.key if metric.key
-      m.value = metric.value.to_f if metric.value
-      m.host = metric.host if metric.host
       m.tags = to_tags metric.tags if metric.tags
       m.attributes = to_attributes metric.attributes if metric.attributes
-
-      message = P::Message.new
-      message.metric = m
-      message.serialize_to_string
+      P::Message.new(:metric => m).encode
     end
 
     private

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

@@ -16,7 +16,7 @@
 module FFWD
   module Plugin
     module Protobuf
-      VERSION = "0.1.7"
+      VERSION = "0.2.0"
     end
   end
 end

data/lib/ffwd/plugin/protobuf.rb

@@ -37,6 +37,10 @@ module FFWD::Plugin::Protobuf
       "protobuf_udp_out"
     end
 
+    def initialize connect, config
+      @connect = connect
+    end
+
     def send_all events, metrics
       events.each do |event|
         send_event event
@@ -48,11 +52,11 @@ module FFWD::Plugin::Protobuf
     end
 
     def send_event event
-      parent.send_data Serializer.dump_event(event)
+      @connect.send_data Serializer.dump_event(event)
     end
 
     def send_metric metric
-      parent.send_data Serializer.dump_metric(metric)
+      @connect.send_data Serializer.dump_metric(metric)
     end
   end
 
@@ -60,10 +64,9 @@ module FFWD::Plugin::Protobuf
     include FFWD::Logging
     include EM::Protocols::FrameObjectProtocol
 
-    def initialize bind, core, log
+    def initialize bind, core, config
       @bind = bind
       @core = core
-      @log = log
     end
 
     def self.plugin_type
@@ -85,10 +88,10 @@ module FFWD::Plugin::Protobuf
         end
       end
     rescue => e
-      @log.error "Failed to receive data", e
+      log.error "Failed to receive data", e
 
-      if @log.debug?
-        @log.debug("DUMP: " + FFWD.dump2hex(datagram))
+      if log.debug?
+        log.debug("DUMP: " + FFWD.dump2hex(datagram))
       end
     end
   end
@@ -100,39 +103,31 @@ module FFWD::Plugin::Protobuf
   OUTPUTS = {:udp => OutputUDP}
   INPUTS = {:udp => InputUDP}
 
-  def self.setup_output opts, core
-    opts[:host] ||= DEFAULT_HOST
-    opts[:port] ||= DEFAULT_PORT
+  def self.setup_output config
+    config[:host] ||= DEFAULT_HOST
+    config[:port] ||= DEFAULT_PORT
+    config[:protocol] ||= DEFAULT_PROTOCOL
 
-    protocol = FFWD.parse_protocol(opts[:protocol] || DEFAULT_PROTOCOL)
+    protocol = FFWD.parse_protocol config[:protocol]
 
     unless handler = OUTPUTS[protocol.family]
-      raise "No type for protocol family: #{protocol.family}"
+      raise "No handler for protocol family: #{protocol.family}"
     end
 
-    protocol.connect opts, core, log, handler
+    protocol.connect config, log, handler
   end
 
-  def self.setup_input opts, core
-    opts[:host] ||= DEFAULT_HOST
-    opts[:port] ||= DEFAULT_PORT
-    protocol = FFWD.parse_protocol(opts[:protocol] || DEFAULT_PROTOCOL)
-
-    unless connection = INPUTS[protocol.family]
-      raise "No connection for protocol family: #{protocol.family}"
-    end
-
-    protocol.bind opts, core, log, connection, log
-  end
+  def self.setup_input config
+    config[:host] ||= DEFAULT_HOST
+    config[:port] ||= DEFAULT_PORT
+    config[:protocol] ||= DEFAULT_PROTOCOL
 
-  def self.setup_tunnel opts, core, tunnel
-    opts[:port] ||= DEFAULT_PORT
-    protocol = FFWD.parse_protocol(opts[:protocol] || DEFAULT_PROTOCOL)
+    protocol = FFWD.parse_protocol config[:protocol]
 
     unless connection = INPUTS[protocol.family]
       raise "No connection for protocol family: #{protocol.family}"
     end
 
-    protocol.tunnel opts, core, tunnel, log, connection, log
+    protocol.bind config, log, connection
   end
 end

data/lib/ffwd/protocol0.pb.rb

@@ -1,93 +1,55 @@
-### Generated by rprotoc. DO NOT EDIT!
-### <proto file: ./plugins/ffwd-protobuf/proto/protocol0.proto>
-# package FFWD.Protocol0;
-# 
-# message Metric {
-#   // processor to use for metric.
-#   optional string proc = 1;
-#   // time in ms when metric was generated.
-#   optional int64 time = 2;
-#   // key of metric.
-#   optional string key = 3;
-#   // value of metric.
-#   optional double value = 4;
-#   // host where metric originated.
-#   optional string host = 5;
-#   // tags associated to metric.
-#   repeated string tags = 6;
-#   // attributes associated to metric.
-#   repeated Attribute attributes = 7;
-# }
-# 
-# message Event {
-#   // time in ms when the event was generated.
-#   optional int64 time = 1;
-#   // key of event.
-#   optional string key = 2;
-#   // value of event.
-#   optional double value = 3;
-#   // host where event originated.
-#   optional string host = 4;
-#   // indicated state of this event.
-#   optional string state = 5;
-#   // description of event.
-#   optional string description = 6;
-#   // time this event should be considered valid in seconds.
-#   optional int64 ttl = 7;
-#   // tags associated to event.
-#   repeated string tags = 8;
-#   // attributes associated to event.
-#   repeated Attribute attributes = 9;
-# }
-# 
-# message Attribute {
-#   required string key = 1;
-#   optional string value = 2;
-# }
-# 
-# message Message {
-#   optional Metric metric = 1;
-#   optional Event event = 2;
-# }
-
-require 'protobuf/message/message'
-require 'protobuf/message/enum'
-require 'protobuf/message/service'
-require 'protobuf/message/extend'
+## Generated from proto/protocol0.proto for ffwd.protocol0
+require "beefcake"
 
 module FFWD
   module Protocol0
-    class Metric < ::Protobuf::Message
-      defined_in __FILE__
-      optional :string, :proc, 1
-      optional :int64, :time, 2
-      optional :string, :key, 3
-      optional :double, :value, 4
-      optional :string, :host, 5
-      repeated :string, :tags, 6
-      repeated :Attribute, :attributes, 7
+
+    class Metric
+      include Beefcake::Message
     end
-    class Event < ::Protobuf::Message
-      defined_in __FILE__
-      optional :int64, :time, 1
-      optional :string, :key, 2
-      optional :double, :value, 3
-      optional :string, :host, 4
-      optional :string, :state, 5
-      optional :string, :description, 6
-      optional :int64, :ttl, 7
-      repeated :string, :tags, 8
-      repeated :Attribute, :attributes, 9
+
+    class Event
+      include Beefcake::Message
     end
-    class Attribute < ::Protobuf::Message
-      defined_in __FILE__
-      required :string, :key, 1
-      optional :string, :value, 2
+
+    class Attribute
+      include Beefcake::Message
     end
-    class Message < ::Protobuf::Message
-      defined_in __FILE__
-      optional :Metric, :metric, 1
-      optional :Event, :event, 2
+
+    class Message
+      include Beefcake::Message
+    end
+
+    class Metric
+      optional :proc, :string, 1
+      optional :time, :int64, 2
+      optional :key, :string, 3
+      optional :value, :double, 4
+      optional :host, :string, 5
+      repeated :tags, :string, 6
+      repeated :attributes, Attribute, 7
+    end
+
+    class Event
+      optional :time, :int64, 1
+      optional :key, :string, 2
+      optional :value, :double, 3
+      optional :host, :string, 4
+      optional :state, :string, 5
+      optional :description, :string, 6
+      optional :ttl, :int64, 7
+      repeated :tags, :string, 8
+      repeated :attributes, Attribute, 9
+    end
+
+    class Attribute
+      required :key, :string, 1
+      optional :value, :string, 2
+    end
+
+    class Message
+      optional :metric, Metric, 1
+      optional :event, Event, 2
     end
   end
-end
+end

metadata

@@ -1,78 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: ffwd-protobuf
 version: !ruby/object:Gem::Version
-  version: 0.1.7
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - John-John Tedro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-30 00:00:00.000000000 Z
+date: 2014-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ruby_protobuf
+  name: beefcake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ffwd
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -82,34 +73,33 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/ffwd/protocol0.pb.rb
-- lib/ffwd/plugin/protobuf/version.rb
-- lib/ffwd/plugin/protobuf/serializer/protocol0.rb
-- lib/ffwd/plugin/protobuf/serializer.rb
 - lib/ffwd/plugin/protobuf.rb
+- lib/ffwd/plugin/protobuf/serializer.rb
+- lib/ffwd/plugin/protobuf/serializer/protocol0.rb
+- lib/ffwd/plugin/protobuf/version.rb
+- lib/ffwd/protocol0.pb.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: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: protobuf reference protocol support for FFWD.
 test_files: []