ffwd 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5591842352846196e113c69a21e957ce75f07d4
-  data.tar.gz: a7859f0d2b76c5bbdf3f92f59dda2dd41e88948e
+  metadata.gz: 0eaf467d00c75edea35139ab207a456cbd37b78d
+  data.tar.gz: 4e8a5de41839bfc8f5460b8d70f085f969082635
 SHA512:
-  metadata.gz: d0818d1cfae4e1404fe0b7cd82e5e9e96c5e4e4bfaadea618be42aa825bf44a755564288c845f36fd7b51a4b4fa73cc29f6a04240e7e73c7f090c10210a6e8ea
-  data.tar.gz: 86c86f31f7044cb38f82f45af351f329759cd015de5b3054169812f8bdf5136e809a5f7646f42d0d8593e2f9f11863da3babb203350bba3762311e6d4f2d0f0d
+  metadata.gz: b44d46575fcedd217b4ebdd76ffef9a40eabf272edf393eb92a646e4e89764f03f1147b7087462f3a4e9df0784347e7f611aeb64166d2740dd8c42cd3830ffdb
+  data.tar.gz: 14b0775875d1b1d658cccbe021832291755c09273a9fa8bae4b4f34e5ee563042a3bcff69b3fc80a9c58ee0c0296f48f01e0b26a3adff728a47c8f3017e57016

data/lib/ffwd/event.rb

@@ -13,6 +13,8 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
+require_relative 'utils'
+
 module FFWD
   # Struct used to define all fields related to an event.
   EventStruct = Struct.new(
@@ -33,17 +35,32 @@ module FFWD
     # A time to live associated with the event.
     :ttl,
     # Tags associated with the event.
-    :tags,
+    :external_tags,
+    # Tags which are statically provided by the internal implementation.
+    :fixed_tags,
     # Attributes (extra fields) associated with the event.
-    :attributes
+    :external_attr,
+    # Attributes which are statically provided by the internal implementation.
+    :fixed_attr
   )
 
   # A convenience class for each individual event.
   class Event < EventStruct
     def self.make opts = {}
       new(opts[:time], opts[:key], opts[:value], opts[:host], opts[:source],
-          opts[:state], opts[:description], opts[:ttl], opts[:tags],
-          opts[:attributes])
+          opts[:state], opts[:description], opts[:ttl],
+          opts[:tags], opts[:fixed_tags],
+          opts[:attributes], opts[:fixed_attr])
+    end
+
+    # maintained for backwards compatibility, but implementors are encouraged
+    # to use internal/external attributes directly.
+    def attributes
+      FFWD.merge_hashes fixed_attr, external_attr
+    end
+
+    def tags
+      FFWD.merge_sets fixed_tags, external_tags
     end
 
     # Convert event to a sparse hash.
@@ -57,8 +74,15 @@ module FFWD
       d[:state] = state if state
       d[:description] = description if description
       d[:ttl] = ttl if ttl
-      d[:tags] = tags.to_a if tags
-      d[:attributes] = attributes if attributes
+
+      if t = tags and not t.empty?
+        d[:tags] = t
+      end
+
+      if a = attributes and not a.empty?
+        d[:attributes] = a
+      end
+
       d
     end
   end

data/lib/ffwd/event_emitter.rb

@@ -42,15 +42,15 @@ module FFWD
       @attributes = attributes
     end
 
-    def emit e
-      e[:time] ||= Time.now
-      e[:host] ||= @host if @host
-      e[:ttl] ||= @ttl if @ttl
-      e[:tags] = FFWD.merge_sets @tags, e[:tags]
-      e[:attributes] = FFWD.merge_hashes @attributes, e[:attributes]
-      e[:value] = nil if (v = e[:value] and v.is_a?(Float) and v.nan?)
+    def emit d
+      d[:time] ||= Time.now
+      d[:host] ||= @host if @host
+      d[:ttl] ||= @ttl if @ttl
+      d[:value] = nil if (v = d[:value] and v.is_a?(Float) and v.nan?)
+      d[:fixed_tags] = @tags
+      d[:fixed_attr] = @attributes
 
-      @output.event Event.make(e)
+      @output.event Event.make(d)
     rescue => e
       log.error "Failed to emit event", e
     end

data/lib/ffwd/metric.rb

@@ -13,6 +13,8 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
+require_relative 'utils'
+
 module FFWD
   # Struct used to define all fields related to a metric.
   MetricStruct = Struct.new(
@@ -26,17 +28,32 @@ module FFWD
     :host,
     # The source metric this metric was derived from (if any).
     :source,
-    # Tags associated to the metric.
-    :tags,
+    # Tags associated with the event.
+    :external_tags,
+    # Tags which are statically provided by the internal implementation.
+    :fixed_tags,
     # Attributes (extra fields) associated to the metric.
-    :attributes
+    :external_attr,
+    # Attributes which are statically provided by the internal implementation.
+    :fixed_attr
   )
 
   # A convenience class for each individual metric.
   class Metric < MetricStruct
     def self.make opts={}
       new(opts[:time], opts[:key], opts[:value], opts[:host], opts[:source],
-          opts[:tags], opts[:attributes])
+          opts[:tags], opts[:fixed_tags],
+          opts[:attributes], opts[:fixed_attr])
+    end
+
+    # maintained for backwards compatibility, but implementors are encouraged
+    # to use internal/external attributes directly.
+    def attributes
+      FFWD.merge_hashes fixed_attr, external_attr
+    end
+
+    def tags
+      FFWD.merge_sets fixed_tags, external_tags
     end
 
     # Convert metric to a sparse hash.
@@ -47,8 +64,15 @@ module FFWD
       d[:value] = value if value
       d[:host] = host if host
       d[:source] = source if source
-      d[:tags] = tags.to_a if tags
-      d[:attributes] = attributes if attributes
+
+      if t = tags and not t.empty?
+        d[:tags] = t
+      end
+
+      if a = attributes and not a.empty?
+        d[:attributes] = a
+      end
+
       d
     end
   end

data/lib/ffwd/metric_emitter.rb

@@ -36,14 +36,14 @@ module FFWD
       @attributes = attributes
     end
 
-    def emit m
-      m[:time] ||= Time.now
-      m[:host] ||= @host if @host
-      m[:tags] = FFWD.merge_sets @tags, m[:tags]
-      m[:attributes] = FFWD.merge_hashes @attributes, m[:attributes]
-      m[:value] = nil if (v = m[:value] and v.is_a?(Float) and v.nan?)
+    def emit d
+      d[:time] ||= Time.now
+      d[:host] ||= @host if @host
+      d[:fixed_tags] = @tags
+      d[:fixed_attr] = @attributes
+      d[:value] = nil if (v = d[:value] and v.is_a?(Float) and v.nan?)
 
-      @output.metric Metric.make(m)
+      @output.metric Metric.make(d)
     rescue => e
       log.error "Failed to emit metric", e
     end

data/lib/ffwd/version.rb

@@ -14,5 +14,5 @@
 # the License.
 
 module FFWD
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffwd
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - John-John Tedro
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2015-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine