fluentd 0.14.17-x86-mingw32 → 1.3.1-x86-mingw32

data/test/test_root_agent.rb

@@ -1,6 +1,7 @@
 require_relative 'helper'
 require 'fluent/event_router'
 require 'fluent/system_config'
+require 'timecop'
 require_relative 'test_plugin_classes'
 
 class RootAgentTest < ::Test::Unit::TestCase
@@ -609,6 +610,38 @@ EOC
     end
   end
 
+  sub_test_case 'configure emit_error_interval' do
+    setup do
+      system_config = SystemConfig.new
+      system_config.emit_error_log_interval = 30
+      @ra = RootAgent.new(log: $log, system_config: system_config)
+      stub(Engine).root_agent { @ra }
+      @ra.log.out.reset
+      one_minute_ago = Time.now.to_i - 60
+      Timecop.freeze(one_minute_ago)
+    end
+
+    teardown do
+      Timecop.return
+    end
+
+    test 'suppresses errors' do
+      mock(@ra.log).warn_backtrace()
+      e = StandardError.new('standard error')
+      begin
+        @ra.handle_emits_error("tag", nil, e)
+      rescue
+      end
+
+      begin
+      @ra.handle_emits_error("tag", nil, e)
+      rescue
+      end
+
+      assert_equal 1, @ra.log.out.logs.size
+    end
+  end
+
   sub_test_case 'configured at worker2 with 4 workers environment' do
     setup do
       ENV['SERVERENGINE_WORKER_ID'] = '2'

data/test/test_supervisor.rb

@@ -77,6 +77,46 @@ class SupervisorTest < ::Test::Unit::TestCase
     $log.out.reset
   end
 
+  def test_read_config_with_multibyte_string
+    tmp_path = "#{TMP_DIR}/dir/test_multibyte_config.conf"
+    conf_str = %[
+<source>
+  @type forward
+  @id forward_input
+  @label @INPUT
+</source>
+<label @INPUT>
+  <filter>
+    @type record_transformer
+    <record>
+      message こんにちは. ${record["name"]} has made a order of ${record["item"]} just now.
+    </record>
+  </filter>
+  <match>
+    @type stdout
+  </match>
+</label>
+]
+    FileUtils.mkdir_p(File.dirname(tmp_path))
+    File.open(tmp_path, "w:utf-8") {|file| file.write(conf_str) }
+
+    opts = Fluent::Supervisor.default_options
+    sv = Fluent::Supervisor.new(opts)
+
+    use_v1_config = {}
+    use_v1_config['use_v1_config'] = true
+
+    sv.instance_variable_set(:@config_path, tmp_path)
+    sv.instance_variable_set(:@use_v1_config, use_v1_config)
+    sv.send(:read_config)
+
+    conf = sv.instance_variable_get(:@conf)
+    label = conf.elements.detect {|e| e.name == "label" }
+    filter = label.elements.detect {|e| e.name == "filter" }
+    record_transformer = filter.elements.detect {|e| e.name = "record_transformer" }
+    assert_equal(Encoding::UTF_8, record_transformer["message"].encoding)
+  end
+
   def test_system_config
     opts = Fluent::Supervisor.default_options
     sv = Fluent::Supervisor.new(opts)
@@ -90,6 +130,21 @@ class SupervisorTest < ::Test::Unit::TestCase
   process_name "process_name"
   log_level info
   root_dir #{TMP_ROOT_DIR}
+  <log>
+    format json
+    time_format %Y
+  </log>
+  <counter_server>
+    bind 127.0.0.1
+    port 24321
+    scope server1
+    backup_path /tmp/backup
+  </counter_server>
+  <counter_client>
+    host 127.0.0.1
+    port 24321
+    timeout 2
+  </counter_client>
 </system>
     EOC
     conf = Fluent::Config.parse(conf_data, "(test)", "(test_dir)", true)
@@ -105,6 +160,17 @@ class SupervisorTest < ::Test::Unit::TestCase
     assert_equal "process_name", sys_conf.process_name
     assert_equal 2, sys_conf.log_level
     assert_equal TMP_ROOT_DIR, sys_conf.root_dir
+    assert_equal :json, sys_conf.log.format
+    assert_equal '%Y', sys_conf.log.time_format
+    counter_server = sys_conf.counter_server
+    assert_equal '127.0.0.1', counter_server.bind
+    assert_equal 24321, counter_server.port
+    assert_equal 'server1', counter_server.scope
+    assert_equal '/tmp/backup', counter_server.backup_path
+    counter_client = sys_conf.counter_client
+    assert_equal '127.0.0.1', counter_client.host
+    assert_equal 24321, counter_client.port
+    assert_equal 2, counter_client.timeout
   end
 
   def test_main_process_signal_handlers
@@ -319,6 +385,45 @@ class SupervisorTest < ::Test::Unit::TestCase
     assert_equal Fluent::Log::LEVEL_INFO, se_config[:log_level]
   end
 
+  def test_load_config_with_multibyte_string
+    tmp_path = "#{TMP_DIR}/dir/test_multibyte_config.conf"
+    conf_str = %[
+<source>
+  @type forward
+  @id forward_input
+  @label @INPUT
+</source>
+<label @INPUT>
+  <filter>
+    @type record_transformer
+    <record>
+      message こんにちは. ${record["name"]} has made a order of ${record["item"]} just now.
+    </record>
+  </filter>
+  <match>
+    @type stdout
+  </match>
+</label>
+]
+    FileUtils.mkdir_p(File.dirname(tmp_path))
+    File.open(tmp_path, "w:utf-8") {|file| file.write(conf_str) }
+
+    params = {}
+    params['workers'] = 1
+    params['use_v1_config'] = true
+    params['log_path'] = 'test/tmp/supervisor/log'
+    params['suppress_repeated_stacktrace'] = true
+    params['log_level'] = Fluent::Log::LEVEL_INFO
+    load_config_proc =  Proc.new { Fluent::Supervisor.load_config(tmp_path, params) }
+
+    se_config = load_config_proc.call
+    conf = se_config[:fluentd_conf]
+    label = conf.elements.detect {|e| e.name == "label" }
+    filter = label.elements.detect {|e| e.name == "filter" }
+    record_transformer = filter.elements.detect {|e| e.name = "record_transformer" }
+    assert_equal(Encoding::UTF_8, record_transformer["message"].encoding)
+  end
+
   def test_logger
     opts = Fluent::Supervisor.default_options
     sv = Fluent::Supervisor.new(opts)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.14.17
+  version: 1.3.1
 platform: x86-mingw32
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-06 00:00:00.000000000 Z
+date: 2018-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -148,18 +148,38 @@ dependencies:
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: strptime
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: dig_rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: win32-service
   requirement: !ruby/object:Gem::Requirement
@@ -348,6 +368,7 @@ email:
 - frsyuki@gmail.com
 executables:
 - fluent-binlog-reader
+- fluent-ca-generate
 - fluent-cat
 - fluent-debug
 - fluent-gem
@@ -360,17 +381,20 @@ files:
 - ".github/ISSUE_TEMPLATE.md"
 - ".gitignore"
 - ".travis.yml"
+- ADOPTERS.md
 - AUTHORS
+- CHANGELOG.md
 - CONTRIBUTING.md
-- COPYING
-- ChangeLog
+- GOVERNANCE.md
 - Gemfile
+- LICENSE
 - MAINTAINERS.md
 - README.md
 - Rakefile
 - Vagrantfile
 - appveyor.yml
 - bin/fluent-binlog-reader
+- bin/fluent-ca-generate
 - bin/fluent-cat
 - bin/fluent-debug
 - bin/fluent-gem
