fluentd 1.13.1-x86-mingw32 → 1.14.1-x86-mingw32

data/test/test_plugin_classes.rb

@@ -5,11 +5,78 @@ require 'fluent/plugin/bare_output'
 require 'fluent/plugin/filter'
 
 module FluentTest
+  class FluentTestCounterMetrics < Fluent::Plugin::Metrics
+    Fluent::Plugin.register_metrics('test_counter', self)
+
+    attr_reader :data
+
+    def initialize
+      super
+      @data = 0
+    end
+    def get
+      @data
+    end
+    def inc
+      @data +=1
+    end
+    def add(value)
+      @data += value
+    end
+    def set(value)
+      @data = value
+    end
+    def close
+      @data = 0
+      super
+    end
+  end
+
+  class FluentTestGaugeMetrics < Fluent::Plugin::Metrics
+    Fluent::Plugin.register_metrics('test_gauge', self)
+
+    attr_reader :data
+
+    def initialize
+      super
+      @data = 0
+    end
+    def get
+      @data
+    end
+    def inc
+      @data += 1
+    end
+    def dec
+      @data -=1
+    end
+    def add(value)
+      @data += value
+    end
+    def sub(value)
+      @data -= value
+    end
+    def set(value)
+      @data = value
+    end
+    def close
+      @data = 0
+      super
+    end
+  end
+
   class FluentTestInput < ::Fluent::Plugin::Input
     ::Fluent::Plugin.register_input('test_in', self)
 
     attr_reader :started
 
+    def initialize
+      super
+      # stub metrics instances
+      @emit_records_metrics = FluentTest::FluentTestCounterMetrics.new
+      @emit_size_metrics = FluentTest::FluentTestCounterMetrics.new
+    end
+
     def start
       super
       @started = true
@@ -28,6 +95,13 @@ module FluentTest
 
     config_param :num, :integer, default: 10000
 
+    def initialize
+      super
+      # stub metrics instances
+      @emit_records_metrics = FluentTest::FluentTestCounterMetrics.new
+      @emit_size_metrics = FluentTest::FluentTestCounterMetrics.new
+    end
+
     def start
       super
       @started = true
@@ -49,6 +123,15 @@ module FluentTest
     def initialize
       super
       @events = Hash.new { |h, k| h[k] = [] }
+      # stub metrics instances
+      @num_errors_metrics = FluentTest::FluentTestCounterMetrics.new
+      @emit_count_metrics = FluentTest::FluentTestCounterMetrics.new
+      @emit_records_metrics = FluentTest::FluentTestCounterMetrics.new
+      @emit_size_metrics = FluentTest::FluentTestCounterMetrics.new
+      @write_count_metrics = FluentTest::FluentTestCounterMetrics.new
+      @rollback_count_metrics = FluentTest::FluentTestCounterMetrics.new
+      @flush_time_count_metrics = FluentTest::FluentTestCounterMetrics.new
+      @slow_flush_count_metrics = FluentTest::FluentTestCounterMetrics.new
     end
 
     attr_reader :events
@@ -168,6 +251,19 @@ module FluentTest
   class FluentTestErrorOutput < ::Fluent::Plugin::Output
     ::Fluent::Plugin.register_output('test_out_error', self)
 
+    def initialize
+      super
+      # stub metrics instances
+      @num_errors_metrics = FluentTest::FluentTestCounterMetrics.new
+      @emit_count_metrics = FluentTest::FluentTestCounterMetrics.new
+      @emit_records_metrics = FluentTest::FluentTestCounterMetrics.new
+      @emit_size_metrics = FluentTest::FluentTestCounterMetrics.new
+      @write_count_metrics = FluentTest::FluentTestCounterMetrics.new
+      @rollback_count_metrics = FluentTest::FluentTestCounterMetrics.new
+      @flush_time_count_metrics = FluentTest::FluentTestCounterMetrics.new
+      @slow_flush_count_metrics = FluentTest::FluentTestCounterMetrics.new
+    end
+
     def format(tag, time, record)
       raise "emit error!"
     end
@@ -184,6 +280,9 @@ module FluentTest
       super()
       @num = 0
       @field = field
+      # stub metrics instances
+      @emit_records_metrics = FluentTest::FluentTestCounterMetrics.new
+      @emit_size_metrics = FluentTest::FluentTestCounterMetrics.new
     end
 
     attr_reader :num
@@ -213,6 +312,9 @@ module FluentTest
       super()
       @num = 0
       @field = field
+      # stub metrics instances
+      @emit_records_metrics = FluentTest::FluentTestCounterMetrics.new
+      @emit_size_metrics = FluentTest::FluentTestCounterMetrics.new
     end
 
     attr_reader :num

