cmetrics 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f7a2ed53936604ee92cc24e2aa15bfa07389c54e1612170c266d8953fb113a2
-  data.tar.gz: e25ebd242bbfc84b994545675c3de1fa66276e643b57d6acaff2e8009e611c89
+  metadata.gz: 9cb75c4c4235b1607ae66658ec6985ef20dc2338ea06dd38b624fa1265c7d4c8
+  data.tar.gz: 3141eb411cacb661df52cd1d9da91f73d07615cb1a1fa9fea8db346e29bdfabd
 SHA512:
-  metadata.gz: 3848618b6b384afb7867db62133784c9492335757f53f92641c11a75ee82269a9a21150a8a73e81361ff2a6be252bfc6477c2269392ce75cb50f356d62b2ebb9
-  data.tar.gz: 360bf386dfb723f5daf2cf14e028c23ed7a546aa9e51a5ef9a403c19ffc9f380199f47eed82f0e8978991b939e64418a38839e88b4a333680888a5e64ed9842b
+  metadata.gz: 3b55f676d133462f592903c479e1e07603cb3b1c1b9fc8443bfd3ac80e791fc10173bcfc164d4ce3f30b0939ff72c0689c3f0dea1a8795a8a2856b6c03f11965
+  data.tar.gz: a8e2310516436a3a2a85cd79bb844501d0e1f37b3203a10f68913326cc4668ec570f4da20b08acf3eafd5b8c8c8df518133ab45117ac3ee18dbec919da056633

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_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;
 
@@ -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/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.4"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmetrics
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Hiroshi Hatake
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-27 00:00:00.000000000 Z
+date: 2022-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: C binding for cmetric library.