fluent-plugin-prometheus 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f98778420f98da85a1325661e897dce930a9eaec03675f3112ca9223a8435a4
-  data.tar.gz: 864fd85893d2cbe49c2aa5d8e59026405098d9075e54499cbe3efc8e30025a3d
+  metadata.gz: f48e673585638a68fa128172db768d7f35035a04f4d55bb98737e7cfd5d7cdf2
+  data.tar.gz: 1030ddd92d55c5e6603e49933760eadac266f5081cbb54169b0ebc237bcfe933
 SHA512:
-  metadata.gz: ae6ec1075cf1fa4ab375a888c0a37c2653cf067e25a87b588ef5b5a332aa090cb1794b9add155314e4b867a188cca55450b064ea04ec99cb9299ad2fcfbde37b
-  data.tar.gz: c0d269902c7efff6fe7cb153c853fc17eaf9b0a740994ece3701854308fff45af2fa906c17efa2d0af32f882dfdcdd40340c5f3b8ad21a58469655104064a0c1
+  metadata.gz: adb129f3a83c6be98247e2180d6cb26037a1e8e32e10c555232cf9d267867b4b5b6d5168adebbb9b8ed16b1193c9ff7e8879b379ccb92406b66cb2abc67075e1
+  data.tar.gz: 2e7a8eecf131d31d08266507620939f7f9b73613d39009d6c2349bbb166b778dae82baa6ea84021793b5374c1372b5cd0673b126ec5b6981c9dfd368c8da0922

data/ChangeLog

@@ -0,0 +1,11 @@
+Release 1.8.1 - 2020/07/06
+
+	* Fix aggregate bug with async-http
+
+Release 1.8.0 - 2020/04/17
+
+	* Use http_server helper
+	* Require fluentd v1.9.1 or later
+
+
+For older releases, see commits on github repository.

data/README.md

@@ -124,7 +124,7 @@ Metrics for output
 - `fluentd_output_status_emit_records`
 - `fluentd_output_status_write_count`
 - `fluentd_output_status_rollback_count`
-- `fluentd_output_status_flush_time_count` from fluentd v1.6.0
+- `fluentd_output_status_flush_time_count` in milliseconds from fluentd v1.6.0
 - `fluentd_output_status_slow_flush_count` from fluentd v1.6.0
 
 Metrics for buffer

data/fluent-plugin-prometheus.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-prometheus"
-  spec.version       = "1.8.0"
+  spec.version       = "1.8.1"
   spec.authors       = ["Masahiro Sano"]
   spec.email         = ["sabottenda@gmail.com"]
   spec.summary       = %q{A fluent plugin that collects metrics and exposes for Prometheus.}

data/lib/fluent/plugin/in_prometheus.rb

@@ -73,6 +73,14 @@ module Fluent::Plugin
         return
       end
 
+      begin
+        require 'async'
+        require 'fluent/plugin/in_prometheus/async_wrapper'
+        extend AsyncWrapper
+      rescue LoadError => _
+        # ignore
+      end
+
       tls_opt = if @ssl && @ssl['enable']
                   ssl_config = {}
 
@@ -185,7 +193,7 @@ module Fluent::Plugin
       full_result = PromMetricsAggregator.new
 
       send_request_to_each_worker do |resp|
-        if resp.is_a?(Net::HTTPSuccess)
+        if resp.code.to_s == '200'
           full_result.add_metrics(resp.body)
         end
       end
@@ -197,14 +205,14 @@ module Fluent::Plugin
 
     def send_request_to_each_worker
       bind = (@bind == '0.0.0.0') ? '127.0.0.1' : @bind
-      req = Net::HTTP::Get.new(@metrics_path)
       [*(@base_port...(@base_port + @num_workers))].each do |worker_port|
         do_request(host: bind, port: worker_port, secure: @secure) do |http|
-          yield(http.request(req))
+          yield(http.get(@metrics_path))
         end
       end
     end
 
+    # might be replaced by AsyncWrapper if async gem is installed
     def do_request(host:, port:, secure:)
       http = Net::HTTP.new(host, port)
 
@@ -214,7 +222,7 @@ module Fluent::Plugin
         http.verify_mode = OpenSSL::SSL::VERIFY_NONE
       end
 
-       http.start do
+      http.start do
         yield(http)
       end
     end

data/lib/fluent/plugin/in_prometheus/async_wrapper.rb

@@ -0,0 +1,46 @@
+require 'async'
+
+module Fluent::Plugin
+  class PrometheusInput
+    module AsyncWrapper
+      def do_request(host:, port:, secure:)
+        endpoint =
+          if secure
+            context = OpenSSL::SSL::SSLContext.new
+            context.verify_mode = OpenSSL::SSL::VERIFY_NONE
+            Async::HTTP::Endpoint.parse("https://#{host}:#{port}", ssl_context: context)
+          else
+            Async::HTTP::Endpoint.parse("http://#{host}:#{port}")
+          end
+
+        client = Async::HTTP::Client.new(endpoint)
+        yield(AsyncHttpWrapper.new(client))
+      end
+
+      Response = Struct.new(:code, :body, :headers)
+
+      class AsyncHttpWrapper
+        def initialize(http)
+          @http = http
+        end
+
+        def get(path)
+          error = nil
+          response = Async::Task.current.async {
+            begin
+              @http.get(path)
+            rescue => e               # Async::Reactor rescue all error. handle it by itself
+              error = e
+            end
+          }.wait
+
+          if error
+            raise error
+          end
+
+          Response.new(response.status.to_s, response.body.read, response.headers)
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-prometheus
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Masahiro Sano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-21 00:00:00.000000000 Z
+date: 2020-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -110,6 +110,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- ChangeLog
 - Gemfile
 - LICENSE
 - README.md
@@ -117,6 +118,7 @@ files:
 - fluent-plugin-prometheus.gemspec
 - lib/fluent/plugin/filter_prometheus.rb
 - lib/fluent/plugin/in_prometheus.rb
+- lib/fluent/plugin/in_prometheus/async_wrapper.rb
 - lib/fluent/plugin/in_prometheus_monitor.rb
 - lib/fluent/plugin/in_prometheus_output_monitor.rb
 - lib/fluent/plugin/in_prometheus_tail_monitor.rb