logstash-core 2.1.3-java → 2.2.0-java

data/spec/{core/shutdown_controller_spec.rb → logstash/shutdown_watcher_spec.rb}

@@ -1,17 +1,23 @@
 # encoding: utf-8
 require "spec_helper"
-require "logstash/shutdown_controller"
+require "logstash/shutdown_watcher"
 
-describe LogStash::ShutdownController do
+describe LogStash::ShutdownWatcher do
 
   let(:check_every) { 0.01 }
   let(:check_threshold) { 100 }
-  subject { LogStash::ShutdownController.new(pipeline, check_every) }
+  subject { LogStash::ShutdownWatcher.new(pipeline, check_every) }
   let(:pipeline) { double("pipeline") }
+  let(:reporter) { double("reporter") }
+  let(:reporter_snapshot) { double("reporter snapshot") }
   report_count = 0
 
   before :each do
-    allow(LogStash::Report).to receive(:from_pipeline).and_wrap_original do |m, *args|
+    allow(pipeline).to receive(:reporter).and_return(reporter)
+    allow(reporter).to receive(:snapshot).and_return(reporter_snapshot)
+    allow(reporter_snapshot).to receive(:o_simple_hash).and_return({})
+
+    allow(subject).to receive(:pipeline_report_snapshot).and_wrap_original do |m, *args|
       report_count += 1
       m.call(*args)
     end
@@ -22,10 +28,10 @@ describe LogStash::ShutdownController do
   end
 
   context "when pipeline is stalled" do
-    let(:increasing_count) { (1..5000).to_a.map {|i| { "total" => i } } }
+    let(:increasing_count) { (1..5000).to_a }
     before :each do
-      allow(pipeline).to receive(:inflight_count).and_return(*increasing_count)
-      allow(pipeline).to receive(:stalling_threads) { { } }
+      allow(reporter_snapshot).to receive(:inflight_count).and_return(*increasing_count)
+      allow(reporter_snapshot).to receive(:stalling_threads) { { } }
     end
 
     describe ".unsafe_shutdown = true" do
@@ -49,7 +55,7 @@ describe LogStash::ShutdownController do
 
       it "should do exactly \"abort_threshold\"*\"report_every\" stall checks" do
         allow(subject).to receive(:force_exit)
-        expect(LogStash::Report).to receive(:from_pipeline).exactly(abort_threshold*report_every).times.and_call_original
+        expect(subject).to receive(:pipeline_report_snapshot).exactly(abort_threshold*report_every).times.and_call_original
         subject.start
       end
     end
@@ -70,10 +76,10 @@ describe LogStash::ShutdownController do
   end
 
   context "when pipeline is not stalled" do
-    let(:decreasing_count) { (1..5000).to_a.reverse.map {|i| { "total" => i } } }
+    let(:decreasing_count) { (1..5000).to_a.reverse }
     before :each do
-      allow(pipeline).to receive(:inflight_count).and_return(*decreasing_count)
-      allow(pipeline).to receive(:stalling_threads) { { } }
+      allow(reporter_snapshot).to receive(:inflight_count).and_return(*decreasing_count)
+      allow(reporter_snapshot).to receive(:stalling_threads) { { } }
     end
 
     describe ".unsafe_shutdown = true" do

data/spec/{util → logstash/util}/defaults_printer_spec.rb

@@ -10,7 +10,7 @@ describe LogStash::Util::DefaultsPrinter do
   end
 
   let(:workers)  { 1 }
-  let(:expected) { "Settings: User set filter workers: #{workers}" }
+  let(:expected) { "Settings: User set pipeline workers: #{workers}" }
   let(:settings) { {} }
 
   describe 'class methods API' do
@@ -24,8 +24,8 @@ describe LogStash::Util::DefaultsPrinter do
     end
 
     context 'when the settings hash has content' do
-      let(:workers) { 42 }
-      let(:settings) { {'filter-workers' => workers} }
+      let(:worker_queue) { 42 }
+      let(:settings) { {:pipeline_workers => workers} }
       it_behaves_like "a defaults printer"
     end
   end
@@ -42,7 +42,7 @@ describe LogStash::Util::DefaultsPrinter do
 
     context 'when the settings hash has content' do
       let(:workers) { 13 }
