github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-25 07:07:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

#8172 Move timestamp handling for metrics to java.lang.System.nano_time

Browse source 
Fixes #8180
This commit is contained in:
Armin 2017-09-08 08:02:03 +02:00 • committed by Armin Braun
parent 029be86c6d
commit a252ec6178
5 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
logstash-core/lib/logstash/filter_delegator.rb
View file

@ -44,9 +44,9 @@ module LogStash
def multi_filter(events) def multi_filter(events)
@metric_events_in.increment(events.size) @metric_events_in.increment(events.size)
start_time = java.lang.System.current_time_millis start_time = java.lang.System.nano_time
new_events = @filter.multi_filter(events) new_events = @filter.multi_filter(events)
@metric_events_time.increment(java.lang.System.current_time_millis - start_time) @metric_events_time.increment((java.lang.System.nano_time - start_time) / 1_000_000)
# There is no guarantee in the context of filter # There is no guarantee in the context of filter
# that EVENTS_IN == EVENTS_OUT, see the aggregates and # that EVENTS_IN == EVENTS_OUT, see the aggregates and

6
logstash-core/lib/logstash/instrument/wrapped_write_client.rb
View file

@ -25,7 +25,7 @@ module LogStash module Instrument
def push(event) def push(event)
increment_counters(1) increment_counters(1)
start_time = java.lang.System.current_time_millis start_time = java.lang.System.nano_time
result = @write_client.push(event) result = @write_client.push(event)
report_execution_time(start_time) report_execution_time(start_time)
result result
@ -35,7 +35,7 @@ module LogStash module Instrument
def push_batch(batch) def push_batch(batch)
increment_counters(batch.size) increment_counters(batch.size)
start_time = java.lang.System.current_time_millis start_time = java.lang.System.nano_time
result = @write_client.push_batch(batch) result = @write_client.push_batch(batch)
report_execution_time(start_time) report_execution_time(start_time)
result result
@ -50,7 +50,7 @@ module LogStash module Instrument
end end
def report_execution_time(start_time) def report_execution_time(start_time)
execution_time = java.lang.System.current_time_millis - start_time execution_time = (java.lang.System.nano_time - start_time) / 1_000_000
@events_metrics_time.increment(execution_time) @events_metrics_time.increment(execution_time)
@pipeline_metrics_time.increment(execution_time) @pipeline_metrics_time.increment(execution_time)
@plugin_events_metrics_time.increment(execution_time) @plugin_events_metrics_time.increment(execution_time)

4
logstash-core/lib/logstash/output_delegator.rb
View file

@ -45,9 +45,9 @@ module LogStash class OutputDelegator
def multi_receive(events) def multi_receive(events)
@in_counter.increment(events.length) @in_counter.increment(events.length)
start_time = java.lang.System.current_time_millis start_time = java.lang.System.nano_time
@strategy.multi_receive(events) @strategy.multi_receive(events)
@time_metric.increment(java.lang.System.current_time_millis - start_time) @time_metric.increment((java.lang.System.nano_time - start_time) / 1_000_000)
@out_counter.increment(events.length) @out_counter.increment(events.length)
end end

4
logstash-core/lib/logstash/util/wrapped_acked_queue.rb
View file

@ -205,7 +205,7 @@ module LogStash; module Util
end end
def start_clock def start_clock
@inflight_clocks[Thread.current] = java.lang.System.current_time_millis @inflight_clocks[Thread.current] = java.lang.System.nano_time
end end
def stop_clock(batch) def stop_clock(batch)
@ -214,7 +214,7 @@ module LogStash; module Util
# only stop (which also records) the metrics if the batch is non-empty. # only stop (which also records) the metrics if the batch is non-empty.
# start_clock is now called at empty batch creation and an empty batch could # start_clock is now called at empty batch creation and an empty batch could
# stay empty all the way down to the close_batch call. # stay empty all the way down to the close_batch call.
time_taken = java.lang.System.current_time_millis - @inflight_clocks[Thread.current] time_taken = (java.lang.System.nano_time - @inflight_clocks[Thread.current]) / 1_000_000
@event_metric.report_time(:duration_in_millis, time_taken) @event_metric.report_time(:duration_in_millis, time_taken)
@pipeline_metric.report_time(:duration_in_millis, time_taken) @pipeline_metric.report_time(:duration_in_millis, time_taken)
end end

4
logstash-core/lib/logstash/util/wrapped_synchronous_queue.rb
View file

@ -144,7 +144,7 @@ module LogStash; module Util
end end
def start_clock def start_clock
@inflight_clocks[Thread.current] = java.lang.System.current_time_millis @inflight_clocks[Thread.current] = java.lang.System.nano_time
end end
def stop_clock(batch) def stop_clock(batch)
@ -153,7 +153,7 @@ module LogStash; module Util
# only stop (which also records) the metrics if the batch is non-empty. # only stop (which also records) the metrics if the batch is non-empty.
# start_clock is now called at empty batch creation and an empty batch could # start_clock is now called at empty batch creation and an empty batch could
# stay empty all the way down to the close_batch call. # stay empty all the way down to the close_batch call.
time_taken = java.lang.System.current_time_millis - @inflight_clocks[Thread.current] time_taken = (java.lang.System.nano_time - @inflight_clocks[Thread.current]) / 1_000_000
@event_metric_time.increment(time_taken) @event_metric_time.increment(time_taken)
@pipeline_metric_time.increment(time_taken) @pipeline_metric_time.increment(time_taken)
end end