logstash-core 7.5.1-java → 7.5.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 756c0e499f413c9abe6d5abb1f0525aac99667ee6a04ae1d0fd56d7c60e9a31a
-  data.tar.gz: f132194d43addcbd27e7bd9a7ac851441cd28070af0798e0a6fad9417a3baf25
+  metadata.gz: 56e5fd3d10f5c62d82169fa91cca236337aacfe3935e631a466dd714f30d6430
+  data.tar.gz: 6c5f1b41c256f31050b8458dd529df41ef6d9f5e4eec2f1fd97608f128e5d839
 SHA512:
-  metadata.gz: 6f337f1b1f0eb5e3d663afeae860db418fec5d261e59d8a6ae3b6baf9865d79e0d3715918c58cf923ac2d9895fbe1e4b1c477a3f522994cd7fa3af994ae3ccda
-  data.tar.gz: 93caa27c18905b0a5073b74d732276ea63c6421c579c973a1f350e415bfe1de3d7901080ba0dd76e60402412c53fb1aa05e8ccea88b7f049bd6798f4952c878c
+  metadata.gz: b3800c188c11e0988c3c3e68edee3ff405c0f3f0ceb2d7cbfed8284650d15074ee355eb68f59d390ace8804ded4adc0a0ccd9f7b2966f01c1cdea67243971602
+  data.tar.gz: 107be1d79cb1d8914a48c24bc2f78f69c0839e1eab49b1a8cf1272031d3ea609345a5a58bd2b140494660d2b45006de7b77943fc9b25a55fb390631ef9060864

data/lib/logstash/java_pipeline.rb

@@ -244,18 +244,28 @@ module LogStash; class JavaPipeline < JavaBasePipeline
 
       filter_queue_client.set_batch_dimensions(batch_size, batch_delay)
 
-      pipeline_workers.times do |t|
+      # First launch WorkerLoop initialization in separate threads which concurrently
+      # compiles and initializes the worker pipelines
+
+      worker_loops = pipeline_workers.times
+        .map { Thread.new { init_worker_loop } }
+        .map(&:value)
+
+      fail("Some worker(s) were not correctly initialized") if worker_loops.any?{|v| v.nil?}
+
+      # Once all WorkerLoop have been initialized run them in separate threads
+
+      worker_loops.each_with_index do |worker_loop, t|
         thread = Thread.new do
           Util.set_thread_name("[#{pipeline_id}]>worker#{t}")
           ThreadContext.put("pipeline.id", pipeline_id)
-          org.logstash.execution.WorkerLoop.new(
-              lir_execution, filter_queue_client, @events_filtered, @events_consumed,
-              @flushRequested, @flushing, @shutdownRequested, @drain_queue).run
+          worker_loop.run
         end
         @worker_threads << thread
       end
 
-      # inputs should be started last, after all workers
+      # Finally inputs should be started last, after all workers have been initialized and started
+
       begin
         start_inputs
       rescue => e
@@ -470,6 +480,26 @@ module LogStash; class JavaPipeline < JavaBasePipeline
 
   private
 
+  # @return [WorkerLoop] a new WorkerLoop instance or nil upon construction exception
+  def init_worker_loop
+    begin
+      org.logstash.execution.WorkerLoop.new(
+        lir_execution,
+        filter_queue_client,
+        @events_filtered,
+        @events_consumed,
+        @flushRequested,
+        @flushing,
+        @shutdownRequested,
+        @drain_queue)
+    rescue => e
+      @logger.error(
+        "Worker loop initialization error",
+        default_logging_keys(:error => e.message, :exception => e.class, :stacktrace => e.backtrace.join("\n")))
+      nil
+    end
+  end
+
   def maybe_setup_out_plugins
     if @outputs_registered.make_true
       register_plugins(outputs)

data/lib/logstash/util.rb

@@ -11,10 +11,8 @@ module LogStash::Util
   def self.set_thread_name(name)
     previous_name = Java::java.lang.Thread.currentThread.getName() if block_given?
 