-      let(:settings) { {'filter-workers' => workers} }
+      let(:settings) { {:pipeline_workers => workers} }
 
       it_behaves_like "a defaults printer"
     end

data/spec/{util → logstash/util}/worker_threads_default_printer_spec.rb

@@ -19,26 +19,26 @@ describe LogStash::Util::WorkerThreadsDefaultPrinter do
     end
 
     context 'when the settings hash has both user and default content' do
-      let(:settings) { {'filter-workers' => 42, 'default-filter-workers' => 5} }
+      let(:settings) { {:pipeline_workers => 42, :default_pipeline_workers => 5} }
 
       it 'adds two strings' do
-        expect(collector).to eq(["User set filter workers: 42", "Default filter workers: 5"])
+        expect(collector).to eq(["User set pipeline workers: 42", "Default pipeline workers: 5"])
       end
     end
 
     context 'when the settings hash has only user content' do
-      let(:settings) { {'filter-workers' => 42} }
+      let(:settings) { {:pipeline_workers => 42} }
 
-      it 'adds a string with user set filter workers' do
-        expect(collector.first).to eq("User set filter workers: 42")
+      it 'adds a string with user set pipeline workers' do
+        expect(collector.first).to eq("User set pipeline workers: 42")
       end
     end
 
     context 'when the settings hash has only default content' do
-      let(:settings) { {'default-filter-workers' => 5} }
+      let(:settings) { {:default_pipeline_workers => 5} }
 
-      it 'adds a string with default filter workers' do
-        expect(collector.first).to eq("Default filter workers: 5")
+      it 'adds a string with default pipeline workers' do
+        expect(collector.first).to eq("Default pipeline workers: 5")
       end
     end
   end

data/spec/logstash/util/wrapped_synchronous_queue_spec.rb

@@ -0,0 +1,28 @@
+# encoding: utf-8
+require "spec_helper"
+require "logstash/util/wrapped_synchronous_queue"
+
+describe LogStash::Util::WrappedSynchronousQueue do
+ context "#offer" do
+   context "queue is blocked" do
+     it "fails and give feedback" do
+       expect(subject.offer("Bonjour", 2)).to be_falsey
+     end
+   end
+
+   context "queue is not blocked" do
+     before do
+       @consumer = Thread.new { loop { subject.take } }
+       sleep(0.1)
+     end
+
+     after do
+       @consumer.kill
+     end
+     
+     it "inserts successfully" do
+       expect(subject.offer("Bonjour", 20)).to be_truthy
+     end
+   end
+ end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-core
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.2.0
 platform: java
 authors:
 - Jordan Sissel
@@ -10,8 +10,22 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-02-16 00:00:00.000000000 Z
+date: 2016-02-01 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+  name: logstash-core-event
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -218,6 +232,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/logstash-core.rb
+- lib/logstash-core/logstash-core.rb
+- lib/logstash-core/version.rb
 - lib/logstash/agent.rb
 - lib/logstash/codecs/base.rb
 - lib/logstash/config/config_ast.rb
@@ -229,7 +245,6 @@ files:
 - lib/logstash/config/registry.rb
 - lib/logstash/environment.rb
 - lib/logstash/errors.rb
-- lib/logstash/event.rb
 - lib/logstash/filters/base.rb
 - lib/logstash/inputs/base.rb
 - lib/logstash/inputs/threadable.rb
@@ -237,24 +252,21 @@ files:
 - lib/logstash/json.rb
 - lib/logstash/logging.rb
 - lib/logstash/namespace.rb
+- lib/logstash/output_delegator.rb
 - lib/logstash/outputs/base.rb
 - lib/logstash/patches.rb
 - lib/logstash/patches/bugfix_jruby_2558.rb
-- lib/logstash/patches/bundler.rb
 - lib/logstash/patches/cabin.rb
 - lib/logstash/patches/profile_require_calls.rb
 - lib/logstash/patches/rubygems.rb
 - lib/logstash/patches/stronger_openssl_defaults.rb
 - lib/logstash/pipeline.rb
+- lib/logstash/pipeline_reporter.rb
 - lib/logstash/plugin.rb
 - lib/logstash/program.rb
 - lib/logstash/runner.rb
