use ext_monitor before ruby 2.7

add move to dev dependency

Signed-off-by: Yuta Iwama <[email protected]>

fluentd.gemspec

@@ -27,7 +27,6 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency("tzinfo", [">= 1.0", "< 3.0"])
   gem.add_runtime_dependency("tzinfo-data", ["~> 1.0"])
   gem.add_runtime_dependency("strptime", [">= 0.2.2", "< 1.0.0"])
-  gem.add_runtime_dependency("ext_monitor", [">= 0.1.1", "< 0.2"])
 
   # build gem for a certain platform. see also Rakefile
   fake_platform = ENV['GEM_BUILD_FAKE_PLATFORM'].to_s
@@ -49,4 +48,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency("test-unit", ["~> 3.2"])
   gem.add_development_dependency("test-unit-rr", ["~> 1.0"])
   gem.add_development_dependency("oj", [">= 2.14", "< 4"])
+  gem.add_development_dependency("ext_monitor", [">= 0.1.1", "< 0.2"])
 end

lib/fluent/command/cat.rb

@@ -101,13 +101,11 @@
   usage $!.to_s
 end
 
-
 require 'thread'
-require 'monitor'
 require 'socket'
 require 'yajl'
 require 'msgpack'
-
+require 'fluent/ext_monitor_require'
 
 class Writer
   include MonitorMixin

lib/fluent/load.rb

@@ -2,7 +2,6 @@
 require 'socket'
 require 'fcntl'
 require 'time'
-require 'monitor'
 require 'stringio'
 require 'fileutils'
 require 'json'
@@ -33,3 +32,4 @@
 require 'fluent/output'
 require 'fluent/filter'
 require 'fluent/match'
+require 'fluent/ext_monitor_require'

lib/fluent/plugin/buffer.rb

@@ -17,8 +17,7 @@
 require 'fluent/plugin/base'
 require 'fluent/plugin/owned_by_mixin'
 require 'fluent/unique_id'
-
-require 'monitor'
+require 'fluent/ext_monitor_require'
 
 module Fluent
   module Plugin

lib/fluent/plugin/buffer/chunk.rb

@@ -18,8 +18,8 @@
 require 'fluent/plugin/compressable'
 require 'fluent/unique_id'
 require 'fluent/event'
+require 'fluent/ext_monitor_require'
 
-require 'monitor'
 require 'tempfile'
 require 'zlib'
 

lib/fluent/plugin/output.rb

@@ -25,9 +25,9 @@
 require 'fluent/timezone'
 require 'fluent/unique_id'
 require 'fluent/clock'
+require 'fluent/ext_monitor_require'
 
 require 'time'
-require 'monitor'
 
 module Fluent
   module Plugin