fluent-plugin-groonga-query-log 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 74fcfe61f76412fb02a18b924ecf9538f6792d920caa88fda7b22f7bd1d7216c
-  data.tar.gz: b81d0f452cb132cd280b79ec67b9bbea86a5531a5b47cb584dda49423ca3cdc7
+SHA1:
+  metadata.gz: 9e58ddf4db5a50f79ccd3a3eab2019fddfcc8f05
+  data.tar.gz: 4a42331b5306b1c2f716f294cf26bf2255fe3658
 SHA512:
-  metadata.gz: 5ecc7257af50cd3868ab7f3327bf9e9ad838357aa6bef2c1d3d13c7fbbe3cededa54dde3d55fdb181a5a11473b3b0adde010ac643ae73700913fc26a53c5abf1
-  data.tar.gz: d5054e6b5967f2f113f2bdb582c3759cfc5a099d9ff00adef9ce9bd8b3174ed6bc1c91262a409c7b079e5a8832441389cb1703acfb7068595caa7d98d35ba8b2
+  metadata.gz: 854b11444303e84033d6c92bb20efd6c37966166d5229ef46f000a63ae077af19d9292ee20adfa66cd728485db540e56a65d36cbe7caaa32b78ffb0520ea8a00
+  data.tar.gz: fd1da24e2e1ca1678f9ca9a8e755a3a687634c62e5f7894f0d9b5b5e2397547d5200158b3cfd242da0ab13c8dbd5a2bc1671789344bf165734692da0783cbec0

data/doc/text/news.md

@@ -1,5 +1,13 @@
 # News
 
+## 1.0.2: 2019-02-08
+
+### Improvements
+
+  * Added a new parameter `timezone`.
+
+  * Added a new parameter `time_format`.
+
 ## 1.0.1: 2019-01-09
 
 ### Improvements

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

@@ -17,7 +17,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "fluent-plugin-groonga-query-log"
-  spec.version = "1.0.1"
+  spec.version = "1.0.2"
   spec.authors = ["Kouhei Sutou"]
   spec.email = ["kou@clear-code.com"]
   spec.summary = "Fluentd plugin to parse Groonga's query log."

data/lib/fluent/plugin/filter_groonga_query_log.rb

@@ -26,6 +26,10 @@ module Fluent
     config_param :slow_response_threshold,  :float,  :default => 0.2
     config_param :flatten,                  :bool,   :default => false
     config_param :flatten_separator,        :string, :default => nil
+    config_param :timezone,                 :enum,
+                                            :list => [:utc, :localtime],
+                                            :default => :utc
+    config_param :time_format,              :string, :default => "iso8601"
 
     def configure(conf)
       super
@@ -33,6 +37,8 @@ module Fluent
       options = {
         :slow_operation_threshold => @slow_operation_threshold,
         :slow_response_threshold => @slow_response_threshold,
+        :timezone => @timezone,
+        :time_format => @time_format,
       }
       @parser = GroongaQueryLog::Parser.new(options)
     end
@@ -62,7 +68,24 @@ module Fluent
     end
 
     def format_time(time)
-      time.utc.iso8601(6)
+      time.utc if @timezone == :utc
+      time.strftime(resolve_time_format)
+    end
+
+    def resolve_time_format
+      case @time_format
+      when "iso8601"
+        format = "%Y-%m-%dT%H:%M:%S.%6N"
+        if @timezone == :utc
+          format << "Z"
+        else
+          format << "%:z"
+        end
+      when "sql"
+        format = "%Y-%m-%d %H:%M:%S.%6N"
+      else
+        @time_format
+      end
     end
 
     def flatten_record!(record)

data/test/test_filter_groonga_query_log.rb

@@ -40,6 +40,8 @@ class GroongaQueryLogFilterTest < Test::Unit::TestCase
                      :slow_response_threshold  => 0.2,
                      :flatten                  => false,
                      :flatten_separator        => nil,
+                     :timezone                 => :utc,
+                     :time_format              => "iso8601",
                    },
                    {
                      :raw_data_column_name     => filter.raw_data_column_name,
@@ -47,6 +49,8 @@ class GroongaQueryLogFilterTest < Test::Unit::TestCase
                      :slow_response_threshold  => filter.slow_response_threshold,
                      :flatten                  => filter.flatten,
                      :flatten_separator        => filter.flatten_separator,
+                     :timezone                 => filter.timezone,
+                     :time_format              => filter.time_format,
                    })
     end
 
@@ -79,6 +83,18 @@ class GroongaQueryLogFilterTest < Test::Unit::TestCase
       filter = driver.instance
       assert_equal("_", filter.flatten_separator)
     end
+
+    test "timezone" do
+      driver = create_driver("timezone localtime")
+      filter = driver.instance
+      assert_equal(:localtime, filter.timezone)
+    end
+
+    test "time_format" do
+      driver = create_driver("time_format %Y-%m-%d %H:%M:%S.%6N")
+      filter = driver.instance
+      assert_equal("%Y-%m-%d %H:%M:%S.%6N", filter.time_format)
+    end
   end
 
   sub_test_case "filter_stream" do
