cmetrics 0.2.1 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2886740550218bbb68b6248676ffefa606939d2c2f6fabb5043e9b08f2cb152f
-  data.tar.gz: 4b73350710d2c56349fdb83af9e45565e4e38cffb62f48344f25244c27688cce
+  metadata.gz: 17d74002b1bf99b4f6be2b1b2ce5d79409da9305d7915e2006014f42c8c01429
+  data.tar.gz: 75fc26e6fa974c990f83fae2e16484b185bf00262713ac24d07e607e6d2a7095
 SHA512:
-  metadata.gz: 0e93ebcde84cfd9c2835f68516891f6616c3c77785b789d195c3bf0fe2d5b384314c700f34413f640680da91190cbe16f03961f540dd326515647dc754237265
-  data.tar.gz: b1c4c88fb1416047862f5d5027ce7c92bed28fe0e1172707fa3394af947cc320a64833ab9cbbcfa510ced7f14201ab4ea6b9958a16b5af9fd28a1be26bd00d98
+  metadata.gz: bd95645446f591377adfa1b4561a45bb22cc20446e60ebe577c13b4c67325cd9d1c9c87c3c215f786585853da71eb05449a37ace48339f12c2e3c422c69b68f4
+  data.tar.gz: 85ccdb531c1cb45df65b477352e1a9c555b105a6a658b5cea977e987123d92e05b827148b4ddc4e11e1f129413c602bacccd77da32e0ded9bee6e51a68e1e5d1

data/.github/workflows/linux.yml

@@ -10,9 +10,9 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.0.1
+        ruby-version: '3.0'
     - name: Run the default task
       run: |
-        gem install bundler -v 2.2.15
+        gem install bundler -v 2.2.26
         bundle install
         bundle exec rake

data/.github/workflows/macos.yml

@@ -10,9 +10,9 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.0.1
+        ruby-version: '3.0'
     - name: Run the default task
       run: |
-        gem install bundler -v 2.2.15
+        gem install bundler -v 2.2.26
         bundle install
         bundle exec rake

data/.github/workflows/windows.yml

@@ -10,9 +10,9 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.0.1
+        ruby-version: '3.0'
     - name: Run the default task
       run: |
-        gem install bundler -v 2.2.15
+        gem install bundler -v 2.2.26
         ridk exec bundle install
         ridk exec bundle exec rake

data/cmetrics-ruby.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", ">= 0"
   spec.add_development_dependency "rake-compiler", "~> 1.0"
   spec.add_development_dependency "rake-compiler-dock", "~> 1.0"
+  spec.add_development_dependency "msgpack", "~> 1.4.2"
 
   spec.add_dependency 'mini_portile2', '~> 2.7'
 end

data/ext/cmetrics/cmetrics_c.h

@@ -65,5 +65,8 @@ void Init_cmetrics_counter(VALUE rb_mCMetrics);
 void Init_cmetrics_gauge(VALUE rb_mCMetrics);
 void Init_cmetrics_serde(VALUE rb_mCMetrics);
 void Init_cmetrics_untyped(VALUE rb_mCMetrics);
+const struct CMetricsCounter *cmetrics_counter_get_ptr(VALUE rb_mCMetrics);
+const struct CMetricsGauge *cmetrics_gauge_get_ptr(VALUE rb_mCMetrics);
+const struct CMetricsUntyped *cmetrics_untyped_get_ptr(VALUE rb_mCMetrics);
 
 #endif // _CMETRICS_C_H

data/ext/cmetrics/cmetrics_counter.c

@@ -34,16 +34,32 @@ static const rb_data_type_t rb_cmetrics_counter_type = { "cmetrics/counter",
                                                          RUBY_TYPED_FREE_IMMEDIATELY };
 
 
