fluentd 1.13.3 → 1.16.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.github/ISSUE_TEMPLATE/{bug_report.yaml → bug_report.yml} +2 -0
- data/.github/ISSUE_TEMPLATE/config.yml +2 -2
- data/.github/ISSUE_TEMPLATE/{feature_request.yaml → feature_request.yml} +1 -0
- data/.github/workflows/stale-actions.yml +11 -9
- data/.github/workflows/test.yml +32 -0
- data/CHANGELOG.md +490 -10
- data/CONTRIBUTING.md +2 -2
- data/MAINTAINERS.md +7 -5
- data/README.md +3 -23
- data/Rakefile +1 -1
- data/SECURITY.md +14 -0
- data/fluentd.gemspec +7 -8
- data/lib/fluent/command/cat.rb +13 -3
- data/lib/fluent/command/ctl.rb +6 -3
- data/lib/fluent/command/fluentd.rb +73 -65
- data/lib/fluent/command/plugin_config_formatter.rb +1 -1
- data/lib/fluent/compat/output.rb +9 -6
- data/lib/fluent/config/dsl.rb +1 -1
- data/lib/fluent/config/error.rb +12 -0
- data/lib/fluent/config/literal_parser.rb +2 -2
- data/lib/fluent/config/parser.rb +1 -1
- data/lib/fluent/config/v1_parser.rb +3 -3
- data/lib/fluent/config/yaml_parser/fluent_value.rb +47 -0
- data/lib/fluent/config/yaml_parser/loader.rb +108 -0
- data/lib/fluent/config/yaml_parser/parser.rb +166 -0
- data/lib/fluent/config/yaml_parser/section_builder.rb +107 -0
- data/lib/fluent/config/yaml_parser.rb +56 -0
- data/lib/fluent/config.rb +14 -1
- data/lib/fluent/counter/server.rb +1 -1
- data/lib/fluent/counter/validator.rb +3 -3
- data/lib/fluent/daemon.rb +2 -4
- data/lib/fluent/engine.rb +1 -1
- data/lib/fluent/env.rb +4 -0
- data/lib/fluent/error.rb +3 -0
- data/lib/fluent/event.rb +8 -4
- data/lib/fluent/event_router.rb +47 -2
- data/lib/fluent/file_wrapper.rb +137 -0
- data/lib/fluent/log/console_adapter.rb +66 -0
- data/lib/fluent/log.rb +44 -5
- data/lib/fluent/match.rb +1 -1
- data/lib/fluent/msgpack_factory.rb +6 -1
- data/lib/fluent/oj_options.rb +1 -2
- data/lib/fluent/plugin/bare_output.rb +49 -8
- data/lib/fluent/plugin/base.rb +26 -9
- data/lib/fluent/plugin/buf_file.rb +34 -5
- data/lib/fluent/plugin/buf_file_single.rb +32 -3
- data/lib/fluent/plugin/buffer/file_chunk.rb +1 -1
- data/lib/fluent/plugin/buffer.rb +216 -70
- data/lib/fluent/plugin/filter.rb +35 -1
- data/lib/fluent/plugin/filter_record_transformer.rb +1 -1
- data/lib/fluent/plugin/in_forward.rb +2 -2
- data/lib/fluent/plugin/in_http.rb +39 -10
- data/lib/fluent/plugin/in_monitor_agent.rb +4 -2
- data/lib/fluent/plugin/in_sample.rb +1 -1
- data/lib/fluent/plugin/in_syslog.rb +13 -1
- data/lib/fluent/plugin/in_tail/group_watch.rb +204 -0
- data/lib/fluent/plugin/in_tail/position_file.rb +33 -33
- data/lib/fluent/plugin/in_tail.rb +216 -84
- data/lib/fluent/plugin/in_tcp.rb +47 -2
- data/lib/fluent/plugin/input.rb +39 -1
- data/lib/fluent/plugin/metrics.rb +119 -0
- data/lib/fluent/plugin/metrics_local.rb +96 -0
- data/lib/fluent/plugin/multi_output.rb +43 -6
- data/lib/fluent/plugin/out_copy.rb +1 -1
- data/lib/fluent/plugin/out_exec_filter.rb +2 -2
- data/lib/fluent/plugin/out_file.rb +20 -2
- data/lib/fluent/plugin/out_forward/ack_handler.rb +19 -4
- data/lib/fluent/plugin/out_forward/socket_cache.rb +2 -0
- data/lib/fluent/plugin/out_forward.rb +17 -9
- data/lib/fluent/plugin/out_secondary_file.rb +39 -22
- data/lib/fluent/plugin/output.rb +167 -78
- data/lib/fluent/plugin/parser.rb +3 -4
- data/lib/fluent/plugin/parser_apache2.rb +1 -1
- data/lib/fluent/plugin/parser_json.rb +1 -1
- data/lib/fluent/plugin/parser_syslog.rb +1 -1
- data/lib/fluent/plugin/storage_local.rb +3 -5
- data/lib/fluent/plugin.rb +10 -1
- data/lib/fluent/plugin_helper/child_process.rb +3 -0
- data/lib/fluent/plugin_helper/event_emitter.rb +8 -1
- data/lib/fluent/plugin_helper/event_loop.rb +2 -2
- data/lib/fluent/plugin_helper/http_server/server.rb +2 -1
- data/lib/fluent/plugin_helper/metrics.rb +129 -0
- data/lib/fluent/plugin_helper/record_accessor.rb +1 -1
- data/lib/fluent/plugin_helper/retry_state.rb +14 -4
- data/lib/fluent/plugin_helper/server.rb +35 -6
- data/lib/fluent/plugin_helper/service_discovery.rb +2 -2
- data/lib/fluent/plugin_helper/socket.rb +13 -2
- data/lib/fluent/plugin_helper/thread.rb +3 -3
- data/lib/fluent/plugin_helper.rb +1 -0
- data/lib/fluent/plugin_id.rb +3 -2
- data/lib/fluent/registry.rb +2 -1
- data/lib/fluent/root_agent.rb +6 -0
- data/lib/fluent/rpc.rb +4 -3
- data/lib/fluent/supervisor.rb +283 -259
- data/lib/fluent/system_config.rb +13 -3
- data/lib/fluent/test/driver/base.rb +11 -5
- data/lib/fluent/test/driver/filter.rb +4 -0
- data/lib/fluent/test/startup_shutdown.rb +6 -8
- data/lib/fluent/time.rb +21 -20
- data/lib/fluent/version.rb +1 -1
- data/lib/fluent/win32api.rb +38 -0
- data/lib/fluent/winsvc.rb +5 -8
- data/templates/new_gem/test/helper.rb.erb +0 -1
- data/test/command/test_cat.rb +31 -2
- data/test/command/test_ctl.rb +1 -2
- data/test/command/test_fluentd.rb +209 -24
- data/test/command/test_plugin_config_formatter.rb +0 -1
- data/test/compat/test_parser.rb +6 -6
- data/test/config/test_system_config.rb +13 -11
- data/test/config/test_types.rb +1 -1
- data/test/log/test_console_adapter.rb +110 -0
- data/test/plugin/in_tail/test_io_handler.rb +26 -8
- data/test/plugin/in_tail/test_position_file.rb +48 -59
- data/test/plugin/out_forward/test_ack_handler.rb +39 -0
- data/test/plugin/out_forward/test_socket_cache.rb +26 -1
- data/test/plugin/test_bare_output.rb +14 -1
- data/test/plugin/test_base.rb +133 -1
- data/test/plugin/test_buf_file.rb +62 -23
- data/test/plugin/test_buf_file_single.rb +65 -0
- data/test/plugin/test_buffer.rb +267 -3
- data/test/plugin/test_buffer_chunk.rb +11 -0
- data/test/plugin/test_filter.rb +12 -1
- data/test/plugin/test_filter_parser.rb +1 -1
- data/test/plugin/test_filter_stdout.rb +2 -2
- data/test/plugin/test_in_forward.rb +9 -11
- data/test/plugin/test_in_http.rb +65 -3
- data/test/plugin/test_in_monitor_agent.rb +216 -11
- data/test/plugin/test_in_object_space.rb +9 -3
- data/test/plugin/test_in_syslog.rb +35 -0
- data/test/plugin/test_in_tail.rb +1393 -385
- data/test/plugin/test_in_tcp.rb +87 -2
- data/test/plugin/test_in_udp.rb +28 -0
- data/test/plugin/test_in_unix.rb +2 -2
- data/test/plugin/test_input.rb +12 -1
- data/test/plugin/test_metrics.rb +294 -0
- data/test/plugin/test_metrics_local.rb +96 -0
- data/test/plugin/test_multi_output.rb +25 -1
- data/test/plugin/test_out_exec.rb +6 -4
- data/test/plugin/test_out_exec_filter.rb +6 -2
- data/test/plugin/test_out_file.rb +34 -17
- data/test/plugin/test_out_forward.rb +78 -77
- data/test/plugin/test_out_http.rb +1 -0
- data/test/plugin/test_out_stdout.rb +2 -2
- data/test/plugin/test_output.rb +297 -12
- data/test/plugin/test_output_as_buffered.rb +44 -44
- data/test/plugin/test_output_as_buffered_compress.rb +32 -18
- data/test/plugin/test_output_as_buffered_retries.rb +54 -7
- data/test/plugin/test_output_as_buffered_secondary.rb +4 -4
- data/test/plugin/test_parser_regexp.rb +1 -6
- data/test/plugin/test_parser_syslog.rb +1 -1
- data/test/plugin_helper/test_cert_option.rb +1 -1
- data/test/plugin_helper/test_child_process.rb +38 -16
- data/test/plugin_helper/test_event_emitter.rb +29 -0
- data/test/plugin_helper/test_http_server_helper.rb +1 -1
- data/test/plugin_helper/test_metrics.rb +137 -0
- data/test/plugin_helper/test_retry_state.rb +602 -38
- data/test/plugin_helper/test_server.rb +78 -6
- data/test/plugin_helper/test_timer.rb +2 -2
- data/test/test_config.rb +191 -24
- data/test/test_event_router.rb +17 -0
- data/test/test_file_wrapper.rb +53 -0
- data/test/test_formatter.rb +24 -21
- data/test/test_log.rb +122 -40
- data/test/test_msgpack_factory.rb +32 -0
- data/test/test_plugin_classes.rb +102 -0
- data/test/test_root_agent.rb +30 -1
- data/test/test_supervisor.rb +477 -257
- data/test/test_time_parser.rb +22 -0
- metadata +55 -34
- data/.drone.yml +0 -35
- data/.github/workflows/issue-auto-closer.yml +0 -12
- data/.github/workflows/linux-test.yaml +0 -36
- data/.github/workflows/macos-test.yaml +0 -30
- data/.github/workflows/windows-test.yaml +0 -46
- data/.gitlab-ci.yml +0 -103
- data/lib/fluent/plugin/file_wrapper.rb +0 -187
- data/test/plugin/test_file_wrapper.rb +0 -126
- data/test/test_logger_initializer.rb +0 -46
|
@@ -37,6 +37,194 @@ class MonitorAgentInputTest < Test::Unit::TestCase
|
|
|
37
37
|
assert_true d.instance.include_config
|
|
38
38
|
end
|
|
39
39
|
|
|
40
|
+
sub_test_case "collect in_monitor_agent plugin statistics" do
|
|
41
|
+
# Input Test Driver does not register metric callbacks.
|
|
42
|
+
# We should stub them here.
|
|
43
|
+
class TestEventMetricRouter < Fluent::Test::Driver::TestEventRouter
|
|
44
|
+
def initialize(driver)
|
|
45
|
+
super
|
|
46
|
+
|
|
47
|
+
raise ArgumentError, "plugin does not respond metric_callback method" unless @driver.instance.respond_to?(:metric_callback)
|
|
48
|
+
end
|
|
49
|
+
|
|
50
|
+
def emit(tag, time, record)
|
|
51
|
+
super
|
|
52
|
+
@driver.instance.metric_callback(OneEventStream.new(time, record))
|
|
53
|
+
end
|
|
54
|
+
|
|
55
|
+
def emit_array(tag, array)
|
|
56
|
+
super
|
|
57
|
+
@driver.instance.metric_callback(ArrayEventStream.new(array))
|
|
58
|
+
end
|
|
59
|
+
|
|
60
|
+
def emit_stream(tag, es)
|
|
61
|
+
super
|
|
62
|
+
@driver.instance.metric_callback(es)
|
|
63
|
+
end
|
|
64
|
+
end
|
|
65
|
+
|
|
66
|
+
class MetricInputDriver < Fluent::Test::Driver::Input
|
|
67
|
+
def configure(conf, syntax: :v1)
|
|
68
|
+
if conf.is_a?(Fluent::Config::Element)
|
|
69
|
+
@config = conf
|
|
70
|
+
else
|
|
71
|
+
@config = Fluent::Config.parse(conf, "(test)", "(test_dir)", syntax: syntax)
|
|
72
|
+
end
|
|
73
|
+
|
|
74
|
+
if @instance.respond_to?(:router=)
|
|
75
|
+
@event_streams = []
|
|
76
|
+
@error_events = []
|
|
77
|
+
|
|
78
|
+
driver = self
|
|
79
|
+
mojule = Module.new do
|
|
80
|
+
define_method(:event_emitter_router) do |label_name|
|
|
81
|
+
TestEventMetricRouter.new(driver)
|
|
82
|
+
end
|
|
83
|
+
end
|
|
84
|
+
@instance.singleton_class.prepend mojule
|
|
85
|
+
end
|
|
86
|
+
|
|
87
|
+
@instance.configure(@config)
|
|
88
|
+
self
|
|
89
|
+
end
|
|
90
|
+
end
|
|
91
|
+
|
|
92
|
+
setup do
|
|
93
|
+
# check @type and type in one configuration
|
|
94
|
+
conf = <<-EOC
|
|
95
|
+
<source>
|
|
96
|
+
@type test_in_gen
|
|
97
|
+
@id test_in_gen
|
|
98
|
+
num 10
|
|
99
|
+
</source>
|
|
100
|
+
<filter>
|
|
101
|
+
@type test_filter
|
|
102
|
+
@id test_filter
|
|
103
|
+
</filter>
|
|
104
|
+
<match **>
|
|
105
|
+
@type relabel
|
|
106
|
+
@id test_relabel
|
|
107
|
+
@label @test
|
|
108
|
+
</match>
|
|
109
|
+
<label @test>
|
|
110
|
+
<match **>
|
|
111
|
+
@type test_out
|
|
112
|
+
@id test_out
|
|
113
|
+
</match>
|
|
114
|
+
</label>
|
|
115
|
+
<label @copy>
|
|
116
|
+
<match **>
|
|
117
|
+
@type copy
|
|
118
|
+
<store>
|
|
119
|
+
@type test_out
|
|
120
|
+
@id copy_out_1
|
|
121
|
+
</store>
|
|
122
|
+
<store>
|
|
123
|
+
@type test_out
|
|
124
|
+
@id copy_out_2
|
|
125
|
+
</store>
|
|
126
|
+
</match>
|
|
127
|
+
</label>
|
|
128
|
+
<label @ERROR>
|
|
129
|
+
<match>
|
|
130
|
+
@type null
|
|
131
|
+
@id null
|
|
132
|
+
</match>
|
|
133
|
+
</label>
|
|
134
|
+
EOC
|
|
135
|
+
@ra = Fluent::RootAgent.new(log: $log)
|
|
136
|
+
stub(Fluent::Engine).root_agent { @ra }
|
|
137
|
+
@ra = configure_ra(@ra, conf)
|
|
138
|
+
end
|
|
139
|
+
|
|
140
|
+
data(:with_config_yes => true,
|
|
141
|
+
:with_config_no => false)
|
|
142
|
+
def test_enable_input_metrics(with_config)
|
|
143
|
+
monitor_agent_conf = <<-CONF
|
|
144
|
+
tag test.monitor
|
|
145
|
+
emit_interval 1
|
|
146
|
+
CONF
|
|
147
|
+
@ra.inputs.first.context_router.emit("test.event", Fluent::Engine.now, {"message":"ok"})
|
|
148
|
+
d = MetricInputDriver.new(Fluent::Plugin::MonitorAgentInput).configure(monitor_agent_conf)
|
|
149
|
+
d.run(expect_emits: 1, timeout: 3)
|
|
150
|
+
|
|
151
|
+
test_label = @ra.labels['@test']
|
|
152
|
+
error_label = @ra.labels['@ERROR']
|
|
153
|
+
input_info = {
|
|
154
|
+
"output_plugin" => false,
|
|
155
|
+
"plugin_category"=> "input",
|
|
156
|
+
"plugin_id" => "test_in_gen",
|
|
157
|
+
"retry_count" => nil,
|
|
158
|
+
"type" => "test_in_gen",
|
|
159
|
+
"emit_records" => 0, # This field is not updated due to not to be assigned metric callback.
|
|
160
|
+
"emit_size" => 0, # Ditto.
|
|
161
|
+
}
|
|
162
|
+
input_info.merge!("config" => {"@id" => "test_in_gen", "@type" => "test_in_gen", "num" => "10"}) if with_config
|
|
163
|
+
filter_info = {
|
|
164
|
+
"output_plugin" => false,
|
|
165
|
+
"plugin_category" => "filter",
|
|
166
|
+
"plugin_id" => "test_filter",
|
|
167
|
+
"retry_count" => nil,
|
|
168
|
+
"type" => "test_filter",
|
|
169
|
+
"emit_records" => Integer,
|
|
170
|
+
"emit_size" => Integer,
|
|
171
|
+
}
|
|
172
|
+
filter_info.merge!("config" => {"@id" => "test_filter", "@type" => "test_filter"}) if with_config
|
|
173
|
+
output_info = {
|
|
174
|
+
"output_plugin" => true,
|
|
175
|
+
"plugin_category" => "output",
|
|
176
|
+
"plugin_id" => "test_out",
|
|
177
|
+
"retry_count" => 0,
|
|
178
|
+
"type" => "test_out",
|
|
179
|
+
"emit_count" => Integer,
|
|
180
|
+
"emit_records" => Integer,
|
|
181
|
+
"emit_size" => Integer,
|
|
182
|
+
"write_count" => Integer,
|
|
183
|
+
"rollback_count" => Integer,
|
|
184
|
+
"slow_flush_count" => Integer,
|
|
185
|
+
"flush_time_count" => Integer,
|
|
186
|
+
}
|
|
187
|
+
output_info.merge!("config" => {"@id" => "test_out", "@type" => "test_out"}) if with_config
|
|
188
|
+
error_label_info = {
|
|
189
|
+
"buffer_queue_length" => 0,
|
|
190
|
+
"buffer_timekeys" => [],
|
|
191
|
+
"buffer_total_queued_size" => 0,
|
|
192
|
+
"output_plugin" => true,
|
|
193
|
+
"plugin_category" => "output",
|
|
194
|
+
"plugin_id" => "null",
|
|
195
|
+
"retry_count" => 0,
|
|
196
|
+
"type" => "null",
|
|
197
|
+
"buffer_available_buffer_space_ratios" => Float,
|
|
198
|
+
"buffer_queue_byte_size" => Integer,
|
|
199
|
+
"buffer_stage_byte_size" => Integer,
|
|
200
|
+
"buffer_stage_length" => Integer,
|
|
201
|
+
"emit_count" => Integer,
|
|
202
|
+
"emit_records" => Integer,
|
|
203
|
+
"emit_size" => Integer,
|
|
204
|
+
"write_count" => Integer,
|
|
205
|
+
"rollback_count" => Integer,
|
|
206
|
+
"slow_flush_count" => Integer,
|
|
207
|
+
"flush_time_count" => Integer,
|
|
208
|
+
}
|
|
209
|
+
error_label_info.merge!("config" => {"@id"=>"null", "@type" => "null"}) if with_config
|
|
210
|
+
opts = {with_config: with_config}
|
|
211
|
+
assert_equal(input_info, d.instance.get_monitor_info(@ra.inputs.first, opts))
|
|
212
|
+
assert_fuzzy_equal(filter_info, d.instance.get_monitor_info(@ra.filters.first, opts))
|
|
213
|
+
assert_fuzzy_equal(output_info, d.instance.get_monitor_info(test_label.outputs.first, opts))
|
|
214
|
+
assert_fuzzy_equal(error_label_info, d.instance.get_monitor_info(error_label.outputs.first, opts))
|
|
215
|
+
monitor_agent_emit_info = {
|
|
216
|
+
"emit_records" => Integer,
|
|
217
|
+
"emit_size" => Integer,
|
|
218
|
+
}
|
|
219
|
+
filter_statistics_info = {
|
|
220
|
+
"emit_records" => Integer,
|
|
221
|
+
"emit_size" => Integer,
|
|
222
|
+
}
|
|
223
|
+
assert_fuzzy_equal(monitor_agent_emit_info, d.instance.statistics["input"])
|
|
224
|
+
assert_fuzzy_equal(filter_statistics_info, @ra.filters.first.statistics["filter"])
|
|
225
|
+
end
|
|
226
|
+
end
|
|
227
|
+
|
|
40
228
|
sub_test_case "collect plugin information" do
|
|
41
229
|
setup do
|
|
42
230
|
# check @type and type in one configuration
|
|
@@ -106,7 +294,9 @@ EOC
|
|
|
106
294
|
"plugin_category"=> "input",
|
|
107
295
|
"plugin_id" => "test_in",
|
|
108
296
|
"retry_count" => nil,
|
|
109
|
-
"type" => "test_in"
|
|
297
|
+
"type" => "test_in",
|
|
298
|
+
"emit_records" => 0,
|
|
299
|
+
"emit_size" => 0,
|
|
110
300
|
}
|
|
111
301
|
input_info.merge!("config" => {"@id" => "test_in", "@type" => "test_in"}) if with_config
|
|
112
302
|
filter_info = {
|
|
@@ -114,7 +304,9 @@ EOC
|
|
|
114
304
|
"plugin_category" => "filter",
|
|
115
305
|
"plugin_id" => "test_filter",
|
|
116
306
|
"retry_count" => nil,
|
|
117
|
-
"type" => "test_filter"
|
|
307
|
+
"type" => "test_filter",
|
|
308
|
+
"emit_records" => 0,
|
|
309
|
+
"emit_size" => 0,
|
|
118
310
|
}
|
|
119
311
|
filter_info.merge!("config" => {"@id" => "test_filter", "@type" => "test_filter"}) if with_config
|
|
120
312
|
output_info = {
|
|
@@ -125,6 +317,7 @@ EOC
|
|
|
125
317
|
"type" => "test_out",
|
|
126
318
|
"emit_count" => Integer,
|
|
127
319
|
"emit_records" => Integer,
|
|
320
|
+
"emit_size" => Integer,
|
|
128
321
|
"write_count" => Integer,
|
|
129
322
|
"rollback_count" => Integer,
|
|
130
323
|
"slow_flush_count" => Integer,
|
|
@@ -146,6 +339,7 @@ EOC
|
|
|
146
339
|
"buffer_stage_length" => Integer,
|
|
147
340
|
"emit_count" => Integer,
|
|
148
341
|
"emit_records" => Integer,
|
|
342
|
+
"emit_size" => Integer,
|
|
149
343
|
"write_count" => Integer,
|
|
150
344
|
"rollback_count" => Integer,
|
|
151
345
|
"slow_flush_count" => Integer,
|
|
@@ -161,14 +355,13 @@ EOC
|
|
|
161
355
|
|
|
162
356
|
test "fluentd opts" do
|
|
163
357
|
d = create_driver
|
|
164
|
-
opts = Fluent::Supervisor.default_options
|
|
165
358
|
|
|
166
359
|
filepath = nil
|
|
167
360
|
begin
|
|
168
361
|
FileUtils.mkdir_p(CONFIG_DIR)
|
|
169
362
|
filepath = File.expand_path('fluentd.conf', CONFIG_DIR)
|
|
170
363
|
FileUtils.touch(filepath)
|
|
171
|
-
s = Fluent::Supervisor.new(
|
|
364
|
+
s = Fluent::Supervisor.new({config_path: filepath})
|
|
172
365
|
s.configure
|
|
173
366
|
ensure
|
|
174
367
|
FileUtils.rm_r(CONFIG_DIR) rescue _
|
|
@@ -220,6 +413,7 @@ EOC
|
|
|
220
413
|
"retry_count" => 0,
|
|
221
414
|
"emit_count" => Integer,
|
|
222
415
|
"emit_records" => Integer,
|
|
416
|
+
"emit_size" => Integer,
|
|
223
417
|
"write_count" => Integer,
|
|
224
418
|
"rollback_count" => Integer,
|
|
225
419
|
"slow_flush_count" => Integer,
|
|
@@ -233,6 +427,7 @@ EOC
|
|
|
233
427
|
"retry_count" => 0,
|
|
234
428
|
"emit_count" => Integer,
|
|
235
429
|
"emit_records" => Integer,
|
|
430
|
+
"emit_size" => Integer,
|
|
236
431
|
"write_count" => Integer,
|
|
237
432
|
"rollback_count" => Integer,
|
|
238
433
|
"slow_flush_count" => Integer,
|
|
@@ -306,7 +501,7 @@ EOC
|
|
|
306
501
|
v.puts(conf)
|
|
307
502
|
end
|
|
308
503
|
|
|
309
|
-
@supervisor = Fluent::Supervisor.new(
|
|
504
|
+
@supervisor = Fluent::Supervisor.new({config_path: @filepath})
|
|
310
505
|
@supervisor.configure
|
|
311
506
|
ensure
|
|
312
507
|
FileUtils.rm_r(CONFIG_DIR) rescue _
|
|
@@ -322,9 +517,9 @@ EOC
|
|
|
322
517
|
")
|
|
323
518
|
d.instance.start
|
|
324
519
|
expected_test_in_response = "\
|
|
325
|
-
plugin_id:test_in\tplugin_category:input\ttype:test_in\toutput_plugin:false\tretry_count:"
|
|
520
|
+
plugin_id:test_in\tplugin_category:input\ttype:test_in\toutput_plugin:false\tretry_count:\temit_records:0\temit_size:0"
|
|
326
521
|
expected_test_filter_response = "\
|
|
327
|
-
plugin_id:test_filter\tplugin_category:filter\ttype:test_filter\toutput_plugin:false\tretry_count:"
|
|
522
|
+
plugin_id:test_filter\tplugin_category:filter\ttype:test_filter\toutput_plugin:false\tretry_count:\temit_records:0\temit_size:0"
|
|
328
523
|
|
|
329
524
|
response = get("http://127.0.0.1:#{@port}/api/plugins").body
|
|
330
525
|
test_in = response.split("\n")[0]
|
|
@@ -350,7 +545,9 @@ plugin_id:test_filter\tplugin_category:filter\ttype:test_filter\toutput_plugin:f
|
|
|
350
545
|
"plugin_category" => "input",
|
|
351
546
|
"plugin_id" => "test_in",
|
|
352
547
|
"retry_count" => nil,
|
|
353
|
-
"type" => "test_in"
|
|
548
|
+
"type" => "test_in",
|
|
549
|
+
"emit_records" => 0,
|
|
550
|
+
"emit_size" => 0,
|
|
354
551
|
}
|
|
355
552
|
expected_test_in_response.merge!("config" => {"@id" => "test_in", "@type" => "test_in"}) if with_config
|
|
356
553
|
expected_null_response = {
|
|
@@ -368,6 +565,7 @@ plugin_id:test_filter\tplugin_category:filter\ttype:test_filter\toutput_plugin:f
|
|
|
368
565
|
"buffer_stage_length" => Integer,
|
|
369
566
|
"emit_count" => Integer,
|
|
370
567
|
"emit_records" => Integer,
|
|
568
|
+
"emit_size" => Integer,
|
|
371
569
|
"write_count" => Integer,
|
|
372
570
|
"rollback_count" => Integer,
|
|
373
571
|
"slow_flush_count" => Integer,
|
|
@@ -412,7 +610,9 @@ plugin_id:test_filter\tplugin_category:filter\ttype:test_filter\toutput_plugin:f
|
|
|
412
610
|
"plugin_category" => "input",
|
|
413
611
|
"plugin_id" => "test_in",
|
|
414
612
|
"retry_count" => nil,
|
|
415
|
-
"type" => "test_in"
|
|
613
|
+
"type" => "test_in",
|
|
614
|
+
"emit_records" => 0,
|
|
615
|
+
"emit_size" => 0,
|
|
416
616
|
}
|
|
417
617
|
expected_test_in_response.merge!("config" => {"@id" => "test_in", "@type" => "test_in"}) if with_config
|
|
418
618
|
expected_null_response = {
|
|
@@ -430,6 +630,7 @@ plugin_id:test_filter\tplugin_category:filter\ttype:test_filter\toutput_plugin:f
|
|
|
430
630
|
"buffer_stage_length" => Integer,
|
|
431
631
|
"emit_count" => Integer,
|
|
432
632
|
"emit_records" => Integer,
|
|
633
|
+
"emit_size" => Integer,
|
|
433
634
|
"write_count" => Integer,
|
|
434
635
|
"rollback_count" => Integer,
|
|
435
636
|
"slow_flush_count" => Integer,
|
|
@@ -458,7 +659,9 @@ plugin_id:test_filter\tplugin_category:filter\ttype:test_filter\toutput_plugin:f
|
|
|
458
659
|
"plugin_id" => "test_in",
|
|
459
660
|
"retry_count" => nil,
|
|
460
661
|
"type" => "test_in",
|
|
461
|
-
"instance_variables" => {"id" => "test_in"}
|
|
662
|
+
"instance_variables" => {"id" => "test_in"},
|
|
663
|
+
"emit_records" => 0,
|
|
664
|
+
"emit_size" => 0,
|
|
462
665
|
}
|
|
463
666
|
expected_null_response = {
|
|
464
667
|
"buffer_queue_length" => 0,
|
|
@@ -469,13 +672,14 @@ plugin_id:test_filter\tplugin_category:filter\ttype:test_filter\toutput_plugin:f
|
|
|
469
672
|
"plugin_id" => "null",
|
|
470
673
|
"retry_count" => 0,
|
|
471
674
|
"type" => "null",
|
|
472
|
-
"instance_variables" => {"id" => "null"
|
|
675
|
+
"instance_variables" => {"id" => "null"},
|
|
473
676
|
"buffer_available_buffer_space_ratios" => Float,
|
|
474
677
|
"buffer_queue_byte_size" => Integer,
|
|
475
678
|
"buffer_stage_byte_size" => Integer,
|
|
476
679
|
"buffer_stage_length" => Integer,
|
|
477
680
|
"emit_count" => Integer,
|
|
478
681
|
"emit_records" => Integer,
|
|
682
|
+
"emit_size" => Integer,
|
|
479
683
|
"write_count" => Integer,
|
|
480
684
|
"rollback_count" => Integer,
|
|
481
685
|
"slow_flush_count" => Integer,
|
|
@@ -606,6 +810,7 @@ plugin_id:test_filter\tplugin_category:filter\ttype:test_filter\toutput_plugin:f
|
|
|
606
810
|
"buffer_stage_length" => Integer,
|
|
607
811
|
"emit_count" => Integer,
|
|
608
812
|
"emit_records" => Integer,
|
|
813
|
+
"emit_size" => Integer,
|
|
609
814
|
"write_count" => Integer,
|
|
610
815
|
"rollback_count" => Integer,
|
|
611
816
|
'slow_flush_count' => Integer,
|
|
@@ -17,13 +17,19 @@ class ObjectSpaceInputTest < Test::Unit::TestCase
|
|
|
17
17
|
end
|
|
18
18
|
|
|
19
19
|
class FailObject
|
|
20
|
-
def self.class
|
|
21
|
-
raise "error"
|
|
22
|
-
end
|
|
23
20
|
end
|
|
24
21
|
|
|
25
22
|
def setup
|
|
26
23
|
Fluent::Test.setup
|
|
24
|
+
# Overriding this behavior in the global scope will have an unexpected influence on other tests.
|
|
25
|
+
# So this should be overridden here and be removed in `teardown`.
|
|
26
|
+
def FailObject.class
|
|
27
|
+
raise "FailObject error for tests in ObjectSpaceInputTest."
|
|
28
|
+
end
|
|
29
|
+
end
|
|
30
|
+
|
|
31
|
+
def teardown
|
|
32
|
+
FailObject.singleton_class.remove_method(:class)
|
|
27
33
|
end
|
|
28
34
|
|
|
29
35
|
TESTCONFIG = %[
|
|
@@ -467,4 +467,39 @@ EOS
|
|
|
467
467
|
assert_equal tests.size, d.events.size
|
|
468
468
|
compare_unmatched_lines_test_result(d.events, tests, {address: address})
|
|
469
469
|
end
|
|
470
|
+
|
|
471
|
+
def test_send_keepalive_packet_is_disabled_by_default
|
|
472
|
+
d = create_driver(ipv4_config + %[
|
|
473
|
+
<transport tcp>
|
|
474
|
+
</transport>
|
|
475
|
+
protocol tcp
|
|
476
|
+
])
|
|
477
|
+
assert_false d.instance.send_keepalive_packet
|
|
478
|
+
end
|
|
479
|
+
|
|
480
|
+
def test_send_keepalive_packet_can_be_enabled
|
|
481
|
+
addr = "127.0.0.1"
|
|
482
|
+
d = create_driver(ipv4_config + %[
|
|
483
|
+
<transport tcp>
|
|
484
|
+
</transport>
|
|
485
|
+
send_keepalive_packet true
|
|
486
|
+
])
|
|
487
|
+
assert_true d.instance.send_keepalive_packet
|
|
488
|
+
mock.proxy(d.instance).server_create_connection(
|
|
489
|
+
:in_syslog_tcp_server, @port,
|
|
490
|
+
bind: addr,
|
|
491
|
+
resolve_name: nil,
|
|
492
|
+
send_keepalive_packet: true)
|
|
493
|
+
d.run do
|
|
494
|
+
TCPSocket.open(addr, @port)
|
|
495
|
+
end
|
|
496
|
+
end
|
|
497
|
+
|
|
498
|
+
def test_send_keepalive_packet_can_not_be_enabled_for_udp
|
|
499
|
+
assert_raise(Fluent::ConfigError) do
|
|
500
|
+
create_driver(ipv4_config + %[
|
|
501
|
+
send_keepalive_packet true
|
|
502
|
+
])
|
|
503
|
+
end
|
|
504
|
+
end
|
|
470
505
|
end
|