data/test/test_root_agent.rb

@@ -16,7 +16,8 @@ class RootAgentTest < ::Test::Unit::TestCase
 
   data(
     'suppress interval' => [{'emit_error_log_interval' => 30}, {:@suppress_emit_error_log_interval => 30}],
-    'without source' => [{'without_source' => true}, {:@without_source => true}]
+    'without source' => [{'without_source' => true}, {:@without_source => true}],
+    'enable input metrics' => [{'enable_input_metrics' => true}, {:@enable_input_metrics => true}],
     )
   def test_initialize_with_opt(data)
     opt, expected = data
@@ -109,6 +110,34 @@ EOC
       end
     end
 
+    test 'raises configuration error for label without name' do
+      conf = <<-EOC
+<label>
+  @type test_out
+</label>
+EOC
+      errmsg = "Missing symbol argument on <label> directive"
+      assert_raise Fluent::ConfigError.new(errmsg) do
+        configure_ra(conf)
+      end
+    end
+
+    test 'raises configuration error for <label @ROOT>' do
+      conf = <<-EOC
+<source>
+  @type test_in
+  @label @ROOT
+</source>
+<label @ROOT>
+  @type test_out
+</label>
+EOC
+      errmsg = "@ROOT for <label> is not permitted, reserved for getting root router"
+      assert_raise Fluent::ConfigError.new(errmsg) do
+        configure_ra(conf)
+      end
+    end
+
     test 'raises configuration error if there are not match sections in label section' do
       conf = <<-EOC
 <source>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 1.13.1
+  version: 1.14.1
 platform: x86-mingw32
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-25 00:00:00.000000000 Z
+date: 2021-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -107,7 +107,7 @@ dependencies:
         version: 0.5.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -117,7 +117,7 @@ dependencies:
         version: 0.5.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: sigdump
   requirement: !ruby/object:Gem::Requirement
@@ -463,9 +463,9 @@ files:
 - ".deepsource.toml"
 - ".drone.yml"
 - ".github/ISSUE_TEMPLATE.md"
-- ".github/ISSUE_TEMPLATE/bug_report.md"
+- ".github/ISSUE_TEMPLATE/bug_report.yaml"
 - ".github/ISSUE_TEMPLATE/config.yml"
-- ".github/ISSUE_TEMPLATE/feature_request.md"
+- ".github/ISSUE_TEMPLATE/feature_request.yaml"
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".github/workflows/issue-auto-closer.yml"
 - ".github/workflows/linux-test.yaml"
@@ -609,6 +609,7 @@ files:
 - lib/fluent/match.rb
 - lib/fluent/mixin.rb
 - lib/fluent/msgpack_factory.rb
+- lib/fluent/oj_options.rb
 - lib/fluent/output.rb
 - lib/fluent/output_chain.rb
 - lib/fluent/parser.rb
@@ -658,6 +659,8 @@ files:
 - lib/fluent/plugin/in_udp.rb
 - lib/fluent/plugin/in_unix.rb
 - lib/fluent/plugin/input.rb
+- lib/fluent/plugin/metrics.rb
+- lib/fluent/plugin/metrics_local.rb
 - lib/fluent/plugin/multi_output.rb
 - lib/fluent/plugin/out_copy.rb
 - lib/fluent/plugin/out_exec.rb
@@ -722,6 +725,7 @@ files:
 - lib/fluent/plugin_helper/http_server/server.rb
 - lib/fluent/plugin_helper/http_server/ssl_context_builder.rb
 - lib/fluent/plugin_helper/inject.rb
+- lib/fluent/plugin_helper/metrics.rb
 - lib/fluent/plugin_helper/parser.rb
 - lib/fluent/plugin_helper/record_accessor.rb
 - lib/fluent/plugin_helper/retry_state.rb
@@ -754,6 +758,7 @@ files:
 - lib/fluent/test/driver/multi_output.rb
 - lib/fluent/test/driver/output.rb
 - lib/fluent/test/driver/parser.rb
+- lib/fluent/test/driver/storage.rb
 - lib/fluent/test/driver/test_event_router.rb
 - lib/fluent/test/filter_test.rb
 - lib/fluent/test/formatter_test.rb
@@ -779,12 +784,14 @@ files:
 - templates/new_gem/lib/fluent/plugin/input.rb.erb
 - templates/new_gem/lib/fluent/plugin/output.rb.erb
 - templates/new_gem/lib/fluent/plugin/parser.rb.erb