+const struct CMetricsCounter *cmetrics_counter_get_ptr(VALUE self)
+{
+    struct CMetricsCounter *cmetricsCounter = NULL;
+
+    TypedData_Get_Struct(
+            self, struct CMetricsCounter, &rb_cmetrics_counter_type, cmetricsCounter);
+
+    if (NIL_P(self)) {
+        rb_raise(rb_eRuntimeError, "Given CMetrics argument must not be nil");
+    }
+    if (!cmetricsCounter->counter) {
+        rb_raise(rb_eRuntimeError, "Create counter with CMetrics::Counter#create first.");
+    }
+    return cmetricsCounter;
+}
+
 static void
 counter_free(void* ptr)
 {
     struct CMetricsCounter* cmetricsCounter = (struct CMetricsCounter*)ptr;
 
-    if (!cmetricsCounter) {
-        if (!cmetricsCounter->counter) {
+    if (cmetricsCounter) {
+        if (cmetricsCounter->counter) {
             cmt_counter_destroy(cmetricsCounter->counter);
         }
-        if (!cmetricsCounter->instance) {
+        if (cmetricsCounter->instance) {
             cmt_destroy(cmetricsCounter->instance);
         }
     }

data/ext/cmetrics/cmetrics_gauge.c

@@ -34,16 +34,32 @@ static const rb_data_type_t rb_cmetrics_gauge_type = { "cmetrics/gauge",
                                                        RUBY_TYPED_FREE_IMMEDIATELY };
 
 
+const struct CMetricsGauge *cmetrics_gauge_get_ptr(VALUE self)
+{
+    struct CMetricsGauge *cmetricsGauge = NULL;
+
+    TypedData_Get_Struct(
+            self, struct CMetricsGauge, &rb_cmetrics_gauge_type, cmetricsGauge);
+
+    if (NIL_P(self)) {
+        rb_raise(rb_eRuntimeError, "Given CMetrics argument must not be nil");
+    }
+    if (!cmetricsGauge->gauge) {
+        rb_raise(rb_eRuntimeError, "Create gauge with CMetrics::Gauge#create first.");
+    }
+    return cmetricsGauge;
+}
+
 static void
 gauge_free(void* ptr)
 {
     struct CMetricsGauge* cmetricsGauge = (struct CMetricsGauge*)ptr;
 
-    if (!cmetricsGauge) {
-        if (!cmetricsGauge->gauge) {
+    if (cmetricsGauge) {
+        if (cmetricsGauge->gauge) {
             cmt_gauge_destroy(cmetricsGauge->gauge);
         }
-        if (!cmetricsGauge->instance) {
+        if (cmetricsGauge->instance) {
             cmt_destroy(cmetricsGauge->instance);
         }
     }

data/ext/cmetrics/cmetrics_serde.c

@@ -20,9 +20,15 @@
 #include "cmetrics_c.h"
 #include <cmetrics/cmt_map.h>
 #include <cmetrics/cmt_metric.h>
+#include <cmetrics/cmt_cat.h>
+#include <cmetrics/cmt_encode_prometheus_remote_write.h>
 
 VALUE rb_cSerde;
 
+extern VALUE rb_cCounter;
+extern VALUE rb_cGauge;
+extern VALUE rb_cUntyped;
+
 static void serde_free(void* ptr);
 
 static const rb_data_type_t rb_cmetrics_serde_type = { "cmetrics/serde",
@@ -41,8 +47,8 @@ serde_free(void* ptr)
 {
     struct CMetricsSerde* cmetricsSerde = (struct CMetricsSerde*)ptr;
 
-    if (!cmetricsSerde) {
-        if (!cmetricsSerde->instance) {
+    if (cmetricsSerde) {
+        if (cmetricsSerde->instance) {
             cmt_destroy(cmetricsSerde->instance);
         }
     }
@@ -98,7 +104,7 @@ rb_cmetrics_serde_from_msgpack(int argc, VALUE *argv, VALUE self)
     rb_scan_args(argc, argv, "12", &rb_msgpack_buffer, &rb_msgpack_length, &rb_offset);
     if (!NIL_P(rb_msgpack_length)) {
         Check_Type(rb_msgpack_length, T_FIXNUM);
-        msgpack_length = INT2NUM(rb_msgpack_length);
+        msgpack_length = ULONG2NUM(rb_msgpack_length);
     } else {
         msgpack_length = RSTRING_LEN(rb_msgpack_buffer);
     }
@@ -168,6 +174,64 @@ rb_cmetrics_serde_from_msgpack_feed_each(VALUE self, VALUE rb_data)
     }
 }
 
+static VALUE
+rb_cmetrics_serde_concat_metric(VALUE self, VALUE rb_data)
+{
+    struct CMetricsSerde* cmetricsSerde = NULL;
+    struct CMetricsCounter* cmetricsCounter = NULL;
+    struct CMetricsGauge* cmetricsGauge = NULL;
+    struct CMetricsUntyped* cmetricsUntyped = NULL;
+
+    TypedData_Get_Struct(
+            self, struct CMetricsSerde, &rb_cmetrics_serde_type, cmetricsSerde);
+
+    if (!NIL_P(rb_data)) {
+        if (cmetricsSerde->instance == NULL) {
+            cmetricsSerde->instance = cmt_create();
+        }
+
+        if (rb_obj_is_kind_of(rb_data, rb_cCounter)) {
+            cmetricsCounter = (struct CMetricsCounter *)cmetrics_counter_get_ptr(rb_data);
+            cmt_cat(cmetricsSerde->instance, cmetricsCounter->instance);
+        } else if (rb_obj_is_kind_of(rb_data, rb_cGauge)) {
+            cmetricsGauge = (struct CMetricsGauge *)cmetrics_gauge_get_ptr(rb_data);
+            cmt_cat(cmetricsSerde->instance, cmetricsGauge->instance);
+        } else if (rb_obj_is_kind_of(rb_data, rb_cUntyped)) {
+            cmetricsUntyped = (struct CMetricsUntyped *)cmetrics_untyped_get_ptr(rb_data);
+            cmt_cat(cmetricsSerde->instance, cmetricsUntyped->instance);
+        } else {
+            rb_raise(rb_eArgError, "specified type of instance is not supported.");
+        }
+    } else {
+        rb_raise(rb_eArgError, "nil is not valid value for concatenating");
+    }
+
+    return Qnil;
+}
+
+static VALUE
+rb_metrics_serde_prometheus_remote_write(VALUE self)
+{
+    struct CMetricsSerde* cmetricsSerde;
+    cmt_sds_t prom;
+    VALUE str;
+
+    TypedData_Get_Struct(
+            self, struct CMetricsSerde, &rb_cmetrics_serde_type, cmetricsSerde);
+
+    if (cmetricsSerde->instance == NULL) {
+        rb_raise(rb_eRuntimeError, "Invalid cmt context");
+    }
+
+    prom = cmt_encode_prometheus_remote_write_create(cmetricsSerde->instance);
+
+    str = rb_str_new2(prom);
+
+    cmt_encode_prometheus_remote_write_destroy(prom);
+
+    return str;
+}
+
 static VALUE
 rb_cmetrics_serde_to_prometheus(VALUE self)
 {
@@ -178,6 +242,10 @@ rb_cmetrics_serde_to_prometheus(VALUE self)
     TypedData_Get_Struct(
             self, struct CMetricsSerde, &rb_cmetrics_serde_type, cmetricsSerde);
 
+    if (cmetricsSerde->instance == NULL) {
+        rb_raise(rb_eRuntimeError, "Invalid cmt context");
+    }
+
     prom = cmt_encode_prometheus_create(cmetricsSerde->instance, CMT_TRUE);
 
     str = rb_str_new2(prom);
@@ -197,6 +265,10 @@ rb_cmetrics_serde_to_influx(VALUE self)
     TypedData_Get_Struct(
             self, struct CMetricsSerde, &rb_cmetrics_serde_type, cmetricsSerde);
 
+    if (cmetricsSerde->instance == NULL) {
+        rb_raise(rb_eRuntimeError, "Invalid cmt context");
+    }
+
     prom = cmt_encode_influx_create(cmetricsSerde->instance);
 
     str = rb_str_new2(prom);
@@ -216,6 +288,10 @@ rb_cmetrics_serde_to_msgpack(VALUE self)
     TypedData_Get_Struct(
             self, struct CMetricsSerde, &rb_cmetrics_serde_type, cmetricsSerde);
 
+    if (cmetricsSerde->instance == NULL) {
+        rb_raise(rb_eRuntimeError, "Invalid cmt context");
+    }
+
     ret = cmt_encode_msgpack_create(cmetricsSerde->instance, &buffer, &buffer_size);
 
     if (ret == 0) {
@@ -235,6 +311,10 @@ rb_cmetrics_serde_to_text(VALUE self)
     TypedData_Get_Struct(
             self, struct CMetricsSerde, &rb_cmetrics_serde_type, cmetricsSerde);
 
+    if (cmetricsSerde->instance == NULL) {
+        rb_raise(rb_eRuntimeError, "Invalid cmt context");
+    }
+
     buffer = cmt_encode_text_create(cmetricsSerde->instance);
     if (buffer == NULL) {
         return Qnil;
@@ -399,7 +479,9 @@ void Init_cmetrics_serde(VALUE rb_mCMetrics)
     rb_define_alloc_func(rb_cSerde, rb_cmetrics_serde_alloc);
 
     rb_define_method(rb_cSerde, "initialize", rb_cmetrics_serde_initialize, 0);
+    rb_define_method(rb_cSerde, "concat", rb_cmetrics_serde_concat_metric, 1);
     rb_define_method(rb_cSerde, "from_msgpack", rb_cmetrics_serde_from_msgpack, -1);
+    rb_define_method(rb_cSerde, "prometheus_remote_write", rb_metrics_serde_prometheus_remote_write, 0);
     rb_define_method(rb_cSerde, "to_prometheus", rb_cmetrics_serde_to_prometheus, 0);
     rb_define_method(rb_cSerde, "to_influx", rb_cmetrics_serde_to_influx, 0);
     rb_define_method(rb_cSerde, "to_msgpack", rb_cmetrics_serde_to_msgpack, 0);

data/ext/cmetrics/cmetrics_untyped.c

@@ -34,16 +34,32 @@ static const rb_data_type_t rb_cmetrics_untyped_type = { "cmetrics/untyped",
                                                          RUBY_TYPED_FREE_IMMEDIATELY };
 
 
+const struct CMetricsUntyped *cmetrics_untyped_get_ptr(VALUE self)
+{
+    struct CMetricsUntyped *cmetricsUntyped = NULL;
+
+    TypedData_Get_Struct(
+            self, struct CMetricsUntyped, &rb_cmetrics_untyped_type, cmetricsUntyped);
+
+    if (NIL_P(self)) {
+        rb_raise(rb_eRuntimeError, "Given CMetrics argument must not be nil");
+    }
+    if (!cmetricsUntyped->untyped) {
+        rb_raise(rb_eRuntimeError, "Create untyped with CMetrics::Untyped#create first.");
+    }
+    return cmetricsUntyped;
+}
+
 static void
 untyped_free(void* ptr)
 {
     struct CMetricsUntyped* cmetricsUntyped = (struct CMetricsUntyped*)ptr;
 
-    if (!cmetricsUntyped) {
-        if (!cmetricsUntyped->untyped) {
+    if (cmetricsUntyped) {
+        if (cmetricsUntyped->untyped) {
             cmt_untyped_destroy(cmetricsUntyped->untyped);
         }
-        if (!cmetricsUntyped->instance) {
+        if (cmetricsUntyped->instance) {
             cmt_destroy(cmetricsUntyped->instance);
         }
     }

data/ext/cmetrics/extconf.rb

@@ -46,7 +46,7 @@ class BuildCMetrics
     @recipe.target = File.join(ROOT, "ports")
     @recipe.files << {
       url: "https://codeload.github.com/calyptia/cmetrics/tar.gz/v#{version}",
-      sha256sum: "f0c79707ad4d18980bf0d1d64ed8cb73a40c586c36a4caf38233ae8d9a4c6cc7",
+      sha256sum: "922965a3ccc5aeb9a423d9b82be06e7aaf37f2bc8736ad6e70ac1c8845155710",
     }
   end
 
@@ -70,7 +70,7 @@ class BuildCMetrics
   end
 end
 
-cmetrics = BuildCMetrics.new("0.2.1", cmake_command: determine_preferred_command("cmake3", "cmake"))
+cmetrics = BuildCMetrics.new("0.2.2", cmake_command: determine_preferred_command("cmake3", "cmake"))
 cmetrics.build
 
 libdir = RbConfig::CONFIG["libdir"]

data/lib/cmetrics/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmetrics
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.5
 platform: ruby
 authors:
 - Hiroshi Hatake
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-01 00:00:00.000000000 Z
+date: 2021-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: msgpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: mini_portile2
   requirement: !ruby/object:Gem::Requirement
@@ -118,7 +132,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/calyptia/cmetrics-ruby
   changelog_uri: https://github.com/calyptia/cmetrics-ruby/blob/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -134,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.22
-signing_key: 
+signing_key:
 specification_version: 4
 summary: C binding for cmetric library.
 test_files: []