-- lib/logstash/shutdown_controller.rb
-- lib/logstash/sized_queue.rb
-- lib/logstash/string_interpolation.rb
-- lib/logstash/timestamp.rb
+- lib/logstash/shutdown_watcher.rb
 - lib/logstash/util.rb
-- lib/logstash/util/accessors.rb
 - lib/logstash/util/buftok.rb
 - lib/logstash/util/charset.rb
 - lib/logstash/util/decorators.rb
@@ -268,47 +280,38 @@ files:
 - lib/logstash/util/socket_peer.rb
 - lib/logstash/util/unicode_trimmer.rb
 - lib/logstash/util/worker_threads_default_printer.rb
+- lib/logstash/util/wrapped_synchronous_queue.rb
 - lib/logstash/version.rb
 - locales/en.yml
 - logstash-core.gemspec
-- spec/core/conditionals_spec.rb
-- spec/core/config_cpu_core_strategy_spec.rb
-- spec/core/config_defaults_spec.rb
-- spec/core/config_mixin_spec.rb
-- spec/core/config_spec.rb
-- spec/core/environment_spec.rb
-- spec/core/event_spec.rb
-- spec/core/pipeline_spec.rb
-- spec/core/plugin_spec.rb
-- spec/core/runner_spec.rb
-- spec/core/shutdown_controller_spec.rb
-- spec/core/timestamp_spec.rb
-- spec/coverage_helper.rb
-- spec/filters/base_spec.rb
-- spec/inputs/base_spec.rb
-- spec/lib/logstash/bundler_spec.rb
-- spec/lib/logstash/java_integration_spec.rb
-- spec/license_spec.rb
+- spec/conditionals_spec.rb
 - spec/logstash/agent_spec.rb
+- spec/logstash/config/config_ast_spec.rb
+- spec/logstash/config/cpu_core_strategy_spec.rb
+- spec/logstash/config/defaults_spec.rb
+- spec/logstash/config/mixin_spec.rb
+- spec/logstash/environment_spec.rb
+- spec/logstash/filters/base_spec.rb
+- spec/logstash/inputs/base_spec.rb
+- spec/logstash/java_integration_spec.rb
+- spec/logstash/json_spec.rb
+- spec/logstash/output_delegator_spec.rb
+- spec/logstash/outputs/base_spec.rb
 - spec/logstash/patches_spec.rb
-- spec/outputs/base_spec.rb
-- spec/plugin_manager/install_spec.rb
-- spec/plugin_manager/update_spec.rb
-- spec/plugin_manager/util_spec.rb
-- spec/spec_helper.rb
-- spec/util/accessors_spec.rb
-- spec/util/buftok_spec.rb
-- spec/util/charset_spec.rb
-- spec/util/compress_spec.rb
-- spec/util/defaults_printer_spec.rb
-- spec/util/gemfile_spec.rb
-- spec/util/java_version_spec.rb
-- spec/util/json_spec.rb
-- spec/util/plugin_version_spec.rb
-- spec/util/retryable_spec.rb
-- spec/util/unicode_trimmer_spec.rb
-- spec/util/worker_threads_default_printer_spec.rb
-- spec/util_spec.rb
+- spec/logstash/pipeline_reporter_spec.rb
+- spec/logstash/pipeline_spec.rb
+- spec/logstash/plugin_spec.rb
+- spec/logstash/runner_spec.rb
+- spec/logstash/shutdown_watcher_spec.rb
+- spec/logstash/util/buftok_spec.rb
+- spec/logstash/util/charset_spec.rb
+- spec/logstash/util/defaults_printer_spec.rb
+- spec/logstash/util/java_version_spec.rb
+- spec/logstash/util/plugin_version_spec.rb
+- spec/logstash/util/unicode_trimmer_spec.rb
+- spec/logstash/util/worker_threads_default_printer_spec.rb
+- spec/logstash/util/wrapped_synchronous_queue_spec.rb
+- spec/logstash/util_spec.rb
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)
@@ -334,41 +337,31 @@ signing_key:
 specification_version: 4
 summary: logstash-core - The core components of logstash
 test_files:
