fluent-plugin-postgresql-csvlog 0.7.0 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38090772bf1e0302ecd53d759d8da4ffb2df0cdf0a6f001ec0e0d12390472276
-  data.tar.gz: 22bc8479b81f0b0fd7615cfb6cc1b491b317fc74d612f21373243a516e671be4
+  metadata.gz: 170ed1e58c16edf81a5f9a66b5cffa3509aa44f379dc03ccedd21af4e3bcbf5c
+  data.tar.gz: dd94befd3b95e9662e4ec9cac0be250f96f77e26627cfb0bc33afbb2f5f83bc6
 SHA512:
-  metadata.gz: c3ecfef7d3290ab00a71613c7914c0aae1d05501d37574614d9d6f4a2f5de9548474ecb7b6fdad4ef778c4ea48510a1e31a89294e317ecf7ab6004e094579cc9
-  data.tar.gz: 2b91a1704d53f07ab5139bc2d623c0c17afde53b416ef5f018dd7e6d345ce8a8da1d0aa8964bcef638b8e6ab351b2d7c16b83be73cbdcfba560dda69962bdd17
+  metadata.gz: 044f542d93ee7d99831853ddaf5b7f5fbb97c795417e9543c82acec545dae33fc6fd6bd00404d972cd27a8a78753fe0221ab21cfba0e468e4cd2842c73389969
+  data.tar.gz: b2d19bd75520d8a4b258be78c2d89f9d0d0b335f805698a72699bd658b1df30a365a4b91124b25de52fd11139ddc7008ff6ff7d333422eebdc8089920bf24890

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.7.0'
+  s.version     = '0.7.2'
   s.authors     = ['stanhu']
   s.email       = ['stanhu@gmail.com']
   s.homepage    = 'https://gitlab.com/gitlab-org/fluent-plugins/fluent-plugin-postgresql-csvlog'

data/lib/fluent/plugin/in_pg_stat_activity.rb

@@ -25,6 +25,8 @@ module Fluent::Plugin
         host(client_addr) as client_addr,
         client_hostname,
         client_port,
+        wait_event_type,
+        wait_event,
         xact_start,
         extract(epoch from clock_timestamp() - xact_start) xact_age_s,
         query_start,
@@ -75,6 +77,8 @@ module Fluent::Plugin
         'client_addr' => row['client_addr'],
         'client_hostname' => row['client_hostname'],
         'client_port' => row['client_port'],
+        'wait_event_type' => row['wait_event_type'],
+        'wait_event' => row['wait_event'],
         'xact_start' => row['xact_start']&.iso8601(3),
         'xact_age_s' => row['xact_age_s'],
         'query_start' => row['query_start']&.iso8601(3),

data/lib/fluent/plugin/marginalia_extractor.rb

@@ -7,7 +7,7 @@ module Fluent::Plugin
   # utility method, useful for extracting marginalia into fluentd records
   module MarginaliaExtractor
     MARGINALIA_PREPENDED_REGEXP = %r{^(?<comment>/\*.*\*/)(?<sql>.*)}m.freeze
-    MARGINALIA_APPENDED_REGEXP = %r{(?<sql>.*)(?<comment>/\*.*\*/)$}m.freeze
+    MARGINALIA_APPENDED_REGEXP = %r{(?<sql>.*)(?<comment>/\*.*\*/)\s*;?\s*$}m.freeze
 
     # Injects marginalia into a fluentd record
     def parse_marginalia_into_record(record, key, strip_comment)

data/test/plugin/test_in_pg_stat_activity.rb

@@ -53,6 +53,8 @@ class PgStatActivityInputTest < Test::Unit::TestCase
         'client_addr' => '172.17.0.1',
         'client_hostname' => nil,
         'client_port' => 60182,
+        'wait_event' => 'relation',
+        'wait_event_type' => 'Lock',
         'xact_start' => Time.parse('2021-07-23 12:55:25 +0000'),
         'xact_age_s' => 0.001884,
         'query_start' => Time.parse('2021-07-23 12:55:25 +0000'),
