compat: output: Avoid to use monitor lock if needn't

Signed-off-by: Hiroshi Hatake <hatake@calyptia.com>
fluent · Jul 30, 2021 · e499589 · e499589
1 parent 97486d1
commit e499589
Showing 1 changed file with 21 additions and 9 deletions.
diff --git a/lib/fluent/compat/output.rb b/lib/fluent/compat/output.rb
@@ -352,9 +352,13 @@ def handle_stream_simple(tag, es, enqueue: false)
           write_guard do
             @buffer.write({meta => data}, format: ->(_data){ _data }, size: ->(){ size }, enqueue: enqueue)
           end
-          @counter_mutex.synchronize do
-            @emit_size_metrics.add(es.to_msgpack_stream.bytesize) if @enable_size_metrics
-            @emit_records_metrics.add(size)
+          if @enable_size_metrics
+            @counter_mutex.synchronize do
+              @emit_records_metrics.add(es.size)
+              @emit_size_metrics.add(es.to_msgpack_stream.bytesize)
+            end
+          else
+            @emit_records_metrics.add(es.size)
           end
           return [meta]
         end
@@ -366,9 +370,13 @@ def handle_stream_simple(tag, es, enqueue: false)
           write_guard do
             @buffer.write({meta => bulk}, format: ->(_data){ _data }, size: ->(){ size }, enqueue: enqueue)
           end
-          @counter_mutex.synchronize do
-            @emit_size_metrics.add(es.to_msgpack_stream.bytesize) if @enable_size_metrics
-            @emit_records_metrics.add(size)
+          if @enable_size_metrics
+            @counter_mutex.synchronize do
+              @emit_records_metrics.add(es.size)
+              @emit_size_metrics.add(es.to_msgpack_stream.bytesize)
+            end
+          else
+            @emit_records_metrics.add(es.size)
           end
           return [meta]
         end
@@ -379,9 +387,13 @@ def handle_stream_simple(tag, es, enqueue: false)
         write_guard do
           @buffer.write({meta => data}, enqueue: enqueue)
         end
-        @counter_mutex.synchronize do
-          @emit_size_metrics.add(es.to_msgpack_stream.bytesize) if @enable_size_metrics
-          @emit_records_metrics.add(size)
+        if @enable_size_metrics
+          @counter_mutex.synchronize do
+            @emit_records_metrics.add(es.size)
+            @emit_size_metrics.add(es.to_msgpack_stream.bytesize)
+          end
+        else
+          @emit_records_metrics.add(es.size)
         end
         [meta]
       end