rebase with #4254

logstash-core/lib/logstash/output_delegator.rb

@@ -63,4 +63,4 @@ def events_received
   def busy_workers
     @worker_queue.size
   end
-end end
+end end

logstash-core/lib/logstash/pipeline.rb

@@ -190,7 +190,7 @@ def worker_loop(batch_size, batch_delay)
       input_batch, signal = @input_queue_pop_mutex.synchronize { take_batch(batch_size, batch_delay) }
       running = false if signal == LogStash::SHUTDOWN
 
-	  @metric.increment(:events_in, input_batch.size)
+      @metric.increment(:events_in, input_batch.size)
       @events_consumed.increment(input_batch.size)
 
       filtered_batch = filter_batch(input_batch)
@@ -200,7 +200,7 @@ def worker_loop(batch_size, batch_delay)
         flush_filters_to_batch(filtered_batch, flush_options)
       end
 
-	  @metric.increment(:events_filtered, filtered.size)
+	    @metric.increment(:events_filtered, filtered_batch.size)
       @events_filtered.increment(filtered_batch.size)
 
       output_batch(filtered_batch)
@@ -387,8 +387,7 @@ def plugin(plugin_type, name, *args)
       klass.new(*args)
     end
 
-	plugin.metric = metric
-	plugin
+    plugin
   end
 
   # for backward compatibility in devutils for the rspec helpers, this method is not used