fluent-plugin-proxysql-query-log 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36a178ba29b69f740d07e635907516dca37a02f9112814c0634db97e077dbd4e
-  data.tar.gz: cb3a073e86d59a10c13ea7a3dd802f43183bba41f84abd96222c0e74f8f3c917
+  metadata.gz: 5d836beefa6469c2f7a65fc75cc41b13c818efaf046ded993934e498a10f50e6
+  data.tar.gz: bf976b24cbdf7e70c0ebbac8d875eb13c8b496358df21ab4a01194d5f8b54b02
 SHA512:
-  metadata.gz: f4fe508b526a5cc977bea07bdfdb15bacee3635afdf69d8da35cadbb8737fefbc3750e5f04ab439928e57f3e548687a012d7a794e09573f76ac30b3b47ffaf64
-  data.tar.gz: e72b977809bc2dccbec52eea077383e528f4d39a5d8fb7ff89a45aa33639f62eedac38930b1677549db07eaf9b010acdf36aab340fe98734ab4ddd6a5db82ce0
+  metadata.gz: dcea999d33046f2fe258f3c71a3bd811c544a45980c47c6dd70a7cbde8bcac5589fc3995bf32f717f060f33eeb50db437476a4c07a5a1e465e8edb11b0031a87
+  data.tar.gz: 5ba73945f431bfcf4d48c58781f4f1d48647052105098a05a30ba7f0784806b805c41d82435749130677fbfd1a7f1da4b58e3209b1797674350c1922436c0524

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-proxysql-query-log (0.3.3)
+    fluent-plugin-proxysql-query-log (0.4.0)
       cool.io
       fluentd (>= 0.14.2, < 2)
       proxysql_query_log-parser

data/fluent-plugin-proxysql-query-log.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = "fluent-plugin-proxysql-query-log"
-  spec.version = "0.3.3"
+  spec.version = "0.4.0"
   spec.authors = ["r_takaishi"]
   spec.email   = ["ryo.takaishi.0@gmail.com"]
 

data/lib/fluent/plugin/in_proxysql_query_log.rb

@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'socket'
 require 'cool.io'
 require 'proxysql_query_log/parser'
 

data/lib/fluent/plugin/in_proxysql_query_log/watcher.rb

@@ -33,6 +33,7 @@ module Fluent
           seek(@path)
 
           while true
+            @pos = @io.pos
             raw_total_bytes = @io.read(8)
             return unless raw_total_bytes
 
@@ -57,7 +58,10 @@ module Fluent
               'end_time' => convert_time(query.end_time),
               'duration' => query.end_time - query.start_time,
               'digest' => query.digest,
-              'query' => query.query
+              'query' => query.query,
+              'hostname' => hostname,
+              'filename' => @path,
+              'pos' => @pos
           }
         end
 
@@ -78,6 +82,10 @@ module Fluent
         def attached?
           @attached
         end
+
+        def hostname
+          @hostname ||= Socket.gethostname
+        end
       end
     end
   end

data/test/helper.rb

@@ -1,4 +1,5 @@
 $LOAD_PATH.unshift(File.expand_path("../../", __FILE__))
+require 'socket'
 require "test-unit"
 require "fluent/test"
 require "fluent/test/driver/input"
@@ -77,4 +78,4 @@ def total_length(q)
   len += (1 + q.query.size)
 
   len
-end
+end

data/test/plugin/test_in_proxysql_query_log.rb

@@ -7,6 +7,7 @@ class ProxysqlQueryLogInputTest < Test::Unit::TestCase
     Pathname.glob("#{TMP_DIR}/*").each{|p| File.delete(p)}
   end
 