-- spec/core/conditionals_spec.rb
-- spec/core/config_cpu_core_strategy_spec.rb
-- spec/core/config_defaults_spec.rb
-- spec/core/config_mixin_spec.rb
-- spec/core/config_spec.rb
-- spec/core/environment_spec.rb
-- spec/core/event_spec.rb
-- spec/core/pipeline_spec.rb
-- spec/core/plugin_spec.rb
-- spec/core/runner_spec.rb
-- spec/core/shutdown_controller_spec.rb
-- spec/core/timestamp_spec.rb
-- spec/coverage_helper.rb
-- spec/filters/base_spec.rb
-- spec/inputs/base_spec.rb
-- spec/lib/logstash/bundler_spec.rb
-- spec/lib/logstash/java_integration_spec.rb
-- spec/license_spec.rb
+- spec/conditionals_spec.rb
 - spec/logstash/agent_spec.rb
+- spec/logstash/config/config_ast_spec.rb
+- spec/logstash/config/cpu_core_strategy_spec.rb
+- spec/logstash/config/defaults_spec.rb
+- spec/logstash/config/mixin_spec.rb
+- spec/logstash/environment_spec.rb
+- spec/logstash/filters/base_spec.rb
+- spec/logstash/inputs/base_spec.rb
+- spec/logstash/java_integration_spec.rb
+- spec/logstash/json_spec.rb
+- spec/logstash/output_delegator_spec.rb
+- spec/logstash/outputs/base_spec.rb
 - spec/logstash/patches_spec.rb
-- spec/outputs/base_spec.rb
-- spec/plugin_manager/install_spec.rb
-- spec/plugin_manager/update_spec.rb
-- spec/plugin_manager/util_spec.rb
-- spec/spec_helper.rb
-- spec/util/accessors_spec.rb
-- spec/util/buftok_spec.rb
-- spec/util/charset_spec.rb
-- spec/util/compress_spec.rb
-- spec/util/defaults_printer_spec.rb
-- spec/util/gemfile_spec.rb
-- spec/util/java_version_spec.rb
-- spec/util/json_spec.rb
-- spec/util/plugin_version_spec.rb
-- spec/util/retryable_spec.rb
-- spec/util/unicode_trimmer_spec.rb
-- spec/util/worker_threads_default_printer_spec.rb
-- spec/util_spec.rb
+- spec/logstash/pipeline_reporter_spec.rb
+- spec/logstash/pipeline_spec.rb
+- spec/logstash/plugin_spec.rb
+- spec/logstash/runner_spec.rb
+- spec/logstash/shutdown_watcher_spec.rb
+- spec/logstash/util/buftok_spec.rb
+- spec/logstash/util/charset_spec.rb
+- spec/logstash/util/defaults_printer_spec.rb
+- spec/logstash/util/java_version_spec.rb
+- spec/logstash/util/plugin_version_spec.rb
+- spec/logstash/util/unicode_trimmer_spec.rb
+- spec/logstash/util/worker_threads_default_printer_spec.rb
+- spec/logstash/util/wrapped_synchronous_queue_spec.rb
+- spec/logstash/util_spec.rb

data/lib/logstash/event.rb

