Skip to content

Commit 83759af

Browse files
Watson1978Watson1978
committed
output: rename metrics
Signed-off-by: Shizuo Fujita <[email protected]>
1 parent c18bedd commit 83759af

File tree

4 files changed

+19
-22
lines changed

4 files changed

+19
-22
lines changed

‎lib/fluent/plugin/output.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -210,10 +210,10 @@ def initialize
210210
@emit_records_metrics = nil
211211
@emit_size_metrics = nil
212212
@write_count_metrics = nil
213+
@write_secondary_count_metrics = nil
213214
@rollback_count_metrics = nil
214215
@flush_time_count_metrics = nil
215216
@slow_flush_count_metrics = nil
216-
@secondary_chunk_count_metrics = nil
217217
@enable_size_metrics = false
218218

219219
# How to process events is decided here at once, but it will be decided in delayed way on #configure & #start
@@ -279,10 +279,10 @@ def configure(conf)
279279
@emit_records_metrics = metrics_create(namespace: "fluentd", subsystem: "output", name: "emit_records", help_text: "Number of emit records")
280280
@emit_size_metrics = metrics_create(namespace: "fluentd", subsystem: "output", name: "emit_size", help_text: "Total size of emit events")
281281
@write_count_metrics = metrics_create(namespace: "fluentd", subsystem: "output", name: "write_count", help_text: "Number of writing events")
282+
@write_secondary_count_metrics = metrics_create(namespace: "fluentd", subsystem: "output", name: "secondary_chunk_count", help_text: "Number of writing events in secondary")
282283
@rollback_count_metrics = metrics_create(namespace: "fluentd", subsystem: "output", name: "rollback_count", help_text: "Number of rollbacking operations")
283284
@flush_time_count_metrics = metrics_create(namespace: "fluentd", subsystem: "output", name: "flush_time_count", help_text: "Count of flush time")
284285
@slow_flush_count_metrics = metrics_create(namespace: "fluentd", subsystem: "output", name: "slow_flush_count", help_text: "Count of slow flush occurred time(s)")
285-
@secondary_chunk_count_metrics = metrics_create(namespace: "fluentd", subsystem: "output", name: "secondary_chunk_count", help_text: "Number of stored chunks in secondary")
286286

287287
if has_buffer_section
288288
unless implement?(:buffered) || implement?(:delayed_commit)
@@ -1119,7 +1119,6 @@ def commit_write(chunk_id, delayed: @delayed_commit, secondary: false)
11191119
if @retry # success to flush chunks in retries
11201120
if secondary
11211121
log.warn "retry succeeded by secondary.", chunk_id: dump_unique_id_hex(chunk_id)
1122-
@secondary_chunk_count_metrics.inc
11231122
else
11241123
log.warn "retry succeeded.", chunk_id: dump_unique_id_hex(chunk_id)
11251124
end
@@ -1227,6 +1226,7 @@ def try_flush
12271226
dump_chunk_id = dump_unique_id_hex(chunk_id)
12281227
log.trace "adding write count", instance: self.object_id
12291228
@write_count_metrics.inc
1229+
@write_secondary_count_metrics.inc if using_secondary
12301230
log.trace "executing sync write", chunk: dump_chunk_id
12311231

12321232
output.write(chunk)
@@ -1594,10 +1594,10 @@ def statistics
15941594
'retry_count' => @num_errors_metrics.get,
15951595
'emit_count' => @emit_count_metrics.get,
15961596
'write_count' => @write_count_metrics.get,
1597+
'write_secondary_count' => @write_secondary_count_metrics.get,
15971598
'rollback_count' => @rollback_count_metrics.get,
15981599
'slow_flush_count' => @slow_flush_count_metrics.get,
15991600
'flush_time_count' => @flush_time_count_metrics.get,
1600-
'secondary_chunk_count' => @secondary_chunk_count_metrics.get,
16011601
}
16021602

16031603
if @buffer && @buffer.respond_to?(:statistics)