@@ -323,5 +339,255 @@ class GroongaQueryLogFilterTest < Test::Unit::TestCase
       event_stream = emit("slow_response_threshold 0.01", messages)
       assert_equal([[@now, statistics]], event_stream.to_a)
     end
+
+    sub_test_case "timezone" do
+      test "localtime" do
+        messages = [
+          "2015-08-12 15:50:40.130990|0x7fb07d113da0|>/d/select?table=Entries&match_columns=name&query=xml",
+          "2015-08-12 15:50:40.296165|0x7fb07d113da0|:000000165177838 filter(10)",
+          "2015-08-12 15:50:40.296172|0x7fb07d113da0|:000000165184723 select(10)",
+          "2015-08-12 15:50:41.228129|0x7fb07d113da0|:000001097153433 output(10)",
+          "2015-08-12 15:50:41.228317|0x7fb07d113da0|<000001097334986 rc=0",
+        ]
+        statistic = {
+          "start_time"  => "2015-08-12T15:50:40.130990+09:00",
+          "last_time"   => "2015-08-12T15:50:41.228324+09:00",
+          "elapsed"     => 1.0973349860000001,
+          "return_code" => 0,
+          "slow"        => true,
+          "command" => {
+            "raw" => "/d/select?table=Entries&match_columns=name&query=xml",
+            "name" => "select",
+            "parameters" => [
+              {"key" => :table,         "value" => "Entries"},
+              {"key" => :match_columns, "value" => "name"},
+              {"key" => :query,         "value" => "xml"},
+            ],
+          },
+          "operations" => [
+            {
+              "context"          => "query: xml",
+              "name"             => "filter",
+              "relative_elapsed" => 0.165177838,
+              "slow"             => true,
+            },
+            {
+              "context"          => nil,
+              "name"             => "select",
+              "relative_elapsed" => 6.884999999999999e-06,
+              "slow"             => false,
+            },
+            {
+              "context"          => nil,
+              "name"             => "output",
+              "relative_elapsed" => 0.93196871,
+              "slow"             => true,
+            },
+          ],
+        }
+        event_stream = emit("timezone localtime", messages)
+        assert_equal([[@now, statistic]], event_stream.to_a)
+      end
+    end
+
+    sub_test_case "time_format" do
+      test "sql" do
+        messages = [
+          "2015-08-12 15:50:40.130990|0x7fb07d113da0|>/d/select?table=Entries&match_columns=name&query=xml",
+          "2015-08-12 15:50:40.296165|0x7fb07d113da0|:000000165177838 filter(10)",
+          "2015-08-12 15:50:40.296172|0x7fb07d113da0|:000000165184723 select(10)",
+          "2015-08-12 15:50:41.228129|0x7fb07d113da0|:000001097153433 output(10)",
+          "2015-08-12 15:50:41.228317|0x7fb07d113da0|<000001097334986 rc=0",
+        ]
+        statistic = {
+          "start_time"  => "2015-08-12 06:50:40.130990",
+          "last_time"   => "2015-08-12 06:50:41.228324",
+          "elapsed"     => 1.0973349860000001,
+          "return_code" => 0,
+          "slow"        => true,
+          "command" => {
+            "raw" => "/d/select?table=Entries&match_columns=name&query=xml",
+            "name" => "select",
+            "parameters" => [
+              {"key" => :table,         "value" => "Entries"},
+              {"key" => :match_columns, "value" => "name"},
+              {"key" => :query,         "value" => "xml"},
+            ],
+          },
+          "operations" => [
+            {
+              "context"          => "query: xml",
+              "name"             => "filter",
+              "relative_elapsed" => 0.165177838,
+              "slow"             => true,
+            },
+            {
+              "context"          => nil,
+              "name"             => "select",
+              "relative_elapsed" => 6.884999999999999e-06,
+              "slow"             => false,
+            },
+            {
+              "context"          => nil,
+              "name"             => "output",
+              "relative_elapsed" => 0.93196871,
+              "slow"             => true,
+            },
+          ],
+        }
+        event_stream = emit("time_format sql", messages)
+        assert_equal([[@now, statistic]], event_stream.to_a)
+      end
+
+      test "string" do
+        messages = [
+          "2015-08-12 15:50:40.130990|0x7fb07d113da0|>/d/select?table=Entries&match_columns=name&query=xml",
+          "2015-08-12 15:50:40.296165|0x7fb07d113da0|:000000165177838 filter(10)",
+          "2015-08-12 15:50:40.296172|0x7fb07d113da0|:000000165184723 select(10)",
+          "2015-08-12 15:50:41.228129|0x7fb07d113da0|:000001097153433 output(10)",
+          "2015-08-12 15:50:41.228317|0x7fb07d113da0|<000001097334986 rc=0",
+        ]
+        statistic = {
+          "start_time"  => "2015-08-12 06:50:40.130990",
+          "last_time"   => "2015-08-12 06:50:41.228324",
+          "elapsed"     => 1.0973349860000001,
+          "return_code" => 0,
+          "slow"        => true,
+          "command" => {
+            "raw" => "/d/select?table=Entries&match_columns=name&query=xml",
+            "name" => "select",
+            "parameters" => [
+              {"key" => :table,         "value" => "Entries"},
+              {"key" => :match_columns, "value" => "name"},
+              {"key" => :query,         "value" => "xml"},
+            ],
+          },
+          "operations" => [
+            {
+              "context"          => "query: xml",
+              "name"             => "filter",
+              "relative_elapsed" => 0.165177838,
+              "slow"             => true,
+            },
+            {
+              "context"          => nil,
+              "name"             => "select",
+              "relative_elapsed" => 6.884999999999999e-06,
+              "slow"             => false,
+            },
+            {
+              "context"          => nil,
+              "name"             => "output",
+              "relative_elapsed" => 0.93196871,
+              "slow"             => true,
+            },
+          ],
+        }
+        event_stream = emit("time_format %Y-%m-%d %H:%M:%S.%6N", messages)
+        assert_equal([[@now, statistic]], event_stream.to_a)
+      end
+
+      test "sql and localtime" do
+        messages = [
+          "2015-08-12 15:50:40.130990|0x7fb07d113da0|>/d/select?table=Entries&match_columns=name&query=xml",
+          "2015-08-12 15:50:40.296165|0x7fb07d113da0|:000000165177838 filter(10)",
+          "2015-08-12 15:50:40.296172|0x7fb07d113da0|:000000165184723 select(10)",
+          "2015-08-12 15:50:41.228129|0x7fb07d113da0|:000001097153433 output(10)",
+          "2015-08-12 15:50:41.228317|0x7fb07d113da0|<000001097334986 rc=0",
+        ]
+        statistic = {
+          "start_time"  => "2015-08-12 15:50:40.130990",
+          "last_time"   => "2015-08-12 15:50:41.228324",
+          "elapsed"     => 1.0973349860000001,
+          "return_code" => 0,
+          "slow"        => true,
+          "command" => {
+            "raw" => "/d/select?table=Entries&match_columns=name&query=xml",
+            "name" => "select",
+            "parameters" => [
+              {"key" => :table,         "value" => "Entries"},
+              {"key" => :match_columns, "value" => "name"},
+              {"key" => :query,         "value" => "xml"},
+            ],
+          },
+          "operations" => [
+            {
+              "context"          => "query: xml",
+              "name"             => "filter",
+              "relative_elapsed" => 0.165177838,
+              "slow"             => true,
+            },
+            {
+              "context"          => nil,
+              "name"             => "select",
+              "relative_elapsed" => 6.884999999999999e-06,
+              "slow"             => false,
+            },
+            {
+              "context"          => nil,
+              "name"             => "output",
+              "relative_elapsed" => 0.93196871,
+              "slow"             => true,
+            },
+          ],
+        }
+        event_stream = emit(<<-CONFIGURATION, messages)
+          timezone localtime
+          time_format sql
+        CONFIGURATION
+        assert_equal([[@now, statistic]], event_stream.to_a)
+      end
+
+      test "string and localtime" do
+        messages = [
+          "2015-08-12 15:50:40.130990|0x7fb07d113da0|>/d/select?table=Entries&match_columns=name&query=xml",
+          "2015-08-12 15:50:40.296165|0x7fb07d113da0|:000000165177838 filter(10)",
+          "2015-08-12 15:50:40.296172|0x7fb07d113da0|:000000165184723 select(10)",
+          "2015-08-12 15:50:41.228129|0x7fb07d113da0|:000001097153433 output(10)",
+          "2015-08-12 15:50:41.228317|0x7fb07d113da0|<000001097334986 rc=0",
+        ]
+        statistic = {
+          "start_time"  => "2015-08-12 15:50:40.130990",
+          "last_time"   => "2015-08-12 15:50:41.228324",
+          "elapsed"     => 1.0973349860000001,
+          "return_code" => 0,
+          "slow"        => true,
+          "command" => {
+            "raw" => "/d/select?table=Entries&match_columns=name&query=xml",
+            "name" => "select",
+            "parameters" => [
+              {"key" => :table,         "value" => "Entries"},
+              {"key" => :match_columns, "value" => "name"},
+              {"key" => :query,         "value" => "xml"},
+            ],
+          },
+          "operations" => [
+            {
+              "context"          => "query: xml",
+              "name"             => "filter",
+              "relative_elapsed" => 0.165177838,
+              "slow"             => true,
+            },
+            {
+              "context"          => nil,
+              "name"             => "select",
+              "relative_elapsed" => 6.884999999999999e-06,
+              "slow"             => false,
+            },
+            {
+              "context"          => nil,
+              "name"             => "output",
+              "relative_elapsed" => 0.93196871,
+              "slow"             => true,
+            },
+          ],
+        }
+        event_stream = emit(<<-CONFIGURATION, messages)
+          timezone localtime
+          time_format %Y-%m-%d %H:%M:%S.%6N
+        CONFIGURATION
+        assert_equal([[@now, statistic]], event_stream.to_a)
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-groonga-query-log
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-09 00:00:00.000000000 Z
+date: 2019-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -132,7 +132,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubyforge_project: 
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Fluentd plugin to parse Groonga's query log.