+  HOSTNAME = Socket.gethostname
   TMP_DIR = File.dirname(__FILE__) + '/../tmp/proxysql_query_log'
   CONFIG = config_element('ROOT', '', {
       'path' => "#{TMP_DIR}/query_log.00000001",
@@ -47,14 +48,16 @@ class ProxysqlQueryLogInputTest < Test::Unit::TestCase
   }
 
   test 'singlefile' do
-    File.open("#{TMP_DIR}/query_log.00000001", 'wb') {|f|
+    query_log_path_00000001 = "#{TMP_DIR}/query_log.00000001"
+
+    File.open(query_log_path_00000001, 'wb') {|f|
       write_record(f, QUERY_1)
     }
     config = CONFIG
     d = create_driver(config)
-    d.run(expect_emits: 1) do
-      File.open("#{TMP_DIR}/query_log.00000001", "ab") {|f|
-        write_record(f, QUERY_1)
+    d.run(expect_emits: 2) do
+      File.open(query_log_path_00000001, "ab") {|f|
+        write_record(f, QUERY_2)
       }
     end
 
@@ -72,23 +75,46 @@ class ProxysqlQueryLogInputTest < Test::Unit::TestCase
     assert_equal('2018-05-10 09:24:16', events[0][2]['end_time'])
     assert_equal('0xD69C6B36F32D2EAE', events[0][2]['digest'])
     assert_equal('SELECT * FROM test', events[0][2]['query'])
+    assert_equal(0, events[0][2]['pos'])
+    assert_equal(HOSTNAME, events[0][2]['hostname'])
+    assert_equal(query_log_path_00000001, events[0][2]['filename'])
+
+    assert_equal(1, d.instance.instance_variable_get('@watchers').size)
+    assert_equal(true, events.length > 0)
+    assert_equal(1, 1)
+    assert_equal(9, events[1][2]['thread_id'])
+    assert_equal('root', events[1][2]['username'])
+    assert_equal('alpaca', events[1][2]['schema_name'])
+    assert_equal('127.0.0.1:34612', events[1][2]['client'])
+    assert_equal(0, events[1][2]['HID'])
+    assert_equal('127.0.0.1:3306', events[1][2]['server'])
+    assert_equal('2018-05-10 09:24:16', events[1][2]['start_time'])
+    assert_equal('2018-05-10 09:24:16', events[1][2]['end_time'])
+    assert_equal('0xD69C6B36F32D2EAE', events[1][2]['digest'])
+    assert_equal('show databases', events[1][2]['query'])
+    assert_equal(100, events[1][2]['pos'])
+    assert_equal(HOSTNAME, events[1][2]['hostname'])
+    assert_equal(query_log_path_00000001, events[1][2]['filename'])
   end
 
   test 'multifile' do
-    File.open("#{TMP_DIR}/query_log.00000001", 'wb') {|f|
+    query_log_path_00000001 = "#{TMP_DIR}/query_log.00000001"
+    query_log_path_00000002 = "#{TMP_DIR}/query_log.00000002"
+
+    File.open(query_log_path_00000001, 'wb') {|f|
       write_record(f, QUERY_1)
     }
-    File.open("#{TMP_DIR}/query_log.00000002", 'wb') {|f|
+    File.open(query_log_path_00000002, 'wb') {|f|
       write_record(f, QUERY_2)
     }
 
     config = MULTI_FILE_CONFIG
     d = create_driver(config)
     d.run(expect_emits: 2) do
-      File.open("#{TMP_DIR}/query_log.00000001", "ab") {|f|
+      File.open(query_log_path_00000001, "ab") {|f|
         write_record(f, QUERY_1)
       }
-      File.open("#{TMP_DIR}/query_log.00000002", "ab") {|f|
+      File.open(query_log_path_00000002, "ab") {|f|
         write_record(f, QUERY_2)
       }
     end
@@ -107,6 +133,9 @@ class ProxysqlQueryLogInputTest < Test::Unit::TestCase
     assert_equal('2018-05-10 09:24:16', events[0][2]['end_time'])
     assert_equal('0xD69C6B36F32D2EAE', events[0][2]['digest'])
     assert_equal('SELECT * FROM test', events[0][2]['query'])
+    assert_equal(0, events[0][2]['pos'])
+    assert_equal(HOSTNAME, events[0][2]['hostname'])
+    assert_equal(query_log_path_00000001, events[0][2]['filename'])
 
     assert_equal(2, d.instance.instance_variable_get('@watchers').size)
     assert_equal(true, events.length > 0)
@@ -121,22 +150,28 @@ class ProxysqlQueryLogInputTest < Test::Unit::TestCase
     assert_equal('2018-05-10 09:24:16', events[1][2]['end_time'])
     assert_equal('0xD69C6B36F32D2EAE', events[1][2]['digest'])
     assert_equal('show databases', events[1][2]['query'])
+    assert_equal(0, events[1][2]['pos'])
+    assert_equal(HOSTNAME, events[1][2]['hostname'])
+    assert_equal(query_log_path_00000002, events[1][2]['filename'])
   end
 
   test 'rotate_file' do
-    File.open("#{TMP_DIR}/query_log.00000001", 'wb') {|f|
+    query_log_path_00000001 = "#{TMP_DIR}/query_log.00000001"
+    query_log_path_00000002 = "#{TMP_DIR}/query_log.00000002"
+
+    File.open(query_log_path_00000001, 'wb') {|f|
       write_record(f, QUERY_1)
     }
 
     config = MULTI_FILE_CONFIG
     d = create_driver(config)
     d.run(expect_emits: 2) do
-      File.open("#{TMP_DIR}/query_log.00000002", "ab") {|f|
+      File.open(query_log_path_00000002, "ab") {|f|
         write_record(f, QUERY_2)
       }
       sleep 5
 
-      File.open("#{TMP_DIR}/query_log.00000002", "ab") {|f|
+      File.open(query_log_path_00000002, "ab") {|f|
         write_record(f, QUERY_2)
       }
     end
@@ -156,6 +191,9 @@ class ProxysqlQueryLogInputTest < Test::Unit::TestCase
     assert_equal('2018-05-10 09:24:16', events[0][2]['end_time'])
     assert_equal('0xD69C6B36F32D2EAE', events[0][2]['digest'])
     assert_equal('SELECT * FROM test', events[0][2]['query'])
+    assert_equal(0, events[1][2]['pos'])
+    assert_equal(HOSTNAME, events[1][2]['hostname'])
+    assert_equal(query_log_path_00000002, events[1][2]['filename'])
 
     assert_equal(9, events[1][2]['thread_id'])
     assert_equal('root', events[1][2]['username'])
@@ -167,6 +205,9 @@ class ProxysqlQueryLogInputTest < Test::Unit::TestCase
     assert_equal('2018-05-10 09:24:16', events[1][2]['end_time'])
     assert_equal('0xD69C6B36F32D2EAE', events[1][2]['digest'])
     assert_equal('show databases', events[1][2]['query'])
+    assert_equal(0, events[1][2]['pos'])
+    assert_equal(HOSTNAME, events[1][2]['hostname'])
+    assert_equal(query_log_path_00000002, events[1][2]['filename'])
 
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-proxysql-query-log
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - r_takaishi