+- templates/new_gem/lib/fluent/plugin/storage.rb.erb
 - templates/new_gem/test/helper.rb.erb
 - templates/new_gem/test/plugin/test_filter.rb.erb
 - templates/new_gem/test/plugin/test_formatter.rb.erb
 - templates/new_gem/test/plugin/test_input.rb.erb
 - templates/new_gem/test/plugin/test_output.rb.erb
 - templates/new_gem/test/plugin/test_parser.rb.erb
+- templates/new_gem/test/plugin/test_storage.rb.erb
 - templates/plugin_config_formatter/param.md-compact.erb
 - templates/plugin_config_formatter/param.md-table.erb
 - templates/plugin_config_formatter/param.md.erb
@@ -880,6 +887,8 @@ files:
 - test/plugin/test_in_unix.rb
 - test/plugin/test_input.rb
 - test/plugin/test_metadata.rb
+- test/plugin/test_metrics.rb
+- test/plugin/test_metrics_local.rb
 - test/plugin/test_multi_output.rb
 - test/plugin/test_out_copy.rb
 - test/plugin/test_out_exec.rb
@@ -955,6 +964,7 @@ files:
 - test/plugin_helper/test_formatter.rb
 - test/plugin_helper/test_http_server_helper.rb
 - test/plugin_helper/test_inject.rb
+- test/plugin_helper/test_metrics.rb
 - test/plugin_helper/test_parser.rb
 - test/plugin_helper/test_record_accessor.rb
 - test/plugin_helper/test_retry_state.rb
@@ -989,6 +999,7 @@ files:
 - test/test_match.rb
 - test/test_mixin.rb
 - test/test_msgpack_factory.rb
+- test/test_oj_options.rb
 - test/test_output.rb
 - test/test_plugin.rb
 - test/test_plugin_classes.rb
@@ -1119,6 +1130,8 @@ test_files:
 - test/plugin/test_in_unix.rb
 - test/plugin/test_input.rb
 - test/plugin/test_metadata.rb
+- test/plugin/test_metrics.rb
+- test/plugin/test_metrics_local.rb
 - test/plugin/test_multi_output.rb
 - test/plugin/test_out_copy.rb
 - test/plugin/test_out_exec.rb
@@ -1194,6 +1207,7 @@ test_files:
 - test/plugin_helper/test_formatter.rb
 - test/plugin_helper/test_http_server_helper.rb
 - test/plugin_helper/test_inject.rb
+- test/plugin_helper/test_metrics.rb
 - test/plugin_helper/test_parser.rb
 - test/plugin_helper/test_record_accessor.rb
 - test/plugin_helper/test_retry_state.rb
@@ -1228,6 +1242,7 @@ test_files:
 - test/test_match.rb
 - test/test_mixin.rb
 - test/test_msgpack_factory.rb
+- test/test_oj_options.rb
 - test/test_output.rb
 - test/test_plugin.rb
 - test/test_plugin_classes.rb

data/.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,40 +0,0 @@
----
-name:  Bug Report
-about: Create a report with a procedure for reproducing the bug
-
----
-
-Check [CONTRIBUTING guideline](https://github.com/fluent/fluentd/blob/master/CONTRIBUTING.md) first and here is the list to help us investigate the problem.
-
-**Describe the bug**
-<!-- A clear and concise description of what the bug is. -->
-
-**To Reproduce**
-<!-- Steps to reproduce the behavior: -->
-
-**Expected behavior**
-<!-- A clear and concise description of what you expected to happen. -->
-
-**Your Environment**
-
-- Fluentd or td-agent version: `fluentd --version` or `td-agent --version`
-- Operating system: `cat /etc/os-release`
-- Kernel version: `uname -r`
-
-If you hit the problem with older fluentd version, try latest version first.
-
-**Your Configuration**
-
-```
-<!-- Write your configuration here -->
-```
-
-**Your Error Log**
-
-```
-<!-- Write your **ALL** error log here -->
-```
-
-**Additional context**
-
-<!-- Add any other context about the problem here. -->

data/.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,23 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-
----
-
-Check [CONTRIBUTING guideline](https://github.com/fluent/fluentd/blob/master/CONTRIBUTING.md) first and here is the list to help us investigate the problem.
-
-**Is your feature request related to a problem? Please describe.**
-
-<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
-
-**Describe the solution you'd like**
-
-<!-- A clear and concise description of what you want to happen. -->
-
-**Describe alternatives you've considered**
-
-<!-- A clear and concise description of any alternative solutions or features you've considered. -->
-
-**Additional context**
-
-<!-- Add any other context or screenshots about the feature request here. -->