fluent-plugin-postgresql-csvlog 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dda962fe3d98ea5f101183e982959b78c92142ca2b9a7807e51567a2bc75819
-  data.tar.gz: 3efd68ecdc6bcdb0a3341b2a5961452508ea92b10a2e5eeba6843cb29f27009a
+  metadata.gz: 1c99895582e6133a97c194d676882f42d0fad0ab52aff6cfe1b3fbbbcf32263a
+  data.tar.gz: 71135c5dddefbf8a61f8f6e3453daddd61df187b082201fb00dff4680ce0bdbe
 SHA512:
-  metadata.gz: 47099891a7c455ce85e98239b3c69990b7c14b5450f2be9d643902c00ac29a6bbb7a5f34678380b1e310414308e80514f8915b0865f92ef7524221d35fc75ca8
-  data.tar.gz: 22bd0a3a4f2bf5ef903c3f90d11d0f92a5822887a07cd048eca701a4cb270c8be4f1c43f5fa2e9f3529ec26896874f9156dc0eac457c07028f41e03e3e7bf34a
+  metadata.gz: 518a30b929f02f82a6a6d80d03a4a1a9fa66174759c8f9b89a3243a7bf4d8168a43fe08631882630790afea4fb24eed4179215f85d7454c8fc63fc6e2aae1c6e
+  data.tar.gz: 43921a20185c91042274d0acbbd4c70ef94cb7c199675833890ab2cc946aa49065b8c0a624eb6691684e55bfa0945a02e9996f305211657ffae492e856deebe2

data/fluent-plugin-postgresql-csvlog.gemspec

@@ -2,7 +2,7 @@ $:.push File.expand_path('lib', __dir__)
 
 Gem::Specification.new do |s|
   s.name        = 'fluent-plugin-postgresql-csvlog'
-  s.version     = '0.2.0'
+  s.version     = '0.2.1'
   s.authors     = ['stanhu']
   s.email       = ['stanhu@gmail.com']
   s.homepage    = 'https://gitlab.com/gitlab-org/fluent-plugin-postgresql-csvlog'

data/lib/fluent/plugin/filter_postgresql_redactor.rb

@@ -26,7 +26,6 @@ module Fluent::Plugin
 
       record.delete(@input_key)
       record[@output_key] = normalized
-      record.delete('message')
 
       record
     rescue PgQuery::ParseError

data/lib/fluent/plugin/filter_postgresql_slowlog.rb

@@ -24,6 +24,7 @@ module Fluent
         if record['message'] =~ SLOWLOG_REGEXP
           record['duration_s'] = $1.to_f / 1000.0
           record[@output_key] = $2
+          record.delete('message')
         end
         # rubocop:enable Style/PerlBackrefs
 

data/test/plugin/test_filter_postgresql_redactor.rb

@@ -27,7 +27,7 @@ class PostgreSQLRedactorTest < Test::Unit::TestCase
       inputs.each { |input| d.feed(input) }
     end
 
-    assert_equal(%w[duration_s fingerprint sql], d.filtered[0].last.keys.sort)
+    assert_equal(%w[duration_s fingerprint message sql], d.filtered[0].last.keys.sort)
     assert_equal('SELECT * FROM projects WHERE id = $1', d.filtered[0].last['sql'])
   end
 
@@ -63,7 +63,7 @@ class PostgreSQLRedactorTest < Test::Unit::TestCase
       inputs.each { |input| d.feed(input) }
     end
 
-    assert_equal(%w[duration_s fingerprint out_sql], d.filtered[0].last.keys.sort)
+    assert_equal(%w[duration_s fingerprint message out_sql], d.filtered[0].last.keys.sort)
     assert_equal('SELECT * FROM projects WHERE id = $1', d.filtered[0].last['out_sql'])
   end
 end

data/test/plugin/test_filter_postgresql_slowlog.rb

@@ -44,6 +44,9 @@ class PostgreSQLSlowLogTest < Test::Unit::TestCase
                    }
                  ),
                  d.filtered[1].last)
+
+    assert_equal(%w[duration_s query], d.filtered[0].last.keys.sort)
+    assert_equal(%w[duration_s query], d.filtered[1].last.keys.sort)
   end
 
   test 'ignores messages not having to do with slow logs' do
@@ -55,6 +58,7 @@ class PostgreSQLSlowLogTest < Test::Unit::TestCase
     end
 
     assert_equal(input, d.filtered[0].last)
+    assert_equal(%w[message], d.filtered[0].last.keys.sort)
   end
 
   test 'outputs slow log entries to configured output key' do
@@ -79,5 +83,7 @@ class PostgreSQLSlowLogTest < Test::Unit::TestCase
                    }
                  ),
                  d.filtered[0].last)
+
+    assert_equal(%w[duration_s my_key], d.filtered[0].last.keys.sort)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-postgresql-csvlog
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - stanhu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-22 00:00:00.000000000 Z
+date: 2021-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd