cmetrics 0.2.3 → 0.3.0.rc

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6d09be4c3b10316bbbda3ea927a6324c61adf0d0f73d989d0ace8b420fe7e24
-  data.tar.gz: 3a58f1d603231ba1c83515fd80e46eeb0a54fd738a3c4b1056e300d4ace8d437
+  metadata.gz: f579a0b6b3ddc942bf862fd65e39de1ed065f441ba4d7d9b938e2f9d6d52ca2e
+  data.tar.gz: 726e65afae5442c901a026894ef9b2e3007a32b2f7f2e8b2a935cffa6630494f
 SHA512:
-  metadata.gz: 21df0101a50fe8669623155eaccd4f8a1fc5da5be72967a710d308142b749765380dd5497ff2e5cec767eb38ccc4868b6c8845483ac2c28d2ea73c6f1e17a417
-  data.tar.gz: bde2f3c1b4a9791a84b001d40f1f4b10cdba546cab2f252071c46f08e3104763ae08f96db889b1e719b1609ec65374f2c656e4973fde39643911582e640efa9e
+  metadata.gz: f49ff3613892bf64866a0b5979e9595733d67a6c2b2e1846b7bd05ba936e687a355e4c9eb60d055e3f5ef2bac1cc4bddbdbc441af160e6581ad8dd54663070dc
+  data.tar.gz: 92035694db5e66458bfa13f717491d21ccc93485c57fecea7c584eebb80f9469aa2b7bad3fbe8ac30fe09cf1fbbcda518ad2510b6af801c7541d800c839de18b

data/.github/workflows/yum.yml

@@ -10,15 +10,15 @@ jobs:
       matrix:
         label:
           - CentOS 7 x86_64
-          - CentOS 8 x86_64
+          - RockyLinux OS 8 x86_64
           - Fedora 34 x86_64
           - AmazonLinux 2 x86_64
         include:
           - label: CentOS 7 x86_64
             test-docker-image: centos:7
             test-script: ci/yum-test.sh
-          - label: CentOS 8 x86_64
-            test-docker-image: centos:8
+          - label: RockyLinux OS 8 x86_64
+            test-docker-image: rockylinux:8
             test-script: ci/yum-test.sh
           - label: Fedora 34 x86_64
             test-docker-image: fedora:34
@@ -36,4 +36,4 @@ jobs:
           --tty \
           --volume ${PWD}:/cmetrics-ruby \
           ${{ matrix.test-docker-image }} \
-          /cmetrics-ruby/${{ matrix.test-script }}
+          /cmetrics-ruby/${{ matrix.test-script }}

data/ci/yum-test.sh

@@ -30,6 +30,16 @@ case ${distribution} in
         ;;
     esac
     ;;
+  rocky)
+    case ${version} in
+      8)
+        DNF="dnf --enablerepo=powertools"
+        ;;
+      *)
+        DNF="dnf --enablerepo=powertools"
+        ;;
+    esac
+    ;;
   fedoraproject)
     case ${version} in
       33|34)

data/ext/cmetrics/cmetrics_counter.c

@@ -55,11 +55,11 @@ 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

@@ -55,11 +55,11 @@ 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

@@ -21,6 +21,7 @@
 #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;
 
@@ -46,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);
         }
     }
@@ -103,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);
     }
@@ -208,6 +209,29 @@ rb_cmetrics_serde_concat_metric(VALUE self, VALUE rb_data)
     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)
 {
@@ -457,6 +481,7 @@ void Init_cmetrics_serde(VALUE rb_mCMetrics)
     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

@@ -55,11 +55,11 @@ 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: "c0b239fad559852c0c088879697c26e00ba243cfb1c4b8bca6246d1f50932842e",
     }
   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.3.0", 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.3"
+  VERSION = "0.3.0.rc"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmetrics
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0.rc
 platform: ruby
 authors:
 - Hiroshi Hatake
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-17 00:00:00.000000000 Z
+date: 2022-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -143,9 +143,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.2.22
 signing_key: