yabeda-prometheus2influxdb 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f15f494fc8c977f0d4f5bd61ac5234872165a902b1227fa1b299acd0758ea00
-  data.tar.gz: 733c8ffb3ae626818364dee09e08dc0d5ee7c11706f8e4a244916fb16921b820
+  metadata.gz: f1a7af6485a7f682b94f632ebcb1443f339d268d1a930d699b1bc6e0bde54503
+  data.tar.gz: d2c67473c04d0ff6a5195d6058fa540748eff0d7d5ea508bca0e41cf30365942
 SHA512:
-  metadata.gz: c7e85c6baac1cd1d9e24441550ec593a0e7fa8473dd1128b81673ade914873a8e28e3a76a29d2aba5cb1fb0b2911e97feffea177f227b7a9ae0493c1aa5d76eb
-  data.tar.gz: 3e8532ce668138428d0bad5ca3c2220bbf7348b4496a01815c9e60d9f806892da0697d1888a8bf102a5ef5b41f8e17cac68a58b72e5a250202b7ce68c6d541ed
+  metadata.gz: ffcec5c4ef30f280586a00b18379994c23ff07500e15601dfdf78593c009796bc5222b9005fa36a9cafbff4e2fbb5e3168c370cbafaa628fc30826d6db07c259
+  data.tar.gz: 0020410b81275c0441b07d149998f0eb345cdc4a37fc59c31f7eec72dd7e4e7692d8624179a8e6b6bf2a262bc45146cc2064e81be7a8916fe893d557adfbeb04

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## [Unreleased]
 
+## [0.2.0] - 2022-09-14
+
+- Switch to prometheus-client-mmap
+
+  To be able to aggregate metrics from multiple processes on the same machine to reduce number of time series.
+
 ## [0.1.0] - 2022-09-01
 
 - Initial release

data/lib/yabeda/prometheus2influxdb/version.rb

@@ -2,6 +2,6 @@
 
 module Yabeda
   class Prometheus2InfluxDB
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/lib/yabeda/prometheus2influxdb.rb

@@ -3,7 +3,7 @@
 require "singleton"
 
 require "influxdb"
-require "yabeda/prometheus"
+require "yabeda/prometheus/mmap"
 
 require_relative "prometheus2influxdb/config"
 require_relative "prometheus2influxdb/version"
@@ -22,12 +22,11 @@ module Yabeda
       instance.config.configured?
     end
 
-    attr_reader :influxdb_client, :registry, :instance_label, :config
+    attr_reader :influxdb_client, :instance_label, :config
 
     def initialize
       @config = Config.new
       @influxdb_client = ::InfluxDB::Client.new(**config.to_h)
-      @registry = Yabeda::Prometheus.registry
       @instance_label = "#{Socket.gethostname}##{Process.pid}"
     end
 
@@ -46,30 +45,13 @@ module Yabeda
     private
 
     def prepare_points
-      Yabeda::Prometheus.registry.metrics.map do |metric|
-        series = metric.name.to_s
-        metric.values.map do |tags, value|
-          tags = tags.merge(instance: instance_label)
-          case metric
-          when ::Prometheus::Client::Counter, ::Prometheus::Client::Gauge
-            { series: series, tags: tags, values: { value: value } }
-          when ::Prometheus::Client::Histogram
-            histogram_points(series, tags, value)
-          else
-            raise NotImplementedError, "#{metric.class} isn't supported for exporting to InfluxDB yet"
-          end
+      metrics = ::Prometheus::Client::Formats::Text.send(:load_metrics, ::Prometheus::Client.configuration.multiprocess_files_dir)
+      metrics.map do |_, samples:, **|
+        samples.map do |series, tags, value|
+          tags = Hash[tags].merge("instance" => instance_label)
+          { series: series, tags: tags, values: { value: value } }
         end
       end.flatten
     end
-
-    def histogram_points(name, tags, bucketed_values)
-      bucketed_values.map do |bucket, value|
-        if bucket == "sum"
-          { series: "#{name}_sum", tags: tags, values: { value: value } }
-        else
-          { series: "#{name}_bucket", tags: tags.merge("le" => bucket), values: { value: value } }
-        end
-      end
-    end
   end
 end

data/yabeda-prometheus2influxdb.gemspec

@@ -30,5 +30,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "anyway_config"
   spec.add_dependency "influxdb"
-  spec.add_dependency "yabeda-prometheus"
+  spec.add_dependency "yabeda-prometheus-mmap"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yabeda-prometheus2influxdb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrey Novikov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-01 00:00:00.000000000 Z
+date: 2022-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: anyway_config
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yabeda-prometheus
+  name: yabeda-prometheus-mmap
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="