out_azureeventhubs_buffered.rb in fluent-plugin-azureeventhubs-0.0.6

- old
+ new

@@ -1,38 +1,54 @@
-#module Fluent
+module Fluent::Plugin
 
-  class AzureEventHubsOutputBuffered < Fluent::BufferedOutput
+  class AzureEventHubsOutputBuffered < Output
     Fluent::Plugin.register_output('azureeventhubs_buffered', self)
 
+    helpers :compat_parameters, :inject
+
+    DEFAULT_BUFFER_TYPE = "memory"
+
     config_param :connection_string, :string
     config_param :hub_name, :string
     config_param :include_tag, :bool, :default => false
     config_param :include_time, :bool, :default => false
     config_param :tag_time_name, :string, :default => 'time'
     config_param :expiry_interval, :integer, :default => 3600 # 60min
-    config_param :type, :string, :default => 'https' # https / amqps (Not Implemented) 
+    config_param :type, :string, :default => 'https' # https / amqps (Not Implemented)
     config_param :proxy_addr, :string, :default => ''
     config_param :proxy_port, :integer,:default => 3128
     config_param :open_timeout, :integer,:default => 60
     config_param :read_timeout, :integer,:default => 60
     config_param :message_properties, :hash, :default => nil
 
+    config_section :buffer do
+      config_set_default :@type, DEFAULT_BUFFER_TYPE
+      config_set_default :chunk_keys, ['tag']
+    end
+
     def configure(conf)
+      compat_parameters_convert(conf, :buffer, :inject)
       super
       case @type
       when 'amqps'
         raise NotImplementedError
       else
         require_relative 'azureeventhubs/http'
         @sender = AzureEventHubsHttpSender.new(@connection_string, @hub_name, @expiry_interval,@proxy_addr,@proxy_port,@open_timeout,@read_timeout)
       end
+      raise Fluent::ConfigError, "'tag' in chunk_keys is required." if not @chunk_key_tag
     end
 
     def format(tag, time, record)
+      record = inject_values_to_record(tag, time, record)
       [tag, time, record].to_msgpack
     end
 
+    def formatted_to_msgpack_binary?
+      true
+    end
+
     def write(chunk)
       chunk.msgpack_each { |tag, time, record|
         p record.to_s
         if @include_tag
           record['tag'] = tag
@@ -42,7 +58,6 @@
         end
         @sender.send_w_properties(record, @message_properties)
       }
     end
   end
-#end
-
+end