fluentd 1.16.5-x64-mingw32 → 1.17.1-x64-mingw32
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +88 -0
- data/README.md +2 -1
- data/Rakefile +1 -1
- data/SECURITY.md +2 -2
- data/fluent.conf +14 -14
- data/lib/fluent/command/binlog_reader.rb +1 -1
- data/lib/fluent/command/cap_ctl.rb +4 -4
- data/lib/fluent/compat/call_super_mixin.rb +3 -3
- data/lib/fluent/compat/propagate_default.rb +4 -4
- data/lib/fluent/config/configure_proxy.rb +2 -2
- data/lib/fluent/config/types.rb +1 -1
- data/lib/fluent/config/yaml_parser/parser.rb +4 -0
- data/lib/fluent/configurable.rb +2 -2
- data/lib/fluent/counter/mutex_hash.rb +1 -1
- data/lib/fluent/fluent_log_event_router.rb +0 -2
- data/lib/fluent/log/console_adapter.rb +4 -2
- data/lib/fluent/plugin/buf_file.rb +1 -1
- data/lib/fluent/plugin/buffer/file_chunk.rb +1 -1
- data/lib/fluent/plugin/buffer/file_single_chunk.rb +2 -3
- data/lib/fluent/plugin/filter_parser.rb +26 -8
- data/lib/fluent/plugin/in_exec.rb +14 -2
- data/lib/fluent/plugin/in_http.rb +19 -54
- data/lib/fluent/plugin/in_sample.rb +13 -7
- data/lib/fluent/plugin/in_tail.rb +99 -25
- data/lib/fluent/plugin/out_copy.rb +1 -1
- data/lib/fluent/plugin/out_file.rb +8 -0
- data/lib/fluent/plugin/out_http.rb +137 -13
- data/lib/fluent/plugin/owned_by_mixin.rb +0 -1
- data/lib/fluent/plugin/parser_json.rb +26 -17
- data/lib/fluent/plugin/parser_msgpack.rb +24 -3
- data/lib/fluent/plugin_helper/http_server/server.rb +1 -1
- data/lib/fluent/plugin_helper/metrics.rb +2 -2
- data/lib/fluent/registry.rb +6 -6
- data/lib/fluent/test/output_test.rb +1 -1
- data/lib/fluent/unique_id.rb +1 -1
- data/lib/fluent/version.rb +1 -1
- data/templates/new_gem/fluent-plugin.gemspec.erb +6 -5
- metadata +109 -459
- data/.github/ISSUE_TEMPLATE/bug_report.yml +0 -71
- data/.github/ISSUE_TEMPLATE/config.yml +0 -5
- data/.github/ISSUE_TEMPLATE/feature_request.yml +0 -39
- data/.github/ISSUE_TEMPLATE.md +0 -17
- data/.github/PULL_REQUEST_TEMPLATE.md +0 -14
- data/.github/workflows/stale-actions.yml +0 -24
- data/.github/workflows/test.yml +0 -32
- data/.gitignore +0 -30
- data/Gemfile +0 -9
- data/fluentd.gemspec +0 -54
- data/test/command/test_binlog_reader.rb +0 -362
- data/test/command/test_ca_generate.rb +0 -70
- data/test/command/test_cap_ctl.rb +0 -100
- data/test/command/test_cat.rb +0 -128
- data/test/command/test_ctl.rb +0 -56
- data/test/command/test_fluentd.rb +0 -1291
- data/test/command/test_plugin_config_formatter.rb +0 -397
- data/test/command/test_plugin_generator.rb +0 -109
- data/test/compat/test_calls_super.rb +0 -166
- data/test/compat/test_parser.rb +0 -92
- data/test/config/assertions.rb +0 -42
- data/test/config/test_config_parser.rb +0 -551
- data/test/config/test_configurable.rb +0 -1784
- data/test/config/test_configure_proxy.rb +0 -604
- data/test/config/test_dsl.rb +0 -415
- data/test/config/test_element.rb +0 -518
- data/test/config/test_literal_parser.rb +0 -309
- data/test/config/test_plugin_configuration.rb +0 -56
- data/test/config/test_section.rb +0 -191
- data/test/config/test_system_config.rb +0 -195
- data/test/config/test_types.rb +0 -408
- data/test/counter/test_client.rb +0 -563
- data/test/counter/test_error.rb +0 -44
- data/test/counter/test_mutex_hash.rb +0 -179
- data/test/counter/test_server.rb +0 -589
- data/test/counter/test_store.rb +0 -258
- data/test/counter/test_validator.rb +0 -137
- data/test/helper.rb +0 -155
- data/test/helpers/fuzzy_assert.rb +0 -89
- data/test/helpers/process_extenstion.rb +0 -33
- data/test/log/test_console_adapter.rb +0 -110
- data/test/plugin/data/2010/01/20100102-030405.log +0 -0
- data/test/plugin/data/2010/01/20100102-030406.log +0 -0
- data/test/plugin/data/2010/01/20100102.log +0 -0
- data/test/plugin/data/log/bar +0 -0
- data/test/plugin/data/log/foo/bar.log +0 -0
- data/test/plugin/data/log/foo/bar2 +0 -0
- data/test/plugin/data/log/test.log +0 -0
- data/test/plugin/data/sd_file/config +0 -11
- data/test/plugin/data/sd_file/config.json +0 -17
- data/test/plugin/data/sd_file/config.yaml +0 -11
- data/test/plugin/data/sd_file/config.yml +0 -11
- data/test/plugin/data/sd_file/invalid_config.yml +0 -7
- data/test/plugin/in_tail/test_fifo.rb +0 -121
- data/test/plugin/in_tail/test_io_handler.rb +0 -150
- data/test/plugin/in_tail/test_position_file.rb +0 -346
- data/test/plugin/out_forward/test_ack_handler.rb +0 -140
- data/test/plugin/out_forward/test_connection_manager.rb +0 -145
- data/test/plugin/out_forward/test_handshake_protocol.rb +0 -112
- data/test/plugin/out_forward/test_load_balancer.rb +0 -106
- data/test/plugin/out_forward/test_socket_cache.rb +0 -174
- data/test/plugin/test_bare_output.rb +0 -131
- data/test/plugin/test_base.rb +0 -247
- data/test/plugin/test_buf_file.rb +0 -1314
- data/test/plugin/test_buf_file_single.rb +0 -898
- data/test/plugin/test_buf_memory.rb +0 -42
- data/test/plugin/test_buffer.rb +0 -1493
- data/test/plugin/test_buffer_chunk.rb +0 -209
- data/test/plugin/test_buffer_file_chunk.rb +0 -871
- data/test/plugin/test_buffer_file_single_chunk.rb +0 -611
- data/test/plugin/test_buffer_memory_chunk.rb +0 -339
- data/test/plugin/test_compressable.rb +0 -87
- data/test/plugin/test_file_util.rb +0 -96
- data/test/plugin/test_filter.rb +0 -368
- data/test/plugin/test_filter_grep.rb +0 -697
- data/test/plugin/test_filter_parser.rb +0 -731
- data/test/plugin/test_filter_record_transformer.rb +0 -577
- data/test/plugin/test_filter_stdout.rb +0 -207
- data/test/plugin/test_formatter_csv.rb +0 -136
- data/test/plugin/test_formatter_hash.rb +0 -38
- data/test/plugin/test_formatter_json.rb +0 -61
- data/test/plugin/test_formatter_ltsv.rb +0 -70
- data/test/plugin/test_formatter_msgpack.rb +0 -28
- data/test/plugin/test_formatter_out_file.rb +0 -116
- data/test/plugin/test_formatter_single_value.rb +0 -44
- data/test/plugin/test_formatter_tsv.rb +0 -76
- data/test/plugin/test_in_debug_agent.rb +0 -49
- data/test/plugin/test_in_exec.rb +0 -261
- data/test/plugin/test_in_forward.rb +0 -1178
- data/test/plugin/test_in_gc_stat.rb +0 -62
- data/test/plugin/test_in_http.rb +0 -1102
- data/test/plugin/test_in_monitor_agent.rb +0 -922
- data/test/plugin/test_in_object_space.rb +0 -66
- data/test/plugin/test_in_sample.rb +0 -190
- data/test/plugin/test_in_syslog.rb +0 -505
- data/test/plugin/test_in_tail.rb +0 -3288
- data/test/plugin/test_in_tcp.rb +0 -328
- data/test/plugin/test_in_udp.rb +0 -296
- data/test/plugin/test_in_unix.rb +0 -181
- data/test/plugin/test_input.rb +0 -137
- data/test/plugin/test_metadata.rb +0 -89
- data/test/plugin/test_metrics.rb +0 -294
- data/test/plugin/test_metrics_local.rb +0 -96
- data/test/plugin/test_multi_output.rb +0 -204
- data/test/plugin/test_out_copy.rb +0 -308
- data/test/plugin/test_out_exec.rb +0 -312
- data/test/plugin/test_out_exec_filter.rb +0 -606
- data/test/plugin/test_out_file.rb +0 -1038
- data/test/plugin/test_out_forward.rb +0 -1349
- data/test/plugin/test_out_http.rb +0 -429
- data/test/plugin/test_out_null.rb +0 -105
- data/test/plugin/test_out_relabel.rb +0 -28
- data/test/plugin/test_out_roundrobin.rb +0 -146
- data/test/plugin/test_out_secondary_file.rb +0 -458
- data/test/plugin/test_out_stdout.rb +0 -205
- data/test/plugin/test_out_stream.rb +0 -103
- data/test/plugin/test_output.rb +0 -1334
- data/test/plugin/test_output_as_buffered.rb +0 -2024
- data/test/plugin/test_output_as_buffered_backup.rb +0 -363
- data/test/plugin/test_output_as_buffered_compress.rb +0 -179
- data/test/plugin/test_output_as_buffered_overflow.rb +0 -250
- data/test/plugin/test_output_as_buffered_retries.rb +0 -966
- data/test/plugin/test_output_as_buffered_secondary.rb +0 -882
- data/test/plugin/test_output_as_standard.rb +0 -374
- data/test/plugin/test_owned_by.rb +0 -35
- data/test/plugin/test_parser.rb +0 -399
- data/test/plugin/test_parser_apache.rb +0 -42
- data/test/plugin/test_parser_apache2.rb +0 -47
- data/test/plugin/test_parser_apache_error.rb +0 -45
- data/test/plugin/test_parser_csv.rb +0 -200
- data/test/plugin/test_parser_json.rb +0 -138
- data/test/plugin/test_parser_labeled_tsv.rb +0 -160
- data/test/plugin/test_parser_multiline.rb +0 -111
- data/test/plugin/test_parser_nginx.rb +0 -88
- data/test/plugin/test_parser_none.rb +0 -52
- data/test/plugin/test_parser_regexp.rb +0 -284
- data/test/plugin/test_parser_syslog.rb +0 -650
- data/test/plugin/test_parser_tsv.rb +0 -122
- data/test/plugin/test_sd_file.rb +0 -228
- data/test/plugin/test_sd_srv.rb +0 -230
- data/test/plugin/test_storage.rb +0 -167
- data/test/plugin/test_storage_local.rb +0 -335
- data/test/plugin/test_string_util.rb +0 -26
- data/test/plugin_helper/data/cert/cert-key.pem +0 -27
- data/test/plugin_helper/data/cert/cert-with-CRLF.pem +0 -19
- data/test/plugin_helper/data/cert/cert-with-no-newline.pem +0 -19
- data/test/plugin_helper/data/cert/cert.pem +0 -19
- data/test/plugin_helper/data/cert/cert_chains/ca-cert-key.pem +0 -27
- data/test/plugin_helper/data/cert/cert_chains/ca-cert.pem +0 -20
- data/test/plugin_helper/data/cert/cert_chains/cert-key.pem +0 -27
- data/test/plugin_helper/data/cert/cert_chains/cert.pem +0 -40
- data/test/plugin_helper/data/cert/empty.pem +0 -0
- data/test/plugin_helper/data/cert/generate_cert.rb +0 -125
- data/test/plugin_helper/data/cert/with_ca/ca-cert-key-pass.pem +0 -30
- data/test/plugin_helper/data/cert/with_ca/ca-cert-key.pem +0 -27
- data/test/plugin_helper/data/cert/with_ca/ca-cert-pass.pem +0 -20
- data/test/plugin_helper/data/cert/with_ca/ca-cert.pem +0 -20
- data/test/plugin_helper/data/cert/with_ca/cert-key-pass.pem +0 -30
- data/test/plugin_helper/data/cert/with_ca/cert-key.pem +0 -27
- data/test/plugin_helper/data/cert/with_ca/cert-pass.pem +0 -21
- data/test/plugin_helper/data/cert/with_ca/cert.pem +0 -21
- data/test/plugin_helper/data/cert/without_ca/cert-key-pass.pem +0 -30
- data/test/plugin_helper/data/cert/without_ca/cert-key.pem +0 -27
- data/test/plugin_helper/data/cert/without_ca/cert-pass.pem +0 -20
- data/test/plugin_helper/data/cert/without_ca/cert.pem +0 -20
- data/test/plugin_helper/http_server/test_app.rb +0 -65
- data/test/plugin_helper/http_server/test_route.rb +0 -32
- data/test/plugin_helper/service_discovery/test_manager.rb +0 -93
- data/test/plugin_helper/service_discovery/test_round_robin_balancer.rb +0 -21
- data/test/plugin_helper/test_cert_option.rb +0 -25
- data/test/plugin_helper/test_child_process.rb +0 -862
- data/test/plugin_helper/test_compat_parameters.rb +0 -358
- data/test/plugin_helper/test_event_emitter.rb +0 -80
- data/test/plugin_helper/test_event_loop.rb +0 -52
- data/test/plugin_helper/test_extract.rb +0 -194
- data/test/plugin_helper/test_formatter.rb +0 -255
- data/test/plugin_helper/test_http_server_helper.rb +0 -372
- data/test/plugin_helper/test_inject.rb +0 -561
- data/test/plugin_helper/test_metrics.rb +0 -137
- data/test/plugin_helper/test_parser.rb +0 -264
- data/test/plugin_helper/test_record_accessor.rb +0 -238
- data/test/plugin_helper/test_retry_state.rb +0 -1006
- data/test/plugin_helper/test_server.rb +0 -1895
- data/test/plugin_helper/test_service_discovery.rb +0 -165
- data/test/plugin_helper/test_socket.rb +0 -146
- data/test/plugin_helper/test_storage.rb +0 -542
- data/test/plugin_helper/test_thread.rb +0 -164
- data/test/plugin_helper/test_timer.rb +0 -130
- data/test/scripts/exec_script.rb +0 -32
- data/test/scripts/fluent/plugin/formatter1/formatter_test1.rb +0 -7
- data/test/scripts/fluent/plugin/formatter2/formatter_test2.rb +0 -7
- data/test/scripts/fluent/plugin/formatter_known.rb +0 -8
- data/test/scripts/fluent/plugin/out_test.rb +0 -81
- data/test/scripts/fluent/plugin/out_test2.rb +0 -80
- data/test/scripts/fluent/plugin/parser_known.rb +0 -4
- data/test/test_capability.rb +0 -74
- data/test/test_clock.rb +0 -164
- data/test/test_config.rb +0 -369
- data/test/test_configdsl.rb +0 -148
- data/test/test_daemonizer.rb +0 -91
- data/test/test_engine.rb +0 -203
- data/test/test_event.rb +0 -531
- data/test/test_event_router.rb +0 -348
- data/test/test_event_time.rb +0 -199
- data/test/test_file_wrapper.rb +0 -53
- data/test/test_filter.rb +0 -121
- data/test/test_fluent_log_event_router.rb +0 -99
- data/test/test_formatter.rb +0 -369
- data/test/test_input.rb +0 -31
- data/test/test_log.rb +0 -1076
- data/test/test_match.rb +0 -148
- data/test/test_mixin.rb +0 -351
- data/test/test_msgpack_factory.rb +0 -50
- data/test/test_oj_options.rb +0 -55
- data/test/test_output.rb +0 -278
- data/test/test_plugin.rb +0 -251
- data/test/test_plugin_classes.rb +0 -370
- data/test/test_plugin_helper.rb +0 -81
- data/test/test_plugin_id.rb +0 -119
- data/test/test_process.rb +0 -14
- data/test/test_root_agent.rb +0 -951
- data/test/test_static_config_analysis.rb +0 -177
- data/test/test_supervisor.rb +0 -821
- data/test/test_test_drivers.rb +0 -136
- data/test/test_time_formatter.rb +0 -301
- data/test/test_time_parser.rb +0 -362
- data/test/test_tls.rb +0 -65
- data/test/test_unique_id.rb +0 -47
- data/test/test_variable_store.rb +0 -65
@@ -1,179 +0,0 @@
|
|
1
|
-
require_relative '../helper'
|
2
|
-
require 'fluent/counter/mutex_hash'
|
3
|
-
require 'fluent/counter/store'
|
4
|
-
require 'flexmock/test_unit'
|
5
|
-
require 'timecop'
|
6
|
-
|
7
|
-
class MutexHashTest < ::Test::Unit::TestCase
|
8
|
-
setup do
|
9
|
-
@store = {}
|
10
|
-
@value = 'sample value'
|
11
|
-
@counter_store_mutex = Fluent::Counter::MutexHash.new(@store)
|
12
|
-
end
|
13
|
-
|
14
|
-
sub_test_case 'synchronize' do
|
15
|
-
test "create new mutex values if keys don't exist" do
|
16
|
-
keys = ['key', 'key1']
|
17
|
-
|
18
|
-
@counter_store_mutex.synchronize(*keys) do |store, k|
|
19
|
-
store[k] = @value
|
20
|
-
end
|
21
|
-
|
22
|
-
mhash = @counter_store_mutex.instance_variable_get(:@mutex_hash)
|
23
|
-
keys.each do |key|
|
24
|
-
assert_true mhash[key].is_a?(Mutex)
|
25
|
-
assert_equal @value, @store[key]
|
26
|
-
end
|
27
|
-
end
|
28
|
-
|
29
|
-
test 'nothing to do when an empty array passed' do
|
30
|
-
@counter_store_mutex.synchronize(*[]) do |store, k|
|
31
|
-
store[k] = @value
|
32
|
-
end
|
33
|
-
|
34
|
-
mhash = @counter_store_mutex.instance_variable_get(:@mutex_hash)
|
35
|
-
assert_true mhash.empty?
|
36
|
-
assert_true @store.empty?
|
37
|
-
end
|
38
|
-
|
39
|
-
test 'use a one mutex value when the same key specified' do
|
40
|
-
key = 'key'
|
41
|
-
@counter_store_mutex.synchronize(key) do |store, k|
|
42
|
-
store[k] = @value
|
43
|
-
end
|
44
|
-
|
45
|
-
mhash = @counter_store_mutex.instance_variable_get(:@mutex_hash)
|
46
|
-
m = mhash[key]
|
47
|
-
assert_true m.is_a?(Mutex)
|
48
|
-
assert_equal @value, @store[key]
|
49
|
-
|
50
|
-
# access the same key once again
|
51
|
-
value2 = 'test value2'
|
52
|
-
@counter_store_mutex.synchronize(key) do |store, k|
|
53
|
-
store[k] = value2
|
54
|
-
end
|
55
|
-
|
56
|
-
mhash = @counter_store_mutex.instance_variable_get(:@mutex_hash)
|
57
|
-
m2 = mhash[key]
|
58
|
-
assert_true m2.is_a?(Mutex)
|
59
|
-
assert_equal value2, @store[key]
|
60
|
-
|
61
|
-
assert_equal m, m2
|
62
|
-
end
|
63
|
-
end
|
64
|
-
|
65
|
-
sub_test_case 'synchronize_key' do
|
66
|
-
test "create new mutex values if keys don't exist" do
|
67
|
-
keys = ['key', 'key1']
|
68
|
-
|
69
|
-
@counter_store_mutex.synchronize_keys(*keys) do |store, k|
|
70
|
-
store[k] = @value
|
71
|
-
end
|
72
|
-
|
73
|
-
mhash = @counter_store_mutex.instance_variable_get(:@mutex_hash)
|
74
|
-
keys.each do |key|
|
75
|
-
assert_true mhash[key].is_a?(Mutex)
|
76
|
-
assert_equal @value, @store[key]
|
77
|
-
end
|
78
|
-
end
|
79
|
-
|
80
|
-
test 'nothing to do when an empty array passed' do
|
81
|
-
@counter_store_mutex.synchronize_keys(*[]) do |store, k|
|
82
|
-
store[k] = @value
|
83
|
-
end
|
84
|
-
|
85
|
-
mhash = @counter_store_mutex.instance_variable_get(:@mutex_hash)
|
86
|
-
assert_true mhash.empty?
|
87
|
-
assert_true @store.empty?
|
88
|
-
end
|
89
|
-
|
90
|
-
test 'use a one mutex value when the same key specified' do
|
91
|
-
key = 'key'
|
92
|
-
@counter_store_mutex.synchronize_keys(key) do |store, k|
|
93
|
-
store[k] = @value
|
94
|
-
end
|
95
|
-
|
96
|
-
mhash = @counter_store_mutex.instance_variable_get(:@mutex_hash)
|
97
|
-
m = mhash[key]
|
98
|
-
assert_true m.is_a?(Mutex)
|
99
|
-
assert_equal @value, @store[key]
|
100
|
-
|
101
|
-
# access the same key once again
|
102
|
-
value2 = 'test value2'
|
103
|
-
@counter_store_mutex.synchronize_keys(key) do |store, k|
|
104
|
-
store[k] = value2
|
105
|
-
end
|
106
|
-
|
107
|
-
mhash = @counter_store_mutex.instance_variable_get(:@mutex_hash)
|
108
|
-
m2 = mhash[key]
|
109
|
-
assert_true m2.is_a?(Mutex)
|
110
|
-
assert_equal value2, @store[key]
|
111
|
-
|
112
|
-
assert_equal m, m2
|
113
|
-
end
|
114
|
-
end
|
115
|
-
end
|
116
|
-
|
117
|
-
class CleanupThreadTest < ::Test::Unit::TestCase
|
118
|
-
StoreValue = Struct.new(:last_modified_at)
|
119
|
-
|
120
|
-
setup do
|
121
|
-
# timecop isn't compatible with EventTime
|
122
|
-
t = Time.parse('2016-09-22 16:59:59 +0900')
|
123
|
-
Timecop.freeze(t)
|
124
|
-
|
125
|
-
@store = Fluent::Counter::Store.new
|
126
|
-
@mhash = Fluent::Counter::MutexHash.new(@store)
|
127
|
-
|
128
|
-
# stub sleep method to avoid waiting CLEANUP_INTERVAL
|
129
|
-
ct = @mhash.instance_variable_get(:@cleanup_thread)
|
130
|
-
flexstub(ct).should_receive(:sleep)
|
131
|
-
end
|
132
|
-
|
133
|
-
teardown do
|
134
|
-
@mhash.stop
|
135
|
-
Timecop.return
|
136
|
-
end
|
137
|
-
|
138
|
-
test 'clean up unused mutex' do
|
139
|
-
name = 'key1'
|
140
|
-
init_obj = { 'name' => name, 'reset_interval' => 2 }
|
141
|
-
|
142
|
-
@mhash.synchronize(init_obj['name']) do
|
143
|
-
@store.init(name, init_obj)
|
144
|
-
end
|
145
|
-
|
146
|
-
ct = @mhash.instance_variable_get(:@mutex_hash)
|
147
|
-
assert ct[name]
|
148
|
-
|
149
|
-
Timecop.travel(15 * 60 + 1) # 15 min
|
150
|
-
|
151
|
-
@mhash.start # start cleanup
|
152
|
-
sleep 1
|
153
|
-
|
154
|
-
ct = @mhash.instance_variable_get(:@mutex_hash)
|
155
|
-
assert_empty ct
|
156
|
-
|
157
|
-
@mhash.stop
|
158
|
-
end
|
159
|
-
|
160
|
-
test "don't remove when `last_modified_at` is greater than (Time.now - CLEANUP_INTERVAL)" do
|
161
|
-
name = 'key1'
|
162
|
-
init_obj = { 'name' => name, 'reset_interval' => 2 }
|
163
|
-
|
164
|
-
@mhash.synchronize(init_obj['name']) do
|
165
|
-
@store.init(name, init_obj)
|
166
|
-
end
|
167
|
-
|
168
|
-
ct = @mhash.instance_variable_get(:@mutex_hash)
|
169
|
-
assert ct[name]
|
170
|
-
|
171
|
-
@mhash.start # start cleanup
|
172
|
-
sleep 1
|
173
|
-
|
174
|
-
ct = @mhash.instance_variable_get(:@mutex_hash)
|
175
|
-
assert ct[name]
|
176
|
-
|
177
|
-
@mhash.stop
|
178
|
-
end
|
179
|
-
end
|