logstash-core 5.0.0.alpha3.snapshot5-java → 5.0.0.alpha3.snapshot6-java

data/spec/api/lib/api/node_stats_spec.rb

@@ -1,68 +1,43 @@
 # encoding: utf-8
 require_relative "../../spec_helper"
 require "sinatra"
-require "app/modules/node_stats"
+require "logstash/api/modules/node_stats"
 require "logstash/json"
 
-describe LogStash::Api::NodeStats do
-
+describe LogStash::Api::Modules::NodeStats do
   include Rack::Test::Methods
+  extend ResourceDSLMethods
 
-  def app()
+  def app() # Used by Rack::Test::Methods
     described_class
   end
 
-  let(:payload) { LogStash::Json.load(last_response.body) }
-
-  context "#root" do
-
-    before(:all) do
-      do_request { get "/" }
-    end
-
-    it "respond OK" do
-      expect(last_response).to be_ok
-    end
-
-    ["events", "jvm"].each do |key|
-      it "contains #{key} information" do
-        expect(payload).to include(key)
-      end
-    end
-  end
-
-  context "#events" do
-
-    let(:payload) { LogStash::Json.load(last_response.body) }
-
-    before(:all) do
-      do_request { get "/events" }
-    end
-
-    it "respond OK" do
-      expect(last_response).to be_ok
-    end
-
-    it "contains events information" do
-      expect(payload).to include("events")
-    end
-  end
-
-  context "#jvm" do
-
-    let(:payload) { LogStash::Json.load(last_response.body) }
-
-    before(:all) do
-      do_request { get "/jvm" }
-    end
-
-    it "respond OK" do
-      expect(last_response).to be_ok
-    end
-
-    it "contains memory information" do
-      expect(payload).to include("mem")
-    end
-  end
-
+  # DSL describing response structure
+  root_structure = {
+    "events"=>{
+      "in"=>Numeric,
+      "filtered"=>Numeric,
+      "out"=>Numeric
+    },
+    "jvm"=>{
+      "threads"=>{
+        "count"=>Numeric,
+        "peak_count"=>Numeric
+      }
+    },
+    "process"=>{
+      "peak_open_file_descriptors"=>Numeric,
+      "max_file_descriptors"=>Numeric,
+      "open_file_descriptors"=>Numeric,
+      "mem"=>{
+        "total_virtual_in_bytes"=>Numeric
+      },
+      "cpu"=>{
+        "total_in_millis"=>Numeric,
+        "percent"=>Numeric
+      }
+    }
+  }
+
+  test_api_and_resources(root_structure)
 end

data/spec/api/lib/api/plugins_spec.rb

@@ -1,10 +1,10 @@
 # encoding: utf-8
 require_relative "../../spec_helper"
 require "sinatra"
-require "app/modules/plugins"
+require "logstash/api/modules/plugins"
 require "logstash/json"
 
-describe LogStash::Api::Plugins do
+describe LogStash::Api::Modules::Plugins do
 
   include Rack::Test::Methods
 

data/spec/api/lib/api/root_spec.rb

@@ -1,10 +1,10 @@
 # encoding: utf-8
 require_relative "../../spec_helper"
 require "sinatra"
-require "app/root"
+require "logstash/api/modules/root"
 require "logstash/json"
 
-describe LogStash::Api::Root do
+describe LogStash::Api::Modules::Root do
 
   include Rack::Test::Methods
 

data/spec/api/lib/api/support/resource_dsl_methods.rb

@@ -0,0 +1,47 @@
+module ResourceDSLMethods
+  # Convert a nested hash to a mapping of key paths to expected classes
+  def hash_to_mapping(h, path=[], mapping={})
+    h.each do |k,v|
+      if v.is_a?(Hash)
+        hash_to_mapping(v, path + [k], mapping)
+      else
+        full_path = path + [k]
+        mapping[full_path] = v
+      end
+    end
+    mapping
+  end
+
+  def test_api(expected, path)
+    context "GET #{path}" do
+      let(:payload) { LogStash::Json.load(last_response.body) }
+      
+      before(:all) do
+        do_request { get path }
+      end      
+      
+      it "should respond OK" do
+        expect(last_response).to be_ok
+      end
+      
+      hash_to_mapping(expected).each do |path,klass|
+        dotted = path.join(".")
+        
+        it "should set '#{dotted}' to be a '#{klass}'" do
+          path_value = path.reduce(payload) {|acc,v| acc[v]}
+          expect(path_value).to be_a(klass), "could not find '#{dotted}' in #{payload}"
+        end
+      end
+    end
+
+    yield if block_given? # Add custom expectations
+  end
+
+  def test_api_and_resources(expected)
+    test_api(expected, "/")
+
+    expected.keys.each do |key|
+      test_api({key => expected[key]}, "/#{key}")
+    end
+  end
+end