@@ -83,6 +85,8 @@ class PgStatActivityInputTest < Test::Unit::TestCase
         'state_change' => '2021-07-23T12:55:25.000+00:00',
         'usename' => 'testuser',
         'usesysid' => 10,
+        'wait_event' => 'relation',
+        'wait_event_type' => 'Lock',
         'xact_age_s' => 0.001884,
         'xact_start' => '2021-07-23T12:55:25.000+00:00'
       }
@@ -112,6 +116,8 @@ class PgStatActivityInputTest < Test::Unit::TestCase
         'state_change' => nil,
         'usename' => nil,
         'usesysid' => nil,
+        'wait_event' => nil,
+        'wait_event_type' => nil,
         'xact_age_s' => nil,
         'xact_start' => nil
       }
@@ -131,6 +137,8 @@ class PgStatActivityInputTest < Test::Unit::TestCase
         'client_addr' => '172.17.0.1',
         'client_hostname' => nil,
         'client_port' => 60182,
+        'wait_event' => 'relation',
+        'wait_event_type' => 'Lock',
         'xact_start' => Time.parse('2021-07-23 12:55:25 +0000'),
         'xact_age_s' => 0.001884,
         'query_start' => Time.parse('2021-07-23 12:55:25 +0000'),
@@ -161,6 +169,8 @@ class PgStatActivityInputTest < Test::Unit::TestCase
         'state_change' => '2021-07-23T12:55:25.000+00:00',
         'usename' => 'testuser',
         'usesysid' => 10,
+        'wait_event' => 'relation',
+        'wait_event_type' => 'Lock',
         'xact_age_s' => 0.001884,
         'xact_start' => '2021-07-23T12:55:25.000+00:00'
       }
@@ -180,6 +190,8 @@ class PgStatActivityInputTest < Test::Unit::TestCase
         'client_addr' => '172.17.0.1',
         'client_hostname' => nil,
         'client_port' => 60182,
+        'wait_event' => 'relation',
+        'wait_event_type' => 'Lock',
         'xact_start' => Time.parse('2021-07-23 12:55:25 +0000'),
         'xact_age_s' => 0.001884,
         'query_start' => Time.parse('2021-07-23 12:55:25 +0000'),
@@ -213,6 +225,8 @@ class PgStatActivityInputTest < Test::Unit::TestCase
         'state_change' => '2021-07-23T12:55:25.000+00:00',
         'usename' => 'testuser',
         'usesysid' => 10,
+        'wait_event' => 'relation',
+        'wait_event_type' => 'Lock',
         'xact_age_s' => 0.001884,
         'xact_start' => '2021-07-23T12:55:25.000+00:00'
       }

data/test/plugin/test_marginalia_extractor.rb

@@ -56,6 +56,14 @@ class Marginalia < Test::Unit::TestCase
     test_parse(sql, {}, 'sql', true, expected)
   end
 
+  test 'normal comment appended with trailing semicolon' do
+    sql = 'SELECT COUNT(*) FROM "projects" /* this is just a comment */ ; '
+    expected = {
+      "sql" => 'SELECT COUNT(*) FROM "projects"'
+    }
+    test_parse(sql, {}, 'sql', true, expected)
+  end
+
   test 'marginalia prepended for sidekiq' do
     sql = '/*application:sidekiq,correlation_id:d67cae54c169e0cab7d73389e2934f0e,jid:52a1c8a9e4c555ea573f20f0,job_class:Geo::MetricsUpdateWorker*/ SELECT COUNT(*) FROM "projects"'
     expected = {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-postgresql-csvlog
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.2
 platform: ruby
 authors:
 - stanhu
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-10 00:00:00.000000000 Z
+date: 2023-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.28
+rubygems_version: 3.4.8
 signing_key:
 specification_version: 4
 summary: fluentd plugins to work with PostgreSQL CSV logs