fluent-plugin-redis-enrichment 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45307061640b5a30edb19b7c887a8c274af40a34
-  data.tar.gz: b49ca7811c2a56daf80632ef3403cd1779563587
+  metadata.gz: 1dce02b1a565f23110f893fba038783b7232983d
+  data.tar.gz: a4c841da7abd957e0d3f55a5646ea77f1fcc4b17
 SHA512:
-  metadata.gz: 4c6e5e96df8f784e66952f32f5775c4b64c3cf37f68a89c1870376f43370c5fd9ac24c185cba0dc96d1050be38391269fdc251bd6e2a1b672c4090dfcb58dc3e
-  data.tar.gz: 2e026a2943fc12200edb1d1d80a1cac06035892996abb22f86de37b9702869191478febc27ffa53fc1241331a81924f96939ecf8f19ce0cd608d87d955fd16d5
+  metadata.gz: ca960d09e87abc9ed82b36626afe1f2b707f7c6458f3d8d43e51c4e63bb881b65bcd87ba4539462905a05125b084e08b8ef5521ff856f120250c354c67dd641f
+  data.tar.gz: c9dcac0989a3f3d440ee6fb1cf50c4056e8393c9a08d356e0771064ab9ffa0b8f663f1b34fb8f17a426aff7793a9b7f59257a026ac1da9bb22d45a91dcc424e8

data/README.md

@@ -2,6 +2,14 @@
 
 Filter plugin that allow to update record with data fetch from redis.
 
+## Behaviour
+
+- try to do record enrichment using redis content,
+- fetch redis data based on a key that can be hardcoded or in the record
+- enrich record with redis fetched data
+- in case of failure in the processing, skip enrichment and let processing
+  continue on record
+
 ## Installation
 
 
@@ -15,9 +23,19 @@ Add to Gemfile with:
 
 ## Compatibility
 
+### 1.x.x
+
+plugin in 1.x.x will work with:
 - ruby >= 2.4.10
 - td-agent >= 3.8.1-0
 
+and so use:
+- redis > 4, < 5
+
+### 2.x.x
+
+will come next !
+
 ## Configuration
 
 ### template

data/fluent-plugin-redis-enrichment.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = 'fluent-plugin-redis-enrichment'
-  spec.version = '1.0.0'
+  spec.version = '1.0.2'
   spec.authors = ['Thomas Tych']
   spec.email   = ['thomas.tych@gmail.com']
 
@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop-rake', '~> 0.5.1' # < 0.6.x to work with ruby 2.4.10
   spec.add_development_dependency 'test-unit', '~> 3.5.3'
 
-  spec.add_runtime_dependency 'connection_pool', '~> 2.2' # < 2.3.x to work with ruby 2.4.10
+  spec.add_runtime_dependency 'connection_pool', '~> 2.2.5' # < 2.3.x to work with ruby 2.4.10
   spec.add_runtime_dependency 'fluentd', ['>= 0.14.10', '< 2']
   spec.add_runtime_dependency 'lru_redux', '~> 1.1'
   spec.add_runtime_dependency 'redis', '~> 4.8'  #  < 5.x to work with ruby 2.4.10

data/lib/fluent/plugin/filter_redis_enrichment.rb

@@ -29,7 +29,9 @@ module Fluent
     # filter plugin
     #   enrich record based on redis fetched content
     class RedisEnrichmentFilter < Fluent::Plugin::Filter
-      Fluent::Plugin.register_filter('redis_enrichment', self)
+      NAME = 'redis_enrichment'
+
+      Fluent::Plugin.register_filter(NAME, self)
 
       DEFAULT_REDIS_HOST = '127.0.0.1'
       DEFAULT_REDIS_PORT = 6379
@@ -117,7 +119,7 @@ module Fluent
         expanded_key = @placeholder_expander.expand(@key, { tag: tag,
                                                             time: time,
                                                             record: new_record })
-        log.debug("filter_redis_enrichment: on tag:#{tag}, search #{expanded_key}")
+        log.debug("filter #{NAME}: on tag:#{tag}, search #{expanded_key}")
         redis = @cache.get(expanded_key)
         new_record_record_enrichment = @placeholder_expander.expand(@record_enrichment,
                                                                     { tag: tag,
@@ -125,6 +127,9 @@ module Fluent
                                                                       record: new_record,
                                                                       redis: redis })
         new_record.merge(new_record_record_enrichment)
+      rescue StandardError => e
+        log.error("filter #{NAME}: skip enrichment due to error: #{e}")
+        record
       end
 
       def cache_options
@@ -319,7 +324,7 @@ module Fluent
           @redis ||= ConnectionPool::Wrapper.new(size: @pool_size, timeout: @timeout) do
             if @sentinels
               Redis.new(sentinels: @sentinels, name: @name, role: @role, db: @db, password: @password,
-                        timeout: @timeout)
+                        timeout: @timeout, host: @name)
             else
               Redis.new(host: @host, port: @port, db: @db, password: @password, timeout: @timeout)
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-redis-enrichment
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Thomas Tych
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-03 00:00:00.000000000 Z
+date: 2023-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bump
@@ -134,14 +134,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 2.2.5
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement