cmetrics 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ab76eb9253339b05455e7424e0f440bec6a9dd612ef61224066650151755683
-  data.tar.gz: '056618e48e0bb0d6c50a325797096824d8c970b48f26d24c9f224608f48f513d'
+  metadata.gz: 7718f2df26fa25f74be30a4ac65f555b53576641df5ceb5fcb4db8e67ed8b1d0
+  data.tar.gz: 7e154efbf9beaff565af8f812bd63932ebf0594faf800fda4b82790d11911fe1
 SHA512:
-  metadata.gz: 157c179195aa7273939807fa10ac06b2b660cd52ef459ffe733dafe11109eccc8b9c48d4f2cb384ecd250909fe4327321ab3382b83ff77e4432ca76641178059
-  data.tar.gz: 6937cbb0e2ab74b51683d3d3ad5d440b9bd571663a4cae06dd0385b7b3f74bb223c6bf3e4fb9a04e29e13ed480daa928e059323d28eecefe4cdb8af9d086ee70
+  metadata.gz: 807d890634944b9bc738fd518af39a28cfea55a2daad19c0435786ece2535bd94c5fe34c8ab9ebae4c3408180e8005b75ee97377ace9fb6c67c802baad39da1d
+  data.tar.gz: '0698fef3a0195bd4499cedff46f3146aff5a49831e23ef3bc6ce6789df77cb36ef2b956cbcb99d254fabbd44709f964c44612c03c64a9f49b67b9fb4819f2a6c'

data/ext/cmetrics/cmetrics_serde.c

@@ -18,6 +18,8 @@
  */
 
 #include "cmetrics_c.h"
+#include <cmetrics/cmt_map.h>
+#include <cmetrics/cmt_metric.h>
 
 VALUE rb_cSerde;
 
@@ -111,7 +113,11 @@ rb_cmetrics_serde_from_msgpack(int argc, VALUE *argv, VALUE self)
         rb_raise(rb_eRuntimeError, "offset should be smaller than msgpack buffer size.");
     }
 
-    ret = cmt_decode_msgpack_create(&cmt, StringValuePtr(rb_msgpack_buffer), msgpack_length, &offset);
+    if (!NIL_P(rb_msgpack_buffer)) {
+        ret = cmt_decode_msgpack_create(&cmt, StringValuePtr(rb_msgpack_buffer), msgpack_length, &offset);
+    } else {
+        rb_raise(rb_eArgError, "nil is not valid value for buffer");
+    }
 
     if (ret == 0) {
         cmetricsSerde->instance = cmt;
@@ -154,8 +160,11 @@ static VALUE
 rb_cmetrics_serde_from_msgpack_feed_each(VALUE self, VALUE rb_data)
 {
     RETURN_ENUMERATOR(self, 0, 0);
-
-    return rb_cmetrics_serde_from_msgpack_feed_each_impl(self, rb_data, RSTRING_LEN(rb_data));
+    if (!NIL_P(rb_data)) {
+        return rb_cmetrics_serde_from_msgpack_feed_each_impl(self, rb_data, RSTRING_LEN(rb_data));
+    } else {
+        rb_raise(rb_eArgError, "nil is not valid value for buffer");
+    }
 }
 
 static VALUE
@@ -237,6 +246,151 @@ rb_cmetrics_serde_to_text(VALUE self)
     return text;
 }
 
+static VALUE
+append_metric_value(struct cmt_map *map,
+                    VALUE rbHash, struct cmt_metric *metric)
+{
+    uint64_t ts;
+    double val;
+    struct cmt_opts *opts;
+
+    opts = map->opts;
+
+    /* Retrieve metric value */
+    val = cmt_metric_get_value(metric);
+
+    ts = cmt_metric_get_timestamp(metric);
+
+    rb_hash_aset(rbHash, rb_str_new2("name"), rb_str_new2(opts->name));
+    rb_hash_aset(rbHash, rb_str_new2("description"), rb_str_new2(opts->description));
+    rb_hash_aset(rbHash, rb_str_new2("value"), DBL2NUM(val));
+    rb_hash_aset(rbHash, rb_str_new2("timestamp"), DBL2NUM(ts/1000000000.0));
+
+    return rbHash;
+}
+
+static VALUE
+format_metric(struct cmt *cmt, struct cmt_map *map,
+              struct cmt_metric *metric)
+{
+    int n;
+    int static_labels = 0;
+    struct cmt_map_label *label_k;
+    struct cmt_map_label *label_v;
+    struct mk_list *head;
+    struct cmt_opts *opts;
+    struct cmt_label *slabel;
+    VALUE rb_hash = rb_hash_new();
+    VALUE shash = rb_hash_new();
+    VALUE lhash = rb_hash_new();
+
+    opts = map->opts;
+
+    /* Measurement */
+    rb_hash_aset(rb_hash, rb_str_new2("namespace"), rb_str_new2(opts->ns));
+    rb_hash_aset(rb_hash, rb_str_new2("subsystem"), rb_str_new2(opts->subsystem));
+
+    /* Static labels (tags) */
+    static_labels = cmt_labels_count(cmt->static_labels);
+    if (static_labels > 0) {
+        mk_list_foreach(head, &cmt->static_labels->list) {
+            slabel = mk_list_entry(head, struct cmt_label, _head);
+            rb_hash_aset(shash, rb_str_new2(slabel->key), rb_str_new2(slabel->val));
+        }
+        rb_hash_aset(rb_hash, rb_str_new2("static_labels"), shash);
+    }
+
+    /* Labels / Tags */
+    n = mk_list_size(&metric->labels);
+    if (n > 0) {
+        label_k = mk_list_entry_first(&map->label_keys, struct cmt_map_label, _head);
+
+        mk_list_foreach(head, &metric->labels) {
+            label_v = mk_list_entry(head, struct cmt_map_label, _head);
+
+            rb_hash_aset(lhash, rb_str_new2(label_k->name), rb_str_new2(label_v->name));
+
+            label_k = mk_list_entry_next(&label_k->_head, struct cmt_map_label,
+                                         _head, &map->label_keys);
+        }
+        rb_hash_aset(rb_hash, rb_str_new2("labels"), lhash);
+    }
+
+    rb_hash = append_metric_value(map, rb_hash, metric);
+
+    return rb_hash;
+}
+
+static VALUE
+format_metrics(struct cmt *cmt,
+               struct cmt_map *map, int add_timestamp)
+{
+    VALUE rbMetrics = rb_ary_new();
+    VALUE rbMetric;
+    struct mk_list *head;
+    struct cmt_metric *metric;
+
+    /* Simple metric, no labels */
+    if (map->metric_static_set == 1) {
+        rbMetric = format_metric(cmt, map, &map->metric);
+        rb_ary_push(rbMetrics, rbMetric);
+    }
+
+    mk_list_foreach(head, &map->metrics) {
+        metric = mk_list_entry(head, struct cmt_metric, _head);
+        rbMetric = format_metric(cmt, map, metric);
+        rb_ary_push(rbMetrics, rbMetric);
+    }
+
+    return rbMetrics;
+}
+
+static VALUE
+rb_cmetrics_serde_get_metrics(VALUE self)
+{
+    VALUE rbMetrics = rb_ary_new();
+    VALUE rbMetricsInner = rb_ary_new();
+    struct CMetricsSerde* cmetricsSerde;
+    struct mk_list *head;
+    struct cmt_gauge *gauge;
+    struct cmt_counter *counter;
+    struct cmt_untyped *untyped;
+    struct cmt *cmt;
+    int add_timestamp = CMT_TRUE;
+
+    TypedData_Get_Struct(
+            self, struct CMetricsSerde, &rb_cmetrics_serde_type, cmetricsSerde);
+
+    cmt = cmetricsSerde->instance;
+
+    if (cmt == NULL) {
+        rb_raise(rb_eRuntimeError, "Invalid cmt context");
+    }
+
+    /* Counters */
+    mk_list_foreach(head, &cmt->counters) {
+        counter = mk_list_entry(head, struct cmt_counter, _head);
+        rbMetricsInner = format_metrics(cmt, counter->map, add_timestamp);
+        rb_ary_push(rbMetrics, rbMetricsInner);
+    }
+
+    /* Gauges */
+    mk_list_foreach(head, &cmt->gauges) {
+        gauge = mk_list_entry(head, struct cmt_gauge, _head);
+        rbMetricsInner = format_metrics(cmt, gauge->map, add_timestamp);
+        rb_ary_push(rbMetrics, rbMetricsInner);
+    }
+
+    /* Untyped */
+    mk_list_foreach(head, &cmt->untypeds) {
+        untyped = mk_list_entry(head, struct cmt_untyped, _head);
+        rbMetricsInner = format_metrics(cmt, untyped->map, add_timestamp);
+        rb_ary_push(rbMetrics, rbMetricsInner);
+    }
+
+    return rbMetrics;
+}
+
 void Init_cmetrics_serde(VALUE rb_mCMetrics)
 {
     rb_cSerde = rb_define_class_under(rb_mCMetrics, "Serde", rb_cObject);
@@ -250,4 +404,6 @@ void Init_cmetrics_serde(VALUE rb_mCMetrics)
     rb_define_method(rb_cSerde, "to_msgpack", rb_cmetrics_serde_to_msgpack, 0);
     rb_define_method(rb_cSerde, "feed_each", rb_cmetrics_serde_from_msgpack_feed_each, 1);
     rb_define_method(rb_cSerde, "to_s", rb_cmetrics_serde_to_text, 0);
+    rb_define_method(rb_cSerde, "get_metrics", rb_cmetrics_serde_get_metrics, 0);
+    rb_define_method(rb_cSerde, "metrics", rb_cmetrics_serde_get_metrics, 0);
 }

