metrico 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c641a0627db7ea79be5da4122ea5cc48dc6a041
-  data.tar.gz: 656117477721f6d8f6e0779c3e4b2b35dcaf0c1b
+  metadata.gz: 9f00801969093cb02daa9a4c40f50a4150b18dcb
+  data.tar.gz: 8439b128901cd4a7778f2c4498923d79ce966805
 SHA512:
-  metadata.gz: 1129dac0ac3d9b74c6a1f060209266392cb721019aabd528cadf45336618a1fa7892300add9053ee9644a8531aa5fb57ca5bb32eb276b683ecbcfa10c80f1109
-  data.tar.gz: 9e2517320375f5b0445e300a0ac78af3c08496087f2c667e7a4cb9acd62eb87abcc4991d49863b96dcca9e8e8e624bc15077a20cb3ba9c36604d358c802f9508
+  metadata.gz: 4f1a0ba8797abf643b0e0317088e3a36af901487ac6b1dba557025e0563a6899f18c085713636878c9b3d7ddc0b81d5aa3ada2bed4580144d3b794872b216bdd
+  data.tar.gz: 741ee8a853e5f9db5460ce91ed16c2f76e9c105fb05ab34c3d2f22b1e3160ca158b6d809ed80f59643c598fbbe4070bf9c54da12d223cbea4cf0a3d74ad7daf0

data/lib/metrico/point.rb

@@ -3,47 +3,92 @@ module Metrico
     attr_accessor :name, :tags, :fields
 
     def initialize(name, fields, tags = {})
-      @name = name
-      @fields = fields
+      @name = measurement(name)
+      @fields = escape_fields(fields)
       tags = { hostname: Metrico.config.hostname }.merge(tags)
-      @tags = tags
+      @tags = escape_tags(tags)
     end
 
-    # https://docs.influxdata.com/influxdb/v1.2/write_protocols/line_protocol_tutorial/
+    # https://docs.influxdata.com/influxdb/v1.3/write_protocols/line_protocol_tutorial/
     # InfluxDB Line Protocol
+    # weather,location=us-midwest temperature=82 1465839830100400200
+    #   |    -------------------- --------------  |
+    #   |             |             |             |
+    #   |             |             |             |
+    # +-----------+--------+-+---------+-+---------+
+    # |measurement|,tag_set| |field_set| |timestamp|
+    # +-----------+--------+-+---------+-+---------+
     def to_s
-      [
-        metric_name,
-        metric_props
-      ].join(',')
+      str = "#{name}"
+      str << ",#{tags}" if tags
+      str << " #{fields}"
+      str << " #{timestamp}"
+      str
     end
 
-    private def metric_name
-      [Metrico.config.app_name, name].join(':')
-    end
-
-    private def metric_props
-      [
-        comma_equal_flatten_tags(tags),
-        comma_equal_flatten_fields(fields),
-        timestamp
-      ].join(' ')
+    private def measurement(name)
+      escape("#{Metrico.config.app_name}:#{name}", :measurement)
     end
 
     private def timestamp
       (Time.now.to_f * 1_000_000_000).to_i
     end
 
-    private def comma_equal_flatten_tags(hash)
-      compact(hash).map { |k, v| [k, v].join('=') }.join(',')
+    private def escape_tags(tags)
+      return if tags.nil?
+
+      tags = tags.map do |k, v|
+        key = escape(k.to_s, :tag_key)
+        val = escape(v.to_s, :tag_value)
+
+        "#{key}=#{val}" unless key == "".freeze || val == "".freeze
+      end.compact
+
+      tags.join(",") unless tags.empty?
     end
 
-    private def comma_equal_flatten_fields(hash)
-      compact(hash).map { |k, v| [k, v.inspect].join('=') }.join(',')
+    private def escape_fields(fields)
+      return if fields.nil?
+      fields.map do |k, v|
+        key = escape(k.to_s, :field_key)
+        val = escape_value(v)
+        "#{key}=#{val}"
+      end.join(",".freeze)
     end
 
-    private def compact(hash)
-      hash.reject { |_, value| value.nil? }
+    private def escape_value(value)
+      if value.is_a?(String)
+        '"'.freeze + escape(value, :field_value) + '"'.freeze
+      elsif value.is_a?(Integer)
+        "#{value}i"
+      else
+        value.to_s
+      end
     end
+
+    private def escape(string, type)
+      # rubocop:disable Layout/AlignParameters
+      string = string.encode(
+        'UTF-8'.freeze,
+        'UTF-8'.freeze,
+        invalid: :replace,
+        undef: :replace,
+        replace: ''.freeze
+      )
+      
+      ESCAPES[type].each do |char|
+        string = string.gsub(char) { "\\#{char}" }
+      end
+      string
+    end
+
+    ESCAPES = {
+      measurement:  [' '.freeze, ','.freeze],
+      tag_key:      ['='.freeze, ' '.freeze, ','.freeze],
+      tag_value:    ['='.freeze, ' '.freeze, ','.freeze],
+      field_key:    ['='.freeze, ' '.freeze, ','.freeze, '"'.freeze],
+      field_value:  ["\\".freeze, '"'.freeze],
+    }.freeze
+
   end
 end

data/lib/metrico/version.rb

@@ -1,3 +1,3 @@
 module Metrico
-  VERSION = '0.2.4'.freeze
+  VERSION = '0.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metrico
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Ivan Shamatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-15 00:00:00.000000000 Z
+date: 2017-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nats-pure
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: NATS ruby client to write metrics