@@ -379,6 +403,7 @@ files:
 - bin/fluentd
 - code-of-conduct.md
 - example/copy_roundrobin.conf
+- example/counter.conf
 - example/filter_stdout.conf
 - example/in_dummy_blocks.conf
 - example/in_dummy_with_compression.conf
@@ -418,6 +443,7 @@ files:
 - lib/fluent/clock.rb
 - lib/fluent/command/binlog_reader.rb
 - lib/fluent/command/bundler_injection.rb
+- lib/fluent/command/ca_generate.rb
 - lib/fluent/command/cat.rb
 - lib/fluent/command/debug.rb
 - lib/fluent/command/fluentd.rb
@@ -457,6 +483,14 @@ files:
 - lib/fluent/config/types.rb
 - lib/fluent/config/v1_parser.rb
 - lib/fluent/configurable.rb
+- lib/fluent/counter.rb
+- lib/fluent/counter/base_socket.rb
+- lib/fluent/counter/client.rb
+- lib/fluent/counter/error.rb
+- lib/fluent/counter/mutex_hash.rb
+- lib/fluent/counter/server.rb
+- lib/fluent/counter/store.rb
+- lib/fluent/counter/validator.rb
 - lib/fluent/daemon.rb
 - lib/fluent/engine.rb
 - lib/fluent/env.rb
@@ -553,12 +587,14 @@ files:
 - lib/fluent/plugin_helper/cert_option.rb
 - lib/fluent/plugin_helper/child_process.rb
 - lib/fluent/plugin_helper/compat_parameters.rb
+- lib/fluent/plugin_helper/counter.rb
 - lib/fluent/plugin_helper/event_emitter.rb
 - lib/fluent/plugin_helper/event_loop.rb
 - lib/fluent/plugin_helper/extract.rb
 - lib/fluent/plugin_helper/formatter.rb
 - lib/fluent/plugin_helper/inject.rb
 - lib/fluent/plugin_helper/parser.rb
+- lib/fluent/plugin_helper/record_accessor.rb
 - lib/fluent/plugin_helper/retry_state.rb
 - lib/fluent/plugin_helper/server.rb
 - lib/fluent/plugin_helper/socket.rb
@@ -618,6 +654,7 @@ files:
 - templates/plugin_config_formatter/param.md.erb
 - templates/plugin_config_formatter/section.md.erb
 - test/command/test_binlog_reader.rb
+- test/command/test_ca_generate.rb
 - test/command/test_fluentd.rb
 - test/command/test_plugin_config_formatter.rb
 - test/command/test_plugin_generator.rb
@@ -630,9 +667,16 @@ files:
 - test/config/test_dsl.rb
 - test/config/test_element.rb
 - test/config/test_literal_parser.rb
+- test/config/test_plugin_configuration.rb
 - test/config/test_section.rb
 - test/config/test_system_config.rb
 - test/config/test_types.rb
+- test/counter/test_client.rb
+- test/counter/test_error.rb
+- test/counter/test_mutex_hash.rb
+- test/counter/test_server.rb
+- test/counter/test_store.rb
+- test/counter/test_validator.rb
 - test/helper.rb
 - test/plugin/data/2010/01/20100102-030405.log
 - test/plugin/data/2010/01/20100102-030406.log
@@ -663,6 +707,7 @@ files:
 - test/plugin/test_formatter_msgpack.rb
 - test/plugin/test_formatter_out_file.rb
 - test/plugin/test_formatter_single_value.rb
+- test/plugin/test_formatter_tsv.rb
 - test/plugin/test_in_debug_agent.rb
 - test/plugin/test_in_dummy.rb
 - test/plugin/test_in_exec.rb
@@ -677,6 +722,7 @@ files:
 - test/plugin/test_in_udp.rb
 - test/plugin/test_in_unix.rb
 - test/plugin/test_input.rb
+- test/plugin/test_metadata.rb
 - test/plugin/test_multi_output.rb
 - test/plugin/test_out_copy.rb
 - test/plugin/test_out_exec.rb