@@ -1,275 +0,0 @@
-# encoding: utf-8
-require "time"
-require "date"
-require "cabin"
-require "logstash/namespace"
-require "logstash/util/accessors"
-require "logstash/timestamp"
-require "logstash/json"
-require "logstash/string_interpolation"
-
-# transcient pipeline events for normal in-flow signaling as opposed to
-# flow altering exceptions. for now having base classes is adequate and
-# in the future it might be necessary to refactor using like a BaseEvent
-# class to have a common interface for all pileline events to support
-# eventual queueing persistence for example, TBD.
-class LogStash::ShutdownEvent; end
-class LogStash::FlushEvent; end
-
-module LogStash
-  FLUSH = LogStash::FlushEvent.new
-
-  # LogStash::SHUTDOWN is used by plugins
-  SHUTDOWN = LogStash::ShutdownEvent.new
-end
-
-# the logstash event object.
-#
-# An event is simply a tuple of (timestamp, data).
-# The 'timestamp' is an ISO8601 timestamp. Data is anything - any message,
-# context, references, etc that are relevant to this event.
-#
-# Internally, this is represented as a hash with only two guaranteed fields.
-#
-# * "@timestamp" - an ISO8601 timestamp representing the time the event
-#   occurred at.
-# * "@version" - the version of the schema. Currently "1"
-#
-# They are prefixed with an "@" symbol to avoid clashing with your
-# own custom fields.
-#
-# When serialized, this is represented in JSON. For example:
-#
-#     {
-#       "@timestamp": "2013-02-09T20:39:26.234Z",
-#       "@version": "1",
-#       message: "hello world"
-#     }
-class LogStash::Event
-  class DeprecatedMethod < StandardError; end
-
-  CHAR_PLUS = "+"
-  TIMESTAMP = "@timestamp"
-  VERSION = "@version"
-  VERSION_ONE = "1"
-  TIMESTAMP_FAILURE_TAG = "_timestampparsefailure"
-  TIMESTAMP_FAILURE_FIELD = "_@timestamp"
-
-  METADATA = "@metadata".freeze
-  METADATA_BRACKETS = "[#{METADATA}]".freeze
-
-  # Floats outside of these upper and lower bounds are forcibly converted
-  # to scientific notation by Float#to_s
-  MIN_FLOAT_BEFORE_SCI_NOT = 0.0001
-  MAX_FLOAT_BEFORE_SCI_NOT = 1000000000000000.0
-
-  LOGGER = Cabin::Channel.get(LogStash)
-
-  public
-  def initialize(data = {})
-    @cancelled = false
-    @data = data
-    @accessors = LogStash::Util::Accessors.new(data)
-    @data[VERSION] ||= VERSION_ONE
-    ts = @data[TIMESTAMP]
-    @data[TIMESTAMP] = ts ? init_timestamp(ts) : LogStash::Timestamp.now
-
-    @metadata = @data.delete(METADATA) || {}
-    @metadata_accessors = LogStash::Util::Accessors.new(@metadata)
-  end # def initialize
-
-  public
-  def cancel
-    @cancelled = true
-  end # def cancel
-
-  public
-  def uncancel
-    @cancelled = false
-  end # def uncancel
-
-  public
-  def cancelled?
-    return @cancelled
-  end # def cancelled?
-
-  # Create a deep-ish copy of this event.
-  public
-  def clone
-    copy = {}
-    @data.each do |k,v|
-      # TODO(sissel): Recurse if this is a hash/array?
-      copy[k] = begin v.clone rescue v end
-    end
-    return self.class.new(copy)
-  end # def clone
-
-  public
-  def to_s
-    "#{timestamp.to_iso8601} #{self.sprintf("%{host} %{message}")}"
-  end # def to_s
-
-  public
-  def timestamp; return @data[TIMESTAMP]; end # def timestamp
-  def timestamp=(val); return @data[TIMESTAMP] = val; end # def timestamp=
-
-  def unix_timestamp
-    raise DeprecatedMethod
-  end # def unix_timestamp
-
-  def ruby_timestamp
-    raise DeprecatedMethod
-  end # def unix_timestamp
-
-  public
-  def [](fieldref)
-    if fieldref.start_with?(METADATA_BRACKETS)
-      @metadata_accessors.get(fieldref[METADATA_BRACKETS.length .. -1])
-    elsif fieldref == METADATA
-      @metadata
-    else
-      @accessors.get(fieldref)
-    end
-  end # def []
-
-  public
-  def []=(fieldref, value)
-    if fieldref == TIMESTAMP && !value.is_a?(LogStash::Timestamp)
-      raise TypeError, "The field '@timestamp' must be a (LogStash::Timestamp, not a #{value.class} (#{value})"
-    end
-    if fieldref.start_with?(METADATA_BRACKETS)
-      @metadata_accessors.set(fieldref[METADATA_BRACKETS.length .. -1], value)
-    elsif fieldref == METADATA
-      @metadata = value
-      @metadata_accessors = LogStash::Util::Accessors.new(@metadata)
-    else
-      @accessors.set(fieldref, value)
-    end
-  end # def []=
-
-  public
-  def fields
-    raise DeprecatedMethod
-  end
-
-  public
-  def to_json(*args)
-    # ignore arguments to respect accepted to_json method signature
-    LogStash::Json.dump(@data)
-  end # def to_json
-
-  public
-  def to_hash
-    @data
-  end # def to_hash
-
-  public
-  def overwrite(event)
-    # pickup new event @data and also pickup @accessors
-    # otherwise it will be pointing on previous data
-    @data = event.instance_variable_get(:@data)
-    @accessors = event.instance_variable_get(:@accessors)
-
-    #convert timestamp if it is a String
-    if @data[TIMESTAMP].is_a?(String)
-      @data[TIMESTAMP] = LogStash::Timestamp.parse_iso8601(@data[TIMESTAMP])
-    end
-  end
-
-  public
-  def include?(fieldref)
-    if fieldref.start_with?(METADATA_BRACKETS)
-      @metadata_accessors.include?(fieldref[METADATA_BRACKETS.length .. -1])
-    elsif fieldref == METADATA
-      true
-    else
-      @accessors.include?(fieldref)
-    end
-  end # def include?
-
-  # Append an event to this one.
-  public
-  def append(event)
-    # non-destructively merge that event with ourselves.
-
-    # no need to reset @accessors here because merging will not disrupt any existing field paths
-    # and if new ones are created they will be picked up.
-    LogStash::Util.hash_merge(@data, event.to_hash)
-  end # append
-
-  # Remove a field or field reference. Returns the value of that field when
-  # deleted
-  public
-  def remove(fieldref)
-    @accessors.del(fieldref)
-  end # def remove
-
-  # sprintf. This could use a better method name.
-  # The idea is to take an event and convert it to a string based on
-  # any format values, delimited by %{foo} where 'foo' is a field or
-  # metadata member.
-  #
-  # For example, if the event has type == "foo" and host == "bar"
-  # then this string:
-  #   "type is %{type} and source is %{host}"
-  # will return
-  #   "type is foo and source is bar"
-  #
-  # If a %{name} value is an array, then we will join by ','
-  # If a %{name} value does not exist, then no substitution occurs.
-  public
-  def sprintf(format)
-    LogStash::StringInterpolation.evaluate(self, format)
-  end
-
-  def tag(value)
-    # Generalize this method for more usability
-    self["tags"] ||= []
-    self["tags"] << value unless self["tags"].include?(value)
-  end
-
-  private
-
-  def init_timestamp(o)
-    begin
-      timestamp = LogStash::Timestamp.coerce(o)
-      return timestamp if timestamp
-
-      LOGGER.warn("Unrecognized #{TIMESTAMP} value, setting current time to #{TIMESTAMP}, original in #{TIMESTAMP_FAILURE_FIELD}field", :value => o.inspect)
-    rescue LogStash::TimestampParserError => e
-      LOGGER.warn("Error parsing #{TIMESTAMP} string, setting current time to #{TIMESTAMP}, original in #{TIMESTAMP_FAILURE_FIELD} field", :value => o.inspect, :exception => e.message)
-    end
-
-    @data["tags"] ||= []
-    @data["tags"] << TIMESTAMP_FAILURE_TAG unless @data["tags"].include?(TIMESTAMP_FAILURE_TAG)
-    @data[TIMESTAMP_FAILURE_FIELD] = o
-
-    LogStash::Timestamp.now
-  end
-
-  public
-  def to_hash_with_metadata
-    @metadata.empty? ? to_hash : to_hash.merge(METADATA => @metadata)
-  end
-
-  public
-  def to_json_with_metadata(*args)
-    # ignore arguments to respect accepted to_json method signature
-    LogStash::Json.dump(to_hash_with_metadata)
-  end # def to_json
-
-  def self.validate_value(value)
-    case value
-    when String
-      raise("expected UTF-8 encoding for value=#{value}, encoding=#{value.encoding.inspect}") unless value.encoding == Encoding::UTF_8
-      raise("invalid UTF-8 encoding for value=#{value}, encoding=#{value.encoding.inspect}") unless value.valid_encoding?
-      value
-    when Array
-      value.each{|v| validate_value(v)} # don't map, return original object
-      value
-    else
-      value
-    end
-  end
-
-end # class LogStash::Event