data/ext/cmetrics/extconf.rb

@@ -27,19 +27,19 @@ class BuildCMetrics
     @checkpoint = ".#{@recipe.name}-#{@recipe.version}.installed"
     @recipe.target = File.join(ROOT, "ports")
     @recipe.files << {
-      url: "file://#{ROOT}/ext/#{@recipe.name}-#{@recipe.version}.tar.gz",
-      sha256sum: "5ba909df989bf7f3404000d9e04702eaa47cbfd51bb8ec161ca19011f95bc360",
+      url: "https://codeload.github.com/calyptia/cmetrics/tar.gz/v#{version}",
+      sha256sum: "f0c79707ad4d18980bf0d1d64ed8cb73a40c586c36a4caf38233ae8d9a4c6cc7",
     }
   end
 
   def build
     unless File.exist?(@checkpoint)
       @recipe.cook
-      libcmetrics_path = File.join(ROOT, "ports/#{@recipe.host}/cmetrics/#{@version}/lib/libcmetrics.a")
+      libcmetrics_path = Dir.glob(File.join(ROOT, "ports/#{@recipe.host}/cmetrics/#{@version}/lib*/libcmetrics.a")).first
       FileUtils.cp(libcmetrics_path, File.join(ROOT, "ext", "cmetrics", "libcmetrics.a"))
-      libmpack_path = File.join(ROOT, "ports/#{@recipe.host}/cmetrics/#{@version}/lib/libmpack.a")
+      libmpack_path = Dir.glob(File.join(ROOT, "ports/#{@recipe.host}/cmetrics/#{@version}/lib*/libmpack.a")).first
       FileUtils.cp(libmpack_path, File.join(ROOT, "ext", "cmetrics", "libmpack.a"))
-      libxxhash_path = File.join(ROOT, "ports/#{@recipe.host}/cmetrics/#{@version}/lib/libxxhash.a")
+      libxxhash_path = Dir.glob(File.join(ROOT, "ports/#{@recipe.host}/cmetrics/#{@version}/lib*/libxxhash.a")).first
       FileUtils.cp(libxxhash_path, File.join(ROOT, "ext", "cmetrics", "libxxhash.a"))
       include_path = File.join(ROOT, "ports/#{@recipe.host}/cmetrics/#{@version}/include/")
       FileUtils.cp_r(Dir.glob(File.join(include_path, "*")), File.join(ROOT, "ext", "cmetrics"))
@@ -52,7 +52,7 @@ class BuildCMetrics
   end
 end
 
-cmetrics = BuildCMetrics.new
+cmetrics = BuildCMetrics.new("0.2.1")
 cmetrics.build
 
 libdir = RbConfig::CONFIG["libdir"]

data/lib/cmetrics/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CMetrics
-  VERSION = "0.1.6"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmetrics
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Hiroshi Hatake
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-12 00:00:00.000000000 Z
+date: 2021-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -99,7 +99,6 @@ files:
 - bin/console
 - bin/setup
 - cmetrics-ruby.gemspec
-- ext/cmetrics-master.tar.gz
 - ext/cmetrics/cmetrics.c
 - ext/cmetrics/cmetrics_c.h
 - ext/cmetrics/cmetrics_counter.c
@@ -130,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: C binding for cmetric library.