fluent-plugin-prometheus_pushgateway 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16e5a7eba6f875d089a669b9db3c2bc4db2224894e6b6e8a69e81dca2524dafe
-  data.tar.gz: b5f83033f6d08660c38616ee713a365f876cac722680428fab2f92d66f9b134e
+  metadata.gz: 347755e0922e0015347adaaa22e0d1ba07cb5a191725c9c4a0e3a6f249a19801
+  data.tar.gz: 3493f9e0a6ceb4ed96a740b807204cf692f59bf3927de8b88ee24a45d3ce59de
 SHA512:
-  metadata.gz: '02919b370717d289e388c86925a5a7360dc9b92665632848e067abaf84a2f416be255fdd880de586a353bedba1c56e7f058e9c066826be5cee6df4b61e05863e'
-  data.tar.gz: d26b2da01930a39f74f1235dc7353e5fe9468f27c284f525eb9ce82d81c76f6b4900b7b230f4380fedba7937a3b1e17027d29fe454f79f691885426c63eed944
+  metadata.gz: c69005b206f10d8248641e3d2323a80f740fc42d41d63af13791a06e09150c498b768d6f328818090693b4145c9f8ca3d92ba1c36f5e32ab693295010d066da9
+  data.tar.gz: c370274cf1598e0d862cec68eea3c868ba8dd85054bae0c9c009712ba40dccefb24b75db9149a9efe0799c4bbf8eba8ca9ab1a921027ef022ba2257ec2df3838

data/.github/workflows/run_spec.yml

@@ -12,7 +12,7 @@ jobs:
     continue-on-error: ${{ matrix.experimental }}
     strategy:
       matrix:
-        ruby_version: [ '3.2', '3.1', '3.0', '2.7' ]
+        ruby_version: [ '3.4', '3.3', '3.2', '3.1' ]
         experimental: [false]
         include:
           - ruby_version: head
@@ -21,7 +21,7 @@ jobs:
     env:
       LANG: en_US.UTF-8
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Ruby ${{  matrix.ruby_version }}
       uses: ruby/setup-ruby@v1
       with:

data/ChangeLog

@@ -1,3 +1,11 @@
+Release 0.2.0 - 2025/03/21
+
+ * CI: Bump actions/checkout from v3 to v4.
+ * CI: Add Ruby 3.3/3.4 for CI.
+ * Support prometheus-client 3.0 or later.
+   - In the previous versions of fluent-plugin-prometheus was also restricted
+     to prometheus-client 2.x if you use with it.
+
 Release 0.1.1 - 2023/07/12
 
  * CI: Update supported version of Ruby.

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/fluent-plugin-prometheus_pushgateway.gemspec

@@ -22,8 +22,6 @@ Gem::Specification.new do |spec|
   spec.license = "Apache-2.0"
 
   spec.add_dependency "fluent-plugin-prometheus", ">= 2.0.0", "< 2.2.0"
-  # Need to fix to support 3.0 or later
-  spec.add_dependency "prometheus-client", "~> 2.1"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

data/lib/fluent/plugin/out_prometheus_pushgateway.rb

@@ -15,6 +15,7 @@
 #
 
 require 'prometheus/client/push'
+require 'prometheus/client/version'
 require 'fluent/plugin/output'
 
 begin
@@ -69,7 +70,12 @@ module Fluent
       def configure(conf)
         super
 
-        @push_client = ::Prometheus::Client::Push.new("#{@job_name}:#{fluentd_worker_id}", @instance, @gateway)
+        if Prometheus::Client::VERSION.split(".")[0].to_i >= 3
+          grouping_key = @instance ? {instance: @instance} : {}
+          @push_client = ::Prometheus::Client::Push.new(job: "#{@job_name}:#{fluentd_worker_id}", grouping_key: grouping_key, gateway: @gateway)
+        else
+          @push_client = ::Prometheus::Client::Push.new("#{@job_name}:#{fluentd_worker_id}", @instance, @gateway)
+        end
 
         use_tls = gateway && (URI.parse(gateway).scheme == 'https')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-prometheus_pushgateway
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Yuta Iwama
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-12 00:00:00.000000000 Z
+date: 2025-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluent-plugin-prometheus
@@ -30,20 +30,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.2.0
-- !ruby/object:Gem::Dependency
-  name: prometheus-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -128,7 +114,7 @@ licenses:
 - Apache-2.0
 metadata:
   homepage_uri: https://github.com/fluent/fluent-plugin-prometheus_pushgateway
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -143,8 +129,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: A fluent plugin for prometheus pushgateway
 test_files: []