‎test/plugin/test_in_monitor_agent.rb

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -181,10 +181,10 @@ def test_enable_input_metrics(with_config)
181181
"emit_records" => Integer,
182182
"emit_size" => Integer,
183183
"write_count" => Integer,
184+
"write_secondary_count" => Integer,
184185
"rollback_count" => Integer,
185186
"slow_flush_count" => Integer,
186187
"flush_time_count" => Integer,
187-
"secondary_chunk_count" => Integer,
188188
}
189189
output_info.merge!("config" => {"@id" => "test_out", "@type" => "test_out"}) if with_config
190190
error_label_info = {
@@ -204,10 +204,10 @@ def test_enable_input_metrics(with_config)
204204
"emit_records" => Integer,
205205
"emit_size" => Integer,
206206
"write_count" => Integer,
207+
"write_secondary_count" => Integer,
207208
"rollback_count" => Integer,
208209
"slow_flush_count" => Integer,
209210
"flush_time_count" => Integer,
210-
"secondary_chunk_count" => Integer,
211211
}
212212
error_label_info.merge!("config" => {"@id"=>"null", "@type" => "null"}) if with_config
213213
opts = {with_config: with_config}
@@ -322,10 +322,10 @@ def test_enable_input_metrics(with_config)
322322
"emit_records" => Integer,
323323
"emit_size" => Integer,
324324
"write_count" => Integer,
325+
"write_secondary_count" => Integer,
325326
"rollback_count" => Integer,
326327
"slow_flush_count" => Integer,
327328
"flush_time_count" => Integer,
328-
"secondary_chunk_count" => Integer,
329329
}
330330
output_info.merge!("config" => {"@id" => "test_out", "@type" => "test_out"}) if with_config
331331
error_label_info = {
@@ -345,10 +345,10 @@ def test_enable_input_metrics(with_config)
345345
"emit_records" => Integer,
346346
"emit_size" => Integer,
347347
"write_count" => Integer,
348+
"write_secondary_count" => Integer,
348349
"rollback_count" => Integer,
349350
"slow_flush_count" => Integer,
350351
"flush_time_count" => Integer,
351-
"secondary_chunk_count" => Integer,
352352
}
353353
error_label_info.merge!("config" => {"@id"=>"null", "@type" => "null"}) if with_config
354354
opts = {with_config: with_config}
@@ -420,10 +420,10 @@ def test_enable_input_metrics(with_config)
420420
"emit_records" => Integer,
421421
"emit_size" => Integer,
422422
"write_count" => Integer,
423+
"write_secondary_count" => Integer,
423424
"rollback_count" => Integer,
424425
"slow_flush_count" => Integer,
425426
"flush_time_count" => Integer,
426-
"secondary_chunk_count" => Integer,
427427
}
428428
expect_test_out_record = {
429429
"plugin_id" => "test_out",
@@ -435,10 +435,10 @@ def test_enable_input_metrics(with_config)
435435
"emit_records" => Integer,
436436
"emit_size" => Integer,
437437
"write_count" => Integer,
438+
"write_secondary_count" => Integer,
438439
"rollback_count" => Integer,
439440
"slow_flush_count" => Integer,
440441
"flush_time_count" => Integer,
441-
"secondary_chunk_count" => Integer,
442442
}
443443
assert_fuzzy_equal(expect_relabel_record, d.events[1][2])
444444
assert_fuzzy_equal(expect_test_out_record, d.events[3][2])
@@ -574,10 +574,10 @@ def get(uri, header = {})
574574
"emit_records" => Integer,
575575
"emit_size" => Integer,
576576
"write_count" => Integer,
577+
"write_secondary_count" => Integer,
577578
"rollback_count" => Integer,
578579
"slow_flush_count" => Integer,
579580
"flush_time_count" => Integer,
580-
"secondary_chunk_count" => Integer,
581581
}
582582
expected_null_response.merge!("config" => {"@id" => "null", "@type" => "null"}) if with_config
583583
expected_null_response.merge!("retry" => {}) if with_retry
@@ -689,10 +689,10 @@ def get(uri, header = {})
689689
"emit_records" => Integer,
690690
"emit_size" => Integer,
691691
"write_count" => Integer,
692+
"write_secondary_count" => Integer,
692693
"rollback_count" => Integer,
693694
"slow_flush_count" => Integer,
694695
"flush_time_count" => Integer,
695-
"secondary_chunk_count" => Integer,
696696
}
697697
response = JSON.parse(get("http://127.0.0.1:#{@port}/api/plugins.json?with_config=no&with_retry=no&with_ivars=id,num_errors").body)
698698
test_in_response = response["plugins"][0]
@@ -821,10 +821,10 @@ def write(chunk)
821821
"emit_records" => Integer,
822822
"emit_size" => Integer,
823823
"write_count" => Integer,
824+
"write_secondary_count" => Integer,
824825
"rollback_count" => Integer,
825826
'slow_flush_count' => Integer,
826827
'flush_time_count' => Integer,
827-
"secondary_chunk_count" => Integer,
828828
}
829829
output.emit_events('test.tag', Fluent::ArrayEventStream.new([[event_time, {"message" => "test failed flush 1"}]]))
830830
# flush few times to check steps

‎test/plugin/test_output_as_buffered_secondary.rb

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ def dummy_event_stream
308308

309309
assert_equal 0, @i.write_count
310310
assert_equal 0, @i.num_errors
311-
assert_equal 0, @i.instance_variable_get(:@secondary_chunk_count_metrics).get
311+
assert_equal 0, @i.instance_variable_get(:@write_secondary_count_metrics).get
312312

313313
@i.enqueue_thread_wait
314314
@i.flush_thread_wakeup
@@ -349,7 +349,7 @@ def dummy_event_stream
349349
assert{ @i.write_count > prev_write_count }
350350
assert{ @i.num_errors == prev_num_errors }
351351

352-
assert{ @i.instance_variable_get(:@secondary_chunk_count_metrics).get > 0 }
352+
assert{ @i.instance_variable_get(:@write_secondary_count_metrics).get > 0 }
353353

354354
assert_nil @i.retry
355355

@@ -391,7 +391,6 @@ def dummy_event_stream
391391

392392
assert_equal 0, @i.write_count
393393
assert_equal 0, @i.num_errors
394-
assert_equal 0, @i.instance_variable_get(:@secondary_chunk_count_metrics).get
395394

396395
@i.enqueue_thread_wait
397396
@i.flush_thread_wakeup
@@ -447,8 +446,6 @@ def dummy_event_stream
447446
assert{ @i.buffer.dequeued[chunks[0].unique_id].nil? }
448447
assert{ chunks.first.empty? }
449448

450-
assert{ @i.instance_variable_get(:@secondary_chunk_count_metrics).get > 0 }
451-
452449
assert_nil @i.retry
453450

454451
logs = @i.log.out.logs
@@ -743,7 +740,7 @@ def dummy_event_stream
743740

744741
assert_equal 0, @i.write_count
745742
assert_equal 0, @i.num_errors
746-
assert_equal 0, @i.instance_variable_get(:@secondary_chunk_count_metrics).get
743+
assert_equal 0, @i.instance_variable_get(:@write_secondary_count_metrics).get
747744

748745
@i.enqueue_thread_wait
749746
@i.flush_thread_wakeup
@@ -772,7 +769,7 @@ def dummy_event_stream
772769
prev_write_count = @i.write_count
773770
end
774771

775-
assert{ @i.instance_variable_get(:@secondary_chunk_count_metrics).get > 0 }
772+
assert{ @i.instance_variable_get(:@write_secondary_count_metrics).get > 0 }
776773

777774
# retry_timeout == 60(sec), retry_secondary_threshold == 0.8
778775

‎test/test_plugin_classes.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,10 @@ def initialize
151151
@emit_records_metrics = FluentTest::FluentTestCounterMetrics.new
152152
@emit_size_metrics = FluentTest::FluentTestCounterMetrics.new
153153
@write_count_metrics = FluentTest::FluentTestCounterMetrics.new
154+
@write_secondary_count_metrics = FluentTest::FluentTestCounterMetrics.new
154155
@rollback_count_metrics = FluentTest::FluentTestCounterMetrics.new
155156
@flush_time_count_metrics = FluentTest::FluentTestCounterMetrics.new
156157
@slow_flush_count_metrics = FluentTest::FluentTestCounterMetrics.new
157-
@secondary_chunk_count_metrics = FluentTest::FluentTestCounterMetrics.new
158158
end
159159

160160
attr_reader :events
@@ -282,10 +282,10 @@ def initialize
282282
@emit_records_metrics = FluentTest::FluentTestCounterMetrics.new
283283
@emit_size_metrics = FluentTest::FluentTestCounterMetrics.new
284284
@write_count_metrics = FluentTest::FluentTestCounterMetrics.new
285+
@write_secondary_count_metrics = FluentTest::FluentTestCounterMetrics.new
285286
@rollback_count_metrics = FluentTest::FluentTestCounterMetrics.new
286287
@flush_time_count_metrics = FluentTest::FluentTestCounterMetrics.new
287288
@slow_flush_count_metrics = FluentTest::FluentTestCounterMetrics.new
288-
@secondary_chunk_count_metrics = FluentTest::FluentTestCounterMetrics.new
289289
end
290290

291291
def format(tag, time, record)

0 commit comments

Comments
 (0)