fluent-plugin-label-router 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd979b17d11338356a4aba41b453da815b59abac9169b4df7ec6aba97f60adf0
-  data.tar.gz: ed8c5dd1a8129582eaafb2ac8e93afc9b0be487b9b89a4dc44d8b90bc0bf0402
+  metadata.gz: 39bb31d6e0960885594803292fd8b7e6739191333aaa303d2db16809d2ddaf1c
+  data.tar.gz: 46d5658ae6ed1159e4d55c6068f945ce5bb4719e6c373602cf88581323f60c46
 SHA512:
-  metadata.gz: 4031c23b18c50f72953be1d20264c19bd62feea1de49c55bdb479e180f72814bfc064756156b1b4a5d10e2ebe1e1e72339f103e423874d82a01c089da44e1cff
-  data.tar.gz: 0fa73c96e20e9ffb0da8442f2deafb27853434b78c665437a47f42646df2b3c5ba92c406792012d3cdfb41216916198728c45a46d0fca87b3f236ebbda18a74a
+  metadata.gz: cae3b60f07ff8bd9b411b7ae5ae766c59c95737484eb497e77b219e8d6d43f31943e4702313097cf8dd331b029a213389c3911ea0c1d937797dd6f18e7f19669
+  data.tar.gz: bafd88bb200ca34795d206b7a4e24ab25e78de209c078282414f2de7b02de7e494e7835927c872f29c11e173ddd51056e8bea68a8642319a76519271d3ac524c

data/Gemfile

@@ -1,3 +1,3 @@
 source "https://rubygems.org"
 
-gemspec
+gemspec

data/Gemfile.lock

@@ -1,25 +1,27 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-label-router (0.3.0)
-      fluentd (>= 0.14.10, < 2)
+    fluent-plugin-label-router (0.3.2)
+      concurrent-ruby
+      fluentd (>= 1.17.1, < 1.18)
       prometheus-client (>= 2.1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     base64 (0.2.0)
-    concurrent-ruby (1.3.1)
-    cool.io (1.8.1)
+    concurrent-ruby (1.3.4)
+    cool.io (1.9.0)
     csv (3.3.0)
     drb (2.2.1)
-    fluentd (1.17.0)
+    fluentd (1.17.1)
       base64 (~> 0.2)
       bundler
       cool.io (>= 1.4.5, < 2.0.0)
       csv (~> 3.2)
       drb (~> 2.2)
       http_parser.rb (>= 0.5.1, < 0.9.0)
+      logger (~> 1.6)
       msgpack (>= 1.3.1, < 2.0.0)
       serverengine (>= 2.3.2, < 3.0.0)
       sigdump (~> 0.2.5)
@@ -29,21 +31,25 @@ GEM
       webrick (~> 1.4)
       yajl-ruby (~> 1.0)
     http_parser.rb (0.8.0)
-    msgpack (1.7.2)
-    power_assert (2.0.3)
-    prometheus-client (4.2.2)
+    logger (1.6.1)
+    msgpack (1.7.5)
+    power_assert (2.0.4)
+    prometheus-client (4.2.3)
+      base64
     rake (12.3.3)
-    serverengine (2.3.2)
+    serverengine (2.4.0)
+      base64 (~> 0.1)
+      logger (~> 1.4)
       sigdump (~> 0.2.2)
     sigdump (0.2.5)
     strptime (0.2.5)
-    test-unit (3.6.2)
+    test-unit (3.6.4)
       power_assert
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2024.1)
+    tzinfo-data (1.2024.2)
       tzinfo (>= 1.0.0)
-    webrick (1.8.1)
+    webrick (1.9.0)
     yajl-ruby (1.4.3)
 
 PLATFORMS

data/fluent-plugin-label-router.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = "fluent-plugin-label-router"
-  spec.version = "0.3.0"
+  spec.version = "0.4.0"
   spec.authors = ["Banzai Cloud"]
   spec.email   = ["info@banzaicloud.com"]
 
@@ -23,5 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "test-unit", "~> 3.0"
   spec.add_dependency "prometheus-client", ">= 2.1.0"
-  spec.add_runtime_dependency "fluentd", [">= 0.14.10", "< 2"]
+  spec.add_dependency "concurrent-ruby"
+  spec.add_runtime_dependency "fluentd", [">= 1.17.1", "< 1.18"]
 end

data/lib/fluent/plugin/out_label_router.rb

@@ -13,8 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License
 
-require "fluent/plugin/output"
+require "fluent/plugin/bare_output"
 require 'prometheus/client'
+require 'concurrent'
 
 
 module Fluent
@@ -95,11 +96,8 @@ module Fluent
         # There is no match at all                 -> return false
         def match?(metadata)
           @matches.each do |match|
-            if filter_select(match, metadata) and !match.negate
-              return true
-            end
-            if filter_select(match, metadata) and match.negate
-              return false
+            if filter_select(match, metadata)
+              return !match.negate
             end
           end
           false
@@ -153,7 +151,7 @@ module Fluent
 
       def process(tag, es)
         if @sticky_tags
-          @mutex.synchronize {
+          @rwlock.with_read_lock {
             if @route_map.has_key?(tag)
               # We already matched with this tag send events to the routers
               @route_map[tag].each do |r|
@@ -175,7 +173,7 @@ module Fluent
             if r.match?(input_metadata)
               orphan_record = false
               if @sticky_tags
-                @mutex.synchronize {
+                @rwlock.with_write_lock {
                   @route_map[tag].add(r)
                 }
               end
@@ -188,7 +186,7 @@ module Fluent
           end
           if !@default_router.nil? && orphan_record
             if @sticky_tags
-              @mutex.synchronize {
+              @rwlock.with_write_lock {
                 @route_map[tag].add(@default_router)
               }
             end
@@ -210,7 +208,7 @@ module Fluent
         super
         @registry = (::Prometheus::Client.registry if @metrics)
         @route_map = Hash.new { |h, k| h[k] = Set.new }
-        @mutex = Mutex.new
+        @rwlock = Concurrent::ReadWriteLock.new
         @routers = []
         @default_router = nil
         @routes.each do |rule|
@@ -224,7 +222,7 @@ module Fluent
         end
 
         @access_to_labels = record_accessor_create("$.kubernetes.labels")
-        @access_to_namespace_labels = record_accessor_create("$.kubernetes.namespace_labels")
+        @access_to_namespace_labels = record_accessor_create("$.kubernetes_namespace.labels")
         @access_to_namespace = record_accessor_create("$.kubernetes.namespace_name")
         @access_to_host = record_accessor_create("$.kubernetes.host")
         @access_to_container_name = record_accessor_create("$.kubernetes.container_name")

data/test/plugin/test_out_label_router.rb

@@ -156,15 +156,15 @@ class LabelRouterOutputTest < Test::Unit::TestCase
       event_time = event_time("2019-07-17 11:11:11 UTC")
       d = create_driver(CONFIG)
       d.run(default_tag: 'test') do
-        d.feed(event_time, {"kubernetes" => {"namespace_labels" => {"matching" => "no"} } } )
+        d.feed(event_time, {"kubernetes_namespace" => {"labels" => {"matching" => "no"} } } )
       end
       d.run(default_tag: 'test2') do
-        d.feed(event_time, {"kubernetes" => {"namespace_labels" => {"matching" => "yes"} } } )
+        d.feed(event_time, {"kubernetes_namespace" => {"labels" => {"matching" => "yes"} } } )
       end
       events = d.events
 
       assert_equal(1, events.size)
-      assert_equal ["matching", event_time, {"kubernetes" => {"namespace_labels" => {"matching" => "yes"} } }], events[0]
+      assert_equal ["matching", event_time, {"kubernetes_namespace" => {"labels" => {"matching" => "yes"} } }], events[0]
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-label-router
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Banzai Cloud
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-07 00:00:00.000000000 Z
+date: 2024-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -52,26 +52,40 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.10
+        version: 1.17.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.10
+        version: 1.17.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1.18'
 description: Label-Router helps routing log messages based on their labels and namespace
   tag in a Kubernetes environment.
 email:
@@ -94,7 +108,7 @@ homepage: https://github.com/banzaicloud/fluent-plugin-label-router
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -109,8 +123,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: Routing records based on Kubernetes labels.
 test_files: