fluent-plugin-perf-tools 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6dd2ad9703a1b96567ec20ac385de14772969693
-  data.tar.gz: 9c943fa001c678115eb59932a1b7097754f3d547
+  metadata.gz: 9ed0360305defb0ee3fc7b8ec534ee4b9ee18077
+  data.tar.gz: 477a32460779d05cab3052ce594001e1c7ba8df7
 SHA512:
-  metadata.gz: 3e56e33e05540488735ea1d6e35ab863a47eba4803dac98757afd32d7c1b69ca6c458b0da25ee648c6018644133e8dcd1518dac4ba45cbe4a8033fd89282db8c
-  data.tar.gz: 47cfe432dfa665345171756c5fbbaaa2e7562f80df741b06a752275602c3ecfc88e5f51ed275cc109186c4c535428bb8774ea4f388fe5468916a22e587b89a01
+  metadata.gz: 7103ad358638e785b7d226653e2df8a27a758b7b74abc39e59128825cbb36e7ebc590e51f9ebd5b7f7b8a2b11fb6eaac7347ba6a2b146fe4a16bcba556240c73
+  data.tar.gz: 306d4853ec6dbe06147daed8390f2c38c2749901aa6276c3cc31d7ec04615b2faa1b7ee81a25777a0a11183493b25978c21ced5928a647a5a9393743e5a546b8

data/lib/fluent/plugin/in_perf_tools.rb

@@ -17,7 +17,7 @@ module Fluent
       desc "Command args"
       config_param :command_args, :string, default: nil
       desc "Interval"
-      config_param :interval, :time, default: 5
+      config_param :interval, :time, default: 30
 
       def configure(conf)
         super

data/lib/fluent/plugin/perf_tools/base.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+module Fluent
+  module Plugin
+    module PerfTools
+      # base class for all perf-tools command
+      #  provides common behavior for all command
+      class Base
+        DEFAULT_INTERVAL = 30
+        DEFAULT_COMMAND_ARGS = ""
+        DEFAULT_TIME_KEY = "TIME"
+
+        class << self
+          attr_reader :command, :discard_regexp, :location
+
+          def set_command(command)
+            @command = command
+          end
+
+          def set_discard_regexp(regexp)
+            @discard_regexp = regexp
+          end
+
+          def set_location(location)
+            @location = location
+          end
+
+          def time_key
+            @time_key ||= DEFAULT_TIME_KEY
+          end
+
+          def set_time_key(key)
+            @time_key = key
+          end
+
+          def command_path
+            File.expand_path(File.join(File.expand_path(__dir__), "../../../../perf-tools/#{location}/#{command}"))
+          end
+        end
+
+        attr_reader :command_args, :interval, :time_key
+
+        def initialize(command_args:, interval:)
+          @command_args = command_args || DEFAULT_COMMAND_ARGS
+          @interval = interval || DEFAULT_INTERVAL
+          @time_key = DEFAULT_TIME_KEY
+        end
+
+        def stream
+          headers = nil
+          IO.popen("sudo #{command_path} #{command_args} #{interval}").each do |line|
+            next if discard_regexp && line.match(discard_regexp)
+
+            unless headers
+              headers = line.split
+              next
+            end
+
+            record = headers.zip(line.split).to_h
+            time = parse_time(record)
+
+            yield time, record
+          end
+        end
+
+        def parse_time(record)
+          if time_key && record.respond_to?(:has_key?) && record.key?(time_key)
+            Fluent::EventTime.from_time(Time.parse(record[time_key]))
+          else
+            Fluent::EventTime.now
+          end
+        end
+
+        def command_path
+          self.class.command_path
+        end
+
+        def discard_regexp
+          self.class.discard_regexp
+        end
+      end
+    end
+  end
+end

data/lib/fluent/plugin/perf_tools/cachestat.rb

@@ -1,62 +1,14 @@
 # frozen_string_literal: true
 
+require_relative "base"
+
 module Fluent
   module Plugin
     module PerfTools
-      class Cachestat
-        COMMAND = "cachestat"
-        DEFAULT_INTERVAL = 30
-        DEFAULT_COMMAND_ARGS = "-t"
-        EXTRA_INFO_REGEXP = /^Counting cache functions...|^Ending tracing.../
-        TIME_KEY = 'TIME'
-
-        def self.command
-          COMMAND
-        end
-
-        def self.command_path
-          File.expand_path(File.join(File.expand_path(__dir__), "../../../../perf-tools/fs/#{COMMAND}"))
-        end
-
-        attr_reader :command_args, :interval
-
-        def initialize(command_args:, interval:)
-          @command_args = command_args || DEFAULT_COMMAND_ARGS
-          @interval = interval || DEFAULT_INTERVAL
-        end
-
-        def command_path
-          self.class.command_path
-        end
-
-        def time_key
-          TIME_KEY
-        end
-
-        def stream
-          headers = nil
-          IO.popen("sudo #{command_path} #{command_args} #{interval}").each do |line|
-            next if line.match(EXTRA_INFO_REGEXP)
-
-            unless headers
-              headers = line.split
-              next
-            end
-
-            record = headers.zip(line.split).to_h
-            time = parse_time(record)
-
-            yield time, record
-          end
-        end
-
-        def parse_time(record)
-          if time_key && record.respond_to?(:has_key?) && record.has_key?(time_key)
-            Fluent::EventTime.from_time(Time.parse(record[time_key]))
-          else
-            Fluent::EventTime.now
-          end
-        end
+      class Cachestat < Base
+        set_command "cachestat"
+        set_location "fs"
+        set_discard_regexp /^Counting cache functions...|^Ending tracing.../
       end
 
       Command.reference(Cachestat)

data/lib/fluent/plugin/perf_tools/version.rb

@@ -3,7 +3,7 @@
 module Fluent
   module Plugin
     module PerfTools
-      VERSION = "0.1.0"
+      VERSION = "0.2.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-perf-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Thomas Tych
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-08 00:00:00.000000000 Z
+date: 2022-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bump
@@ -237,6 +237,7 @@ files:
 - fluent-plugin-perf-tools.gemspec
 - lib/fluent/plugin/in_perf_tools.rb
 - lib/fluent/plugin/perf_tools.rb
+- lib/fluent/plugin/perf_tools/base.rb
 - lib/fluent/plugin/perf_tools/cachestat.rb
 - lib/fluent/plugin/perf_tools/command.rb
 - lib/fluent/plugin/perf_tools/version.rb