data/spec/api/lib/commands/stats.rb

@@ -0,0 +1,47 @@
+# encoding: utf-8
+require_relative "../../spec_helper"
+
+describe LogStash::Api::Commands::Stats do
+
+  let(:report_method) { :run }
+  subject(:report) { do_request { report_class.new.send(report_method) } }
+
+  let(:report_class) { described_class }
+
+  describe "#events" do
+    let(:report_method) { :events }
+
+    it "return events information" do
+      expect(report.keys).to include(:in, :filtered, :out)
+    end
+  end
+  
+  describe "#hot_threads" do
+    let(:report_method) { :hot_threads }
+    
+    it "should return hot threads information as a string" do
+      expect(report.to_s).to be_a(String)
+    end
+
+    it "should return hot threads info as a hash" do
+      expect(report.to_hash).to be_a(Hash)
+    end
+  end
+
+  describe "memory stats" do
+    let(:report_method) { :memory }
+      
+    it "return hot threads information" do
+      expect(report).not_to be_empty
+    end
+
+    it "return heap information" do
+      expect(report.keys).to include(:heap_used_in_bytes)
+    end
+
+    it "return non heap information" do
+      expect(report.keys).to include(:non_heap_used_in_bytes)
+    end
+
+  end
+end

data/spec/api/spec_helper.rb

@@ -2,16 +2,13 @@
 API_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "lib", "logstash", "api"))
 
 require "logstash/devutils/rspec/spec_helper"
+require "api/lib/api/support/resource_dsl_methods"
 
 require "logstash/settings"
 require 'rack/test'
 require 'rspec'
 require "json"
 
-ENV['RACK_ENV'] = 'test'
-
-Rack::Builder.parse_file(File.join(API_ROOT, 'init.ru'))
-
 def read_fixture(name)
   path = File.join(File.dirname(__FILE__), "fixtures", name)
   File.read(path)
@@ -80,7 +77,7 @@ end
 
 ##
 # Method used to wrap up a request in between of a running
-# pipeline, this makes the hole execution model easier and
+# pipeline, this makes the whole execution model easier and
 # more contained as some threads might go wild.
 ##
 def do_request(&block)

data/spec/logstash/agent_spec.rb

@@ -373,7 +373,7 @@ describe LogStash::Agent do
       @t.join
     end
 
-    it "resets the metric collector" do
+    xit "resets the metric collector" do
       # We know that the store has more events coming in.
       sleep(0.01) while dummy_output.events.size < new_config_generator_counter
       snapshot = LogStash::Instrument::Collector.instance.snapshot_metric

data/spec/logstash/instrument/periodic_poller/jvm_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+require 'logstash/instrument/periodic_poller/jvm'
+
+describe LogStash::Instrument::PeriodicPoller::JVM do
+  let(:metric) { LogStash::Instrument::Metric.new }
+  let(:options) { {} }
+  subject(:jvm) { described_class.new(metric, options) }
+  
+  it "should initialize cleanly" do
+    expect { jvm }.not_to raise_error
+  end
+
+  describe "collections" do
+    subject(:collection) { jvm.collect }
+    
+    it "should run cleanly" do
+      expect { collection }.not_to raise_error
+    end
+
+    describe "metrics" do
+      let(:snapshot_store) { metric.collector.snapshot_metric.metric_store }
+      subject(:jvm_metrics) { snapshot_store.get_shallow(:jvm, :process) }
+
+      # Make looking up metric paths easy when given varargs of keys
+      # e.g. mval(:parent, :child)
+      def mval(*metric_path)
+        metric_path.reduce(jvm_metrics) {|acc,k| acc[k]}.value
+      end          
+
+      [
+        :max_file_descriptors,
+        :open_file_descriptors,
+        :peak_open_file_descriptors,
+        [:mem, :total_virtual_in_bytes],
+        [:cpu, :total_in_millis],
+        [:cpu, :percent]
+      ].each do |path|
+        path = Array(path)
+        it "should have a value for #{path} that is Numeric" do
+          expect(mval(*path)).to be_a(Numeric)
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: logstash-core
 version: !ruby/object:Gem::Version
-  version: 5.0.0.alpha3.snapshot5
+  version: 5.0.0.alpha3.snapshot6
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-05-26 00:00:00.000000000 Z
+date: 2016-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.alpha3.snapshot5
+        version: 5.0.0.alpha3.snapshot6
   name: logstash-core-event-java
   prerelease: false
   type: :runtime
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.alpha3.snapshot5
+        version: 5.0.0.alpha3.snapshot6
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -147,10 +147,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.16'
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.16.0
+        version: 3.4.0
   name: puma
   prerelease: false
   type: :runtime
