github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 22:57:16 -04:00
Code Issues Projects Releases Packages Wiki Activity

Initialize the metric values in the batch to the correct type

Browse source 
When we were initilizing the `duration_in_millis` in the the batch we
were using a `Gauge` instead of a counter, since all the object have the
same signature when the were actually recording the time the value was
replaced instead of incremented.

Fixes #6465
This commit is contained in:
Pier-Hugues Pellerin 2016-12-29 11:01:08 -05:00
parent 8cd4ae5319
commit 7715fabdc2
3 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -141,7 +141,7 @@ module LogStash; module Util
end
def define_initial_metrics_values(namespaced_metric)
namespaced_metric.gauge(:duration_in_millis, 0)
namespaced_metric.report_time(:duration_in_millis, 0)
namespaced_metric.increment(:filtered, 0)
namespaced_metric.increment(:in, 0)
namespaced_metric.increment(:out, 0)

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

@ -88,7 +88,7 @@ module LogStash; module Util
end
def define_initial_metrics_values(namespaced_metric)
namespaced_metric.gauge(:duration_in_millis, 0)
namespaced_metric.report_time(:duration_in_millis, 0)
namespaced_metric.increment(:filtered, 0)
namespaced_metric.increment(:in, 0)
namespaced_metric.increment(:out, 0)

15
logstash-core/spec/logstash/util/wrapped_synchronous_queue_spec.rb
View file

@ -65,13 +65,28 @@ describe LogStash::Util::WrappedSynchronousQueue do
store = collector.snapshot_metric.metric_store
expect(store.get_shallow(:events, :in).value).to eq(0)
expect(store.get_shallow(:events, :in)).to be_kind_of(LogStash::Instrument::MetricType::Counter)
expect(store.get_shallow(:events, :out).value).to eq(0)
expect(store.get_shallow(:events, :out)).to be_kind_of(LogStash::Instrument::MetricType::Counter)
expect(store.get_shallow(:events, :filtered).value).to eq(0)
expect(store.get_shallow(:events, :filtered)).to be_kind_of(LogStash::Instrument::MetricType::Counter)
expect(store.get_shallow(:events, :duration_in_millis).value).to eq(0)
expect(store.get_shallow(:events, :duration_in_millis)).to be_kind_of(LogStash::Instrument::MetricType::Counter)
expect(store.get_shallow(:pipeline, :in).value).to eq(0)
expect(store.get_shallow(:pipeline, :in)).to be_kind_of(LogStash::Instrument::MetricType::Counter)
expect(store.get_shallow(:pipeline, :duration_in_millis).value).to eq(0)
expect(store.get_shallow(:pipeline, :duration_in_millis)).to be_kind_of(LogStash::Instrument::MetricType::Counter)
expect(store.get_shallow(:pipeline, :out).value).to eq(0)
expect(store.get_shallow(:pipeline, :out)).to be_kind_of(LogStash::Instrument::MetricType::Counter)
expect(store.get_shallow(:pipeline, :filtered).value).to eq(0)
expect(store.get_shallow(:pipeline, :filtered)).to be_kind_of(LogStash::Instrument::MetricType::Counter)
end
end