@@ -691,6 +737,7 @@ files:
 - test/plugin/test_out_stream.rb
 - test/plugin/test_output.rb
 - test/plugin/test_output_as_buffered.rb
+- test/plugin/test_output_as_buffered_backup.rb
 - test/plugin/test_output_as_buffered_compress.rb
 - test/plugin/test_output_as_buffered_overflow.rb
 - test/plugin/test_output_as_buffered_retries.rb
@@ -721,6 +768,7 @@ files:
 - test/plugin_helper/test_formatter.rb
 - test/plugin_helper/test_inject.rb
 - test/plugin_helper/test_parser.rb
+- test/plugin_helper/test_record_accessor.rb
 - test/plugin_helper/test_retry_state.rb
 - test/plugin_helper/test_server.rb
 - test/plugin_helper/test_storage.rb
@@ -757,7 +805,7 @@ files:
 - test/test_time_formatter.rb
 - test/test_time_parser.rb
 - test/test_unique_id.rb
-homepage: http://fluentd.org/
+homepage: https://www.fluentd.org/
 licenses:
 - Apache-2.0
 metadata: {}
@@ -777,12 +825,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Fluentd event collector
 test_files:
 - test/command/test_binlog_reader.rb
+- test/command/test_ca_generate.rb
 - test/command/test_fluentd.rb
 - test/command/test_plugin_config_formatter.rb
 - test/command/test_plugin_generator.rb
@@ -795,9 +844,16 @@ test_files:
 - test/config/test_dsl.rb
 - test/config/test_element.rb
 - test/config/test_literal_parser.rb
+- test/config/test_plugin_configuration.rb
 - test/config/test_section.rb
 - test/config/test_system_config.rb
 - test/config/test_types.rb
+- test/counter/test_client.rb
+- test/counter/test_error.rb
+- test/counter/test_mutex_hash.rb
+- test/counter/test_server.rb
+- test/counter/test_store.rb
+- test/counter/test_validator.rb
 - test/helper.rb
 - test/plugin/data/2010/01/20100102-030405.log
 - test/plugin/data/2010/01/20100102-030406.log
@@ -828,6 +884,7 @@ test_files:
 - test/plugin/test_formatter_msgpack.rb
 - test/plugin/test_formatter_out_file.rb
 - test/plugin/test_formatter_single_value.rb
+- test/plugin/test_formatter_tsv.rb
 - test/plugin/test_in_debug_agent.rb
 - test/plugin/test_in_dummy.rb
 - test/plugin/test_in_exec.rb
@@ -842,6 +899,7 @@ test_files:
 - test/plugin/test_in_udp.rb
 - test/plugin/test_in_unix.rb
 - test/plugin/test_input.rb
+- test/plugin/test_metadata.rb
 - test/plugin/test_multi_output.rb
 - test/plugin/test_out_copy.rb
 - test/plugin/test_out_exec.rb
@@ -856,6 +914,7 @@ test_files:
 - test/plugin/test_out_stream.rb
 - test/plugin/test_output.rb
 - test/plugin/test_output_as_buffered.rb
+- test/plugin/test_output_as_buffered_backup.rb
 - test/plugin/test_output_as_buffered_compress.rb
 - test/plugin/test_output_as_buffered_overflow.rb
 - test/plugin/test_output_as_buffered_retries.rb
@@ -886,6 +945,7 @@ test_files:
 - test/plugin_helper/test_formatter.rb
 - test/plugin_helper/test_inject.rb
 - test/plugin_helper/test_parser.rb
+- test/plugin_helper/test_record_accessor.rb
 - test/plugin_helper/test_retry_state.rb
 - test/plugin_helper/test_server.rb
 - test/plugin_helper/test_storage.rb

data/COPYING

@@ -1,14 +0,0 @@
-Copyright (C) 2011 FURUHASHI Sadayuki
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-