@@ -158,10 +155,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.16'
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.16.0
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -195,15 +189,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.1
-  name: jruby-monitoring
+        version: 0.4.2
+  name: jrmonitor
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -299,23 +293,20 @@ files:
 - lib/logstash-core/logstash-core.rb
 - lib/logstash-core/version.rb
 - lib/logstash/agent.rb
-- lib/logstash/api/init.ru
-- lib/logstash/api/lib/app.rb
-- lib/logstash/api/lib/app/command.rb
-- lib/logstash/api/lib/app/command_factory.rb
-- lib/logstash/api/lib/app/commands/stats/events_command.rb
-- lib/logstash/api/lib/app/commands/stats/hotthreads_command.rb
-- lib/logstash/api/lib/app/commands/stats/memory_command.rb
-- lib/logstash/api/lib/app/commands/system/basicinfo_command.rb
-- lib/logstash/api/lib/app/commands/system/plugins_command.rb
-- lib/logstash/api/lib/app/modules/node.rb
-- lib/logstash/api/lib/app/modules/node_stats.rb
-- lib/logstash/api/lib/app/modules/plugins.rb
-- lib/logstash/api/lib/app/modules/stats.rb
-- lib/logstash/api/lib/app/root.rb
-- lib/logstash/api/lib/app/service.rb
-- lib/logstash/api/lib/app/stats.rb
-- lib/logstash/api/lib/helpers/app_helpers.rb
+- lib/logstash/api/app_helpers.rb
+- lib/logstash/api/command_factory.rb
+- lib/logstash/api/commands/base.rb
+- lib/logstash/api/commands/stats.rb
+- lib/logstash/api/commands/system/basicinfo_command.rb
+- lib/logstash/api/commands/system/plugins_command.rb
+- lib/logstash/api/modules/base.rb
+- lib/logstash/api/modules/node.rb
+- lib/logstash/api/modules/node_stats.rb
+- lib/logstash/api/modules/plugins.rb
+- lib/logstash/api/modules/root.rb
+- lib/logstash/api/modules/stats.rb
+- lib/logstash/api/rack_app.rb
+- lib/logstash/api/service.rb
 - lib/logstash/codecs/base.rb
 - lib/logstash/config/config_ast.rb
 - lib/logstash/config/cpu_core_strategy.rb
@@ -383,6 +374,7 @@ files:
 - lib/logstash/util/prctl.rb
 - lib/logstash/util/retryable.rb
 - lib/logstash/util/socket_peer.rb
+- lib/logstash/util/thread_dump.rb
 - lib/logstash/util/unicode_trimmer.rb
 - lib/logstash/util/worker_threads_default_printer.rb
 - lib/logstash/util/wrapped_synchronous_queue.rb
@@ -394,9 +386,8 @@ files:
 - spec/api/lib/api/node_stats_spec.rb
 - spec/api/lib/api/plugins_spec.rb
 - spec/api/lib/api/root_spec.rb
-- spec/api/lib/api/stats_spec.rb
-- spec/api/lib/commands/events_spec.rb
-- spec/api/lib/commands/jvm_spec.rb
+- spec/api/lib/api/support/resource_dsl_methods.rb
+- spec/api/lib/commands/stats.rb
 - spec/api/spec_helper.rb
 - spec/conditionals_spec.rb
 - spec/logstash/agent_spec.rb
@@ -417,6 +408,7 @@ files:
 - spec/logstash/instrument/metric_type/gauge_spec.rb
 - spec/logstash/instrument/namespaced_metric_spec.rb
 - spec/logstash/instrument/null_metric_spec.rb
+- spec/logstash/instrument/periodic_poller/jvm_spec.rb
 - spec/logstash/java_integration_spec.rb
 - spec/logstash/json_spec.rb
 - spec/logstash/output_delegator_spec.rb
@@ -470,9 +462,8 @@ test_files:
 - spec/api/lib/api/node_stats_spec.rb
 - spec/api/lib/api/plugins_spec.rb
 - spec/api/lib/api/root_spec.rb
-- spec/api/lib/api/stats_spec.rb
-- spec/api/lib/commands/events_spec.rb
-- spec/api/lib/commands/jvm_spec.rb
+- spec/api/lib/api/support/resource_dsl_methods.rb
+- spec/api/lib/commands/stats.rb
 - spec/api/spec_helper.rb
 - spec/conditionals_spec.rb
 - spec/logstash/agent_spec.rb
@@ -493,6 +484,7 @@ test_files:
 - spec/logstash/instrument/metric_type/gauge_spec.rb
 - spec/logstash/instrument/namespaced_metric_spec.rb
 - spec/logstash/instrument/null_metric_spec.rb
+- spec/logstash/instrument/periodic_poller/jvm_spec.rb
 - spec/logstash/java_integration_spec.rb
 - spec/logstash/json_spec.rb
 - spec/logstash/output_delegator_spec.rb