-    if RUBY_ENGINE == "jruby"
-      # Keep java and ruby thread names in sync.
-      Java::java.lang.Thread.currentThread.setName(name)
-    end
+    # Keep java and ruby thread names in sync.
+    Java::java.lang.Thread.currentThread.setName(name)
     Thread.current[:name] = name
 
     if UNAME == "linux"
@@ -37,18 +35,10 @@ module LogStash::Util
     Thread.current[:plugin] = plugin
   end
 
-  def self.get_thread_id(thread)
-    if RUBY_ENGINE == "jruby"
-      JRuby.reference(thread).native_thread.id
-    else
-      raise Exception.new("Native thread IDs aren't supported outside of JRuby")
-    end
-  end
-
   def self.thread_info(thread)
     # When the `thread` is dead, `Thread#backtrace` returns `nil`; fall back to an empty array.
     backtrace = (thread.backtrace || []).map do |line|
-      line.gsub(LogStash::Environment::LOGSTASH_HOME, "[...]")
+      line.sub(LogStash::Environment::LOGSTASH_HOME, "[...]")
     end
 
     blocked_on = case backtrace.first
@@ -58,7 +48,7 @@ module LogStash::Util
                  end
 
     {
-      "thread_id" => get_thread_id(thread),
+      "thread_id" => get_thread_id(thread), # might be nil for dead threads
       "name" => thread[:name],
       "plugin" => (thread[:plugin] ? thread[:plugin].debug_info : nil),
       "backtrace" => backtrace,

data/spec/logstash/util_spec.rb

@@ -67,4 +67,24 @@ describe LogStash::Util do
       end
     end
   end
+
+  describe ".get_thread_id" do
+    it "returns native identifier" do
+      thread_id = LogStash::Util.get_thread_id(Thread.current)
+      expect( thread_id ).to be_a Integer
+      expect( thread_id ).to eq(java.lang.Thread.currentThread.getId)
+    end
+
+    context "when a (native) thread is collected" do
+      let(:dead_thread) { Thread.new { 42 }.tap { |t| sleep(0.01) while t.status } }
+
+      it "returns nil as id" do
+        thread = dead_thread
+        p thread if $VERBOSE
+        2.times { java.lang.System.gc || sleep(0.01) } # we're assuming a full-gc to clear all weak-refs
+        # NOTE: if you notice this spec failing - remote it (a java.lang.Thread weak-ref might stick around)
+        expect(LogStash::Util.get_thread_id(thread)).to be nil
+      end
+    end
+  end
 end

data/versions-gem-copy.yml

@@ -1,7 +1,7 @@
 ---
 # alpha and beta qualifiers are now added via VERSION_QUALIFIER environment var
-logstash: 7.5.1
-logstash-core: 7.5.1
+logstash: 7.5.2
+logstash-core: 7.5.2
 logstash-core-plugin-api: 2.1.16
 
 # jruby must reference a *released* version of jruby which can be downloaded from the official download url
@@ -21,8 +21,8 @@ jruby:
 # Note: this file is copied to the root of logstash-core because its gemspec needs it when
 #       bundler evaluates the gemspec via bin/logstash
 # Ensure Jackson version here is kept in sync with version used by jrjackson gem
-jrjackson: 0.4.10
-jackson: 2.9.9
-jackson-databind: 2.9.9.3
+jrjackson: 0.4.11
+jackson: 2.9.10
+jackson-databind: 2.9.10.1
 
 # This is a copy the project level versions.yml into this gem's root and it is created when the gemspec is evaluated.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-core
 version: !ruby/object:Gem::Version
-  version: 7.5.1
+  version: 7.5.2
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-17 00:00:00.000000000 Z
+date: 2020-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -251,7 +251,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.10
+        version: 0.4.11
   name: jrjackson
   prerelease: false
   type: :runtime
@@ -259,7 +259,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.10
+        version: 0.4.11
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: