logstash-output-scalyr 0.1.21.beta → 0.1.22.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7dd0297a3ddf2f2acfdad08c410822b8a4ee808800e3cfeffc5df4ec8a991348
-  data.tar.gz: 855b7e3a655656442cf3de76e15ad3d0f90ca460421d4a4f86df46056a4b05a9
+  metadata.gz: 8ea703e55bc28d2bb00445c2a3e2d822bfe978bbe889292caafa6265dff1de2b
+  data.tar.gz: 3dc35cf36a356e5651d69e1a7d4623f296e5818a4b1c0fc8965b1a55b94a20ab
 SHA512:
-  metadata.gz: 8c3024576c03a088008c5b1acc54d02be67be701921392d91f5991ac4482f85f62ea3b07255e38a972735182feccb1520d558f5cb065538dabe35cc86e1ad719
-  data.tar.gz: c807baca5797bbf47cf69c8816a40300a515162617d4a714e719673572f1fe29fe3fa9ab73fd51a711af3953e212bd3dfe998e73c2c6de574a64ba6121446989
+  metadata.gz: 9306c619ce51c8a9cf83cb545229d4c73ac496a133e07e7e55b434301e1efc2f668187c3aa1584997ab1252ce3c7510ac9c4d719ba363933160bf2f874d0a137
+  data.tar.gz: 621b8f9b4095f16e51b88b8aec2844d795de75cba980ba27e0510a04f57ee9e4b34eb42513455d7509acaa8af8e085febb92cd248401e642129e09d70987a476

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Beta
 
+## 0.1.22.beta
+- Add new plugin metric for tracking the duration of ``build_multi_event_request_array`` method.
+- Update internal dependencies (``manticore``) to latest stable version.
+
 ## 0.1.21.beta
 - Fix issue with iterative flattening function when dealing with empty collections.
 

data/Gemfile

@@ -16,5 +16,5 @@ end
 
 gem 'pry'
 gem 'pry-nav'
-gem 'quantile'
-gem 'manticore', platform: :jruby
+gem 'quantile', '~> 0.2.1'
+gem 'manticore', '~> 0.7.1', platform: :jruby

data/README.md

@@ -10,7 +10,7 @@ You can view documentation for this plugin [on the Scalyr website](https://app.s
 # Quick start
 
 1. Build the gem, run `gem build logstash-output-scalyr.gemspec` 
-2. Install the gem into a Logstash installation, run `/usr/share/logstash/bin/logstash-plugin install logstash-output-scalyr-0.1.21.beta.gem` or follow the latest official instructions on working with plugins from Logstash.
+2. Install the gem into a Logstash installation, run `/usr/share/logstash/bin/logstash-plugin install logstash-output-scalyr-0.1.22.beta.gem` or follow the latest official instructions on working with plugins from Logstash.
 3. Configure the output plugin (e.g. add it to a pipeline .conf)
 4. Restart Logstash 
 

data/lib/logstash/outputs/scalyr.rb

@@ -289,6 +289,7 @@ class LogStash::Outputs::Scalyr < LogStash::Outputs::Base
   # Convenience method to create a fresh quantile estimator
   def get_new_metrics
     return {
+      :build_multi_duration_secs => Quantile::Estimator.new,
       :multi_receive_duration_secs => Quantile::Estimator.new,
       :multi_receive_event_count => Quantile::Estimator.new,
       :event_attributes_count => Quantile::Estimator.new,
@@ -313,17 +314,25 @@ class LogStash::Outputs::Scalyr < LogStash::Outputs::Base
     return events if @noop_mode
 
     begin
+      records_count = events.to_a.length
+
+      # We also time the duration of the build_multi_event_request_array method
       start_time = Time.now.to_f
 
       multi_event_request_array = build_multi_event_request_array(events)
-      # Loop over all array of multi-event requests, sending each multi-event to Scalyr
 
+      if records_count > 0
+        @stats_lock.synchronize do
+          @plugin_metrics[:build_multi_duration_secs].observe(Time.now.to_f - start_time)
+        end
+      end
+
+      # Loop over all array of multi-event requests, sending each multi-event to Scalyr
       sleep_interval = @retry_initial_interval
       batch_num = 1
       total_batches = multi_event_request_array.length unless multi_event_request_array.nil?
 
       result = []
-      records_count = events.to_a.length
 
       while !multi_event_request_array.to_a.empty?
         multi_event_request = multi_event_request_array.pop
@@ -816,6 +825,10 @@ class LogStash::Outputs::Scalyr < LogStash::Outputs::Base
     @stats_lock.synchronize do
       current_stats = @multi_receive_statistics.clone
 
+      current_stats[:build_multi_duration_secs_p50] = @plugin_metrics[:build_multi_duration_secs].query(0.5)
+      current_stats[:build_multi_duration_secs_p90] = @plugin_metrics[:build_multi_duration_secs].query(0.9)
+      current_stats[:build_multi_duration_secs_p99] = @plugin_metrics[:build_multi_duration_secs].query(0.99)
+
       current_stats[:multi_receive_duration_p50] = @plugin_metrics[:multi_receive_duration_secs].query(0.5)
       current_stats[:multi_receive_duration_p90] = @plugin_metrics[:multi_receive_duration_secs].query(0.9)
       current_stats[:multi_receive_duration_p99] = @plugin_metrics[:multi_receive_duration_secs].query(0.99)

data/lib/scalyr/constants.rb

@@ -1,2 +1,2 @@
 # encoding: utf-8
-PLUGIN_VERSION = "v0.1.21.beta"
+PLUGIN_VERSION = "v0.1.22.beta"

data/logstash-output-scalyr.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-output-scalyr'
-  s.version         = '0.1.21.beta'
+  s.version         = '0.1.22.beta'
   s.licenses = ['Apache-2.0']
   s.summary = "Scalyr output plugin for Logstash"
   s.description     = "Sends log data collected by Logstash to Scalyr (https://www.scalyr.com)"

data/spec/logstash/outputs/scalyr_integration_spec.rb

@@ -7,6 +7,12 @@ require "json"
 require 'webmock/rspec'
 WebMock.allow_net_connect!
 
+RSpec.configure do |rspec|
+  rspec.expect_with :rspec do |c|
+    c.max_formatted_output_length = nil
+  end
+end
+
 describe LogStash::Outputs::Scalyr do
   let(:sample_events) {
     events = []
@@ -58,7 +64,7 @@ describe LogStash::Outputs::Scalyr do
                 {
                   :error_class=>"Manticore::UnknownException",
                   :batch_num=>1,
-                  :message=>"Unexpected error: java.security.InvalidAlgorithmParameterException: the trustAnchors parameter must be non-empty",
+                  :message=>"java.lang.RuntimeException: Unexpected error: java.security.InvalidAlgorithmParameterException: the trustAnchors parameter must be non-empty",
                   :payload_size=>781,
                   :record_count=>3,
                   :total_batches=>1,
@@ -84,7 +90,7 @@ describe LogStash::Outputs::Scalyr do
                 {
                   :error_class=>"Manticore::UnknownException",
                   :batch_num=>1,
-                  :message=>"Unexpected error: java.security.InvalidAlgorithmParameterException: the trustAnchors parameter must be non-empty",
+                  :message=>"java.lang.RuntimeException: Unexpected error: java.security.InvalidAlgorithmParameterException: the trustAnchors parameter must be non-empty",
                   :payload_size=>781,
                   :record_count=>3,
                   :total_batches=>1,

data/spec/logstash/outputs/scalyr_spec.rb

@@ -80,6 +80,7 @@ describe LogStash::Outputs::Scalyr do
         plugin1.instance_variable_set(:@client_session, mock_client_session)
         plugin1.instance_variable_set(:@session_id, "some_session_id")
         plugin1.instance_variable_set(:@plugin_metrics, {
+          :build_multi_duration_secs => Quantile::Estimator.new,
           :multi_receive_duration_secs => Quantile::Estimator.new,
           :multi_receive_event_count => Quantile::Estimator.new,
           :event_attributes_count =>  Quantile::Estimator.new,
@@ -87,10 +88,11 @@ describe LogStash::Outputs::Scalyr do
           :batches_per_multi_receive => Quantile::Estimator.new
         })
         plugin1.instance_variable_get(:@plugin_metrics)[:multi_receive_duration_secs].observe(1)
+        plugin1.instance_variable_get(:@plugin_metrics)[:build_multi_duration_secs].observe(1)
         plugin1.instance_variable_set(:@multi_receive_statistics, {:total_multi_receive_secs => 0})
 
         status_event = plugin1.send_status
-        expect(status_event[:attrs]["message"]).to eq("plugin_status: total_requests_sent=20 total_requests_failed=10 total_request_bytes_sent=100 total_compressed_request_bytes_sent=50 total_response_bytes_received=100 total_request_latency_secs=100 total_serialization_duration_secs=100.5000 total_compression_duration_secs=10.2000 compression_type=deflate compression_level=9 total_multi_receive_secs=0 multi_receive_duration_p50=1 multi_receive_duration_p90=1 multi_receive_duration_p99=1 multi_receive_event_count_p50=0 multi_receive_event_count_p90=0 multi_receive_event_count_p99=0 event_attributes_count_p50=0 event_attributes_count_p90=0 event_attributes_count_p99=0 batches_per_multi_receive_p50=0 batches_per_multi_receive_p90=0 batches_per_multi_receive_p99=0")
+        expect(status_event[:attrs]["message"]).to eq("plugin_status: total_requests_sent=20 total_requests_failed=10 total_request_bytes_sent=100 total_compressed_request_bytes_sent=50 total_response_bytes_received=100 total_request_latency_secs=100 total_serialization_duration_secs=100.5000 total_compression_duration_secs=10.2000 compression_type=deflate compression_level=9 total_multi_receive_secs=0 build_multi_duration_secs_p50=1 build_multi_duration_secs_p90=1 build_multi_duration_secs_p99=1 multi_receive_duration_p50=1 multi_receive_duration_p90=1 multi_receive_duration_p99=1 multi_receive_event_count_p50=0 multi_receive_event_count_p90=0 multi_receive_event_count_p99=0 event_attributes_count_p50=0 event_attributes_count_p90=0 event_attributes_count_p99=0 batches_per_multi_receive_p50=0 batches_per_multi_receive_p90=0 batches_per_multi_receive_p99=0")
       end
 
       it "returns and sends correct status event on send_stats on initial and subsequent send" do
@@ -106,6 +108,7 @@ describe LogStash::Outputs::Scalyr do
         plugin.instance_variable_set(:@client_session, mock_client_session)
         # Setup one quantile calculation to make sure at least one of them calculates as expected
         plugin.instance_variable_set(:@plugin_metrics, {
+          :build_multi_duration_secs => Quantile::Estimator.new,
           :multi_receive_duration_secs => Quantile::Estimator.new,
           :multi_receive_event_count => Quantile::Estimator.new,
           :event_attributes_count =>  Quantile::Estimator.new,
@@ -119,12 +122,13 @@ describe LogStash::Outputs::Scalyr do
 
         plugin.instance_variable_set(:@multi_receive_statistics, {:total_multi_receive_secs => 0})
         status_event = plugin.send_status
-        expect(status_event[:attrs]["message"]).to eq("plugin_status: total_requests_sent=20 total_requests_failed=10 total_request_bytes_sent=100 total_compressed_request_bytes_sent=50 total_response_bytes_received=100 total_request_latency_secs=100 total_serialization_duration_secs=100.5000 total_compression_duration_secs=10.2000 compression_type=deflate compression_level=9 total_multi_receive_secs=0 multi_receive_duration_p50=10 multi_receive_duration_p90=18 multi_receive_duration_p99=19 multi_receive_event_count_p50=0 multi_receive_event_count_p90=0 multi_receive_event_count_p99=0 event_attributes_count_p50=0 event_attributes_count_p90=0 event_attributes_count_p99=0 batches_per_multi_receive_p50=0 batches_per_multi_receive_p90=0 batches_per_multi_receive_p99=0 flatten_values_duration_secs_p50=0 flatten_values_duration_secs_p90=0 flatten_values_duration_secs_p99=0")
+        expect(status_event[:attrs]["message"]).to eq("plugin_status: total_requests_sent=20 total_requests_failed=10 total_request_bytes_sent=100 total_compressed_request_bytes_sent=50 total_response_bytes_received=100 total_request_latency_secs=100 total_serialization_duration_secs=100.5000 total_compression_duration_secs=10.2000 compression_type=deflate compression_level=9 total_multi_receive_secs=0 build_multi_duration_secs_p50=0 build_multi_duration_secs_p90=0 build_multi_duration_secs_p99=0 multi_receive_duration_p50=10 multi_receive_duration_p90=18 multi_receive_duration_p99=19 multi_receive_event_count_p50=0 multi_receive_event_count_p90=0 multi_receive_event_count_p99=0 event_attributes_count_p50=0 event_attributes_count_p90=0 event_attributes_count_p99=0 batches_per_multi_receive_p50=0 batches_per_multi_receive_p90=0 batches_per_multi_receive_p99=0 flatten_values_duration_secs_p50=0 flatten_values_duration_secs_p90=0 flatten_values_duration_secs_p99=0")
       end
 
       it "send_stats is called when events list is empty, but otherwise is noop" do
         quantile_estimator = Quantile::Estimator.new
         plugin.instance_variable_set(:@plugin_metrics, {
+          :build_multi_duration_secs => Quantile::Estimator.new,
           :multi_receive_duration_secs => Quantile::Estimator.new,
           :multi_receive_event_count => Quantile::Estimator.new,
           :event_attributes_count => Quantile::Estimator.new,
@@ -149,6 +153,7 @@ describe LogStash::Outputs::Scalyr do
         mock_client_session = MockClientSession.new
         quantile_estimator = Quantile::Estimator.new
         plugin2.instance_variable_set(:@plugin_metrics, {
+          :build_multi_duration_secs => Quantile::Estimator.new,
           :multi_receive_duration_secs => Quantile::Estimator.new,
           :multi_receive_event_count => Quantile::Estimator.new,
           :event_attributes_count => Quantile::Estimator.new,
@@ -174,6 +179,7 @@ describe LogStash::Outputs::Scalyr do
         plugin.instance_variable_set(:@last_status_transmit_time, 100)
         plugin.instance_variable_set(:@client_session, mock_client_session)
         plugin.instance_variable_set(:@plugin_metrics, {
+          :build_multi_duration_secs => Quantile::Estimator.new,
           :multi_receive_duration_secs => Quantile::Estimator.new,
           :multi_receive_event_count => Quantile::Estimator.new,
           :event_attributes_count =>  Quantile::Estimator.new,

data/vendor/bundle/jruby/2.5.0/bin/htmldiff

@@ -1,6 +1,6 @@
 #!/bin/sh
 'exec' "jruby" '-x' "$0" "$@"
-#!/Users/yans/.rvm/rubies/jruby-9.2.9.0/bin/jruby
+#!/Users/tomaz/.rvm/rubies/jruby-9.2.9.0/bin/jruby
 #
 # This file was generated by RubyGems.
 #

data/vendor/bundle/jruby/2.5.0/bin/ldiff

@@ -1,6 +1,6 @@
 #!/bin/sh
 'exec' "jruby" '-x' "$0" "$@"
-#!/Users/yans/.rvm/rubies/jruby-9.2.9.0/bin/jruby
+#!/Users/tomaz/.rvm/rubies/jruby-9.2.9.0/bin/jruby
 #
 # This file was generated by RubyGems.
 #

data/vendor/bundle/jruby/2.5.0/gems/{manticore-0.6.4-java → manticore-0.7.1-java}/CHANGELOG.md

@@ -1,8 +1,17 @@
-## v0.6
+## v0.7
+
+### v0.7.1
+
+* Don't override certificates with same Subject (#93)
+* Set Java cause for ManticoreException types (#96)
+* Fix SSL handshake hang indefinitely (#98)
 
-### v0.6.5
+### v0.7.0
 
-(unreleased)
+* Drop support for JRuby 1.7. It probably still works, but we don't test against it anymore
+* Fix a thread safety issue with regards to adding requests to the parallel execution queue while the client is already processing a queue (#80)
+
+## v0.6
 
 ### v0.6.4
 

data/vendor/bundle/jruby/2.5.0/gems/{manticore-0.6.4-java → manticore-0.7.1-java}/Gemfile

@@ -8,8 +8,9 @@ group :development, :test do
   gem "rspec", "~> 3.0"
   gem "rspec-its"
   gem "httpclient", "~> 2.3"
-  gem "rack", "~> 1.5"
+  gem "rack", ">= 2.1.4"
   gem "rake-compiler"
   gem "gserver"
   gem "simplecov"
+  gem "json"
 end

data/vendor/bundle/jruby/2.5.0/gems/{manticore-0.6.4-java → manticore-0.7.1-java}/README.md

@@ -90,7 +90,11 @@ For detailed documentation, see the [full Manticore::Client documentation](http:
 Rather than using the Facade, you can create your own standalone Client instances. When you create a `Client`, you will pass various parameters that it will use to set up the pool.
 
 ```ruby
-client = Manticore::Client.new(request_timeout: 5, connect_timeout: 5, socket_timeout: 5, pool_max: 10, pool_max_per_route: 2)
+client = Manticore::Client.new(request_timeout: 5,
+                               connect_timeout: 5,
+                               socket_timeout: 5,
+                               pool_max: 10,
+                               pool_max_per_route: 2)
 ```
 
 Then, you can make requests from the client. Pooling and route maximum constraints are automatically managed:
@@ -122,11 +126,20 @@ per-route concurrency limits, and other neat things. In general, you should crea
 To set this up, you might create 2 pools, each configured for the task:
 
 ```ruby
-general_http_client    = Manticore::Client.new connect_timeout: 10, socket_timeout: 10, request_timeout: 10, follow_redirects: true, max_per_route: 2
+general_http_client    = Manticore::Client.new(connect_timeout: 10,
+                                               socket_timeout: 10,
+                                               request_timeout: 10,
+                                               follow_redirects: true,
+                                               max_per_route: 2)
 # With an OpenSSL CA store
-proxied_backend_client = Manticore::Client.new proxy: "https://backend.internal:4242", ssl: {ca_file: "my_certs.pem"}
+proxied_backend_client = Manticore::Client.new(proxy: "https://backend.internal:4242",
+                                               ssl: { ca_file: "my_certs.pem" })
 # Or with a .jks truststore
-# proxied_backend_client = Manticore::Client.new proxy: "https://backend.internal:4242", ssl: {truststore: "./truststore.jks", truststore_password: "s3cr3t"}
+proxied_backend_client = Manticore::Client.new(proxy: "https://backend.internal:4242",
+                                               ssl: {
+                                                 truststore: "./truststore.jks",
+                                                 truststore_password: "s3cr3t"
+                                               })
 ```
 
 This would create 2 separate request pools; the first would be configured with generous timeouts and redirect following, and would use the system

data/vendor/bundle/jruby/2.5.0/gems/{manticore-0.6.4-java → manticore-0.7.1-java}/lib/faraday/adapter/manticore.rb

@@ -20,17 +20,12 @@ module Faraday
         ParallelManager.new
       end
 
-      def initialize(app, connection_options = {})
-        @connection_options = connection_options
-        super(app)
-      end
-
       def client(env)
         @client ||= begin
           opts = {}
           if ssl = env[:ssl].to_hash
             opts[:ssl] = {}
-            opts[:ssl][:verify] = :disable if ssl[:verify] == false
+            opts[:ssl][:verify] = ssl[:verify] unless ssl[:verify].nil?
             opts[:ssl][:ca_file] = ssl[:ca_file]
             opts[:ssl][:client_cert] = ssl[:client_cert]
             opts[:ssl][:client_key] = ssl[:client_key]

data/vendor/bundle/jruby/2.5.0/gems/{manticore-0.6.4-java → manticore-0.7.1-java}/lib/manticore/client.rb

@@ -69,10 +69,8 @@ module Manticore
     include_package "org.apache.http.client.config"
     include_package "org.apache.http.config"
     include_package "org.apache.http.conn.socket"
-    include_package "org.apache.http.impl"
     include_package "org.apache.http.impl.client"
     include_package "org.apache.http.impl.conn"
-    include_package "org.apache.http.impl.auth"
     include_package "org.apache.http.entity"
     include_package "org.apache.http.message"
     include_package "org.apache.http.params"
@@ -80,16 +78,20 @@ module Manticore
     include_package "org.apache.http.auth"
     include_package "java.util.concurrent"
     include_package "org.apache.http.client.protocol"
-    include_package "org.apache.http.conn.ssl"
     include_package "java.security.cert"
     include_package "java.security.spec"
     include_package "java.security"
-    include_package "org.apache.http.client.utils"
     java_import "org.apache.http.HttpHost"
     java_import "javax.net.ssl.SSLContext"
     java_import "org.manticore.HttpGetWithEntity"
     java_import "org.manticore.HttpDeleteWithEntity"
     java_import "org.apache.http.auth.UsernamePasswordCredentials"
+    java_import "org.apache.http.conn.ssl.SSLConnectionSocketFactory"
+    java_import "org.apache.http.conn.ssl.SSLContextBuilder"
+    java_import "org.apache.http.conn.ssl.TrustSelfSignedStrategy"
+    java_import "org.apache.http.client.utils.URIBuilder"
+    java_import "org.apache.http.impl.DefaultConnectionReuseStrategy"
+    java_import "org.apache.http.impl.auth.BasicScheme"
 
     # This is a class rather than a proc because the proc holds a closure around
     # the instance of the Client that creates it.
@@ -201,11 +203,7 @@ module Manticore
         builder.set_connection_reuse_strategy DefaultConnectionReuseStrategy.new
       end
 
-      socket_config_builder = SocketConfig.custom
-      socket_config_builder.set_so_timeout(options.fetch(:socket_timeout, DEFAULT_SOCKET_TIMEOUT) * 1000)
-      socket_config_builder.set_tcp_no_delay(options.fetch(:tcp_no_delay, true))
-      builder.set_default_socket_config socket_config_builder.build
-
+      builder.set_default_socket_config socket_config_from_options(options)
       builder.set_connection_manager pool(options)
 
       request_config = RequestConfig.custom
@@ -223,7 +221,7 @@ module Manticore
       @client = builder.build
       finalize @client, :close
       @options = options
-      @async_requests = []
+      @async_requests = Queue.new
       @stubs = {}
     end
 
@@ -334,8 +332,9 @@ module Manticore
     # @return [Array] An array of the responses from the requests executed.
     def execute!
       method = executor.java_method(:submit, [java.util.concurrent.Callable.java_class])
-      result = @async_requests.map { |r| method.call r }
-      @async_requests.clear
+
+      result = []
+      result << method.call(@async_requests.pop) until @async_requests.empty?
       result.map do |future|
         begin
           future.get
@@ -406,10 +405,19 @@ module Manticore
           cm.set_validate_after_inactivity options.fetch(:check_connection_timeout, 2_000)
           cm.set_default_max_per_route options.fetch(:pool_max_per_route, @max_pool_size)
           cm.set_max_total @max_pool_size
+          cm.set_default_socket_config socket_config_from_options(options)
+
           finalize cm, :shutdown
         end
       end
     end
+    
+    def socket_config_from_options(options)
+      socket_config_builder = SocketConfig.custom
+      socket_config_builder.set_so_timeout(options.fetch(:socket_timeout, DEFAULT_SOCKET_TIMEOUT) * 1000)
+      socket_config_builder.set_tcp_no_delay(options.fetch(:tcp_no_delay, true))
+      socket_config_builder.build
+    end
 
     def create_executor_if_needed
       return @executor if @executor
@@ -509,7 +517,7 @@ module Manticore
 
       if @use_cookies == :per_request
         store = BasicCookieStore.new
-        context.setAttribute(ClientContext.COOKIE_STORE, store)
+        context.setAttribute(ClientContext::COOKIE_STORE, store)
       end
 
       return req, context
@@ -617,7 +625,7 @@ module Manticore
         raise "Invalid value for :verify. Valid values are (:all, :browser, :default)"
       end
 
-      context = SSLContexts.custom
+      context = SSLContextBuilder.new
       setup_trust_store ssl_options, context, trust_strategy
       setup_key_store ssl_options, context
 
@@ -632,8 +640,8 @@ module Manticore
         trust_store ||= blank_keystore
         open(ssl_options[:ca_file]) do |fp|
           cert_collection = CertificateFactory.get_instance("X509").generate_certificates(fp.to_inputstream).to_a
-          cert_collection.each do |cert|
-            trust_store.set_certificate_entry(cert.getSubjectX500Principal.name, cert)
+          cert_collection.each_with_index do |cert, i|
+            trust_store.set_certificate_entry("#{i}#" + cert.getSubjectX500Principal.name, cert)
           end
         end
       end

data/vendor/bundle/jruby/2.5.0/gems/{manticore-0.6.4-java → manticore-0.7.1-java}/lib/manticore/response.rb

@@ -11,14 +11,13 @@ module Manticore
   # @!attribute [r] callback_result
   #   @return Value returned from any given on_success/response block
   class Response
-    include_package "org.apache.http.client"
-    include_package "org.apache.http.util"
-    include_package "org.apache.http.protocol"
+
+    java_import "org.apache.http.client.ResponseHandler"
     java_import "org.apache.http.client.protocol.HttpClientContext"
-    java_import "java.util.concurrent.Callable"
+    java_import "org.apache.http.protocol.ExecutionContext"
 
-    include ResponseHandler
-    include Callable
+    include org.apache.http.client.ResponseHandler
+    include java.util.concurrent.Callable
 
     attr_accessor :background
     attr_reader :context, :request, :callback_result, :called, :future
@@ -54,15 +53,16 @@ module Manticore
         ex = Manticore::ConnectTimeout
       rescue Java::JavaNet::SocketException => e
         ex = Manticore::SocketException
-      rescue Java::OrgApacheHttpClient::ClientProtocolException, Java::JavaxNetSsl::SSLHandshakeException, Java::OrgApacheHttpConn::HttpHostConnectException,
-             Java::OrgApacheHttp::NoHttpResponseException, Java::OrgApacheHttp::ConnectionClosedException => e
+      rescue Java::OrgApacheHttpClient::ClientProtocolException, Java::JavaxNetSsl::SSLHandshakeException,
+             Java::OrgApacheHttpConn::HttpHostConnectException, Java::OrgApacheHttp::NoHttpResponseException,
+             Java::OrgApacheHttp::ConnectionClosedException => e
         ex = Manticore::ClientProtocolException
       rescue Java::JavaNet::UnknownHostException => e
         ex = Manticore::ResolutionFailure
       rescue Java::JavaLang::IllegalArgumentException => e
         ex = Manticore::InvalidArgumentException
       rescue Java::JavaLang::IllegalStateException => e
-        if e.message.match(/Connection pool shut down/)
+        if (e.message || '').index('Connection pool shut down')
           ex = Manticore::ClientStoppedException
         else
           @exception = e
@@ -75,7 +75,7 @@ module Manticore
 
       # TODO: If calling async, execute_complete may fail and then silently swallow exceptions. How do we fix that?
       if ex || @exception
-        @exception ||= ex.new(e.cause || e.message)
+        @exception ||= ex.new(e)
         @handlers[:failure].call @exception
         execute_complete
         nil
@@ -90,8 +90,8 @@ module Manticore
     # @return [String]
     def final_url
       call_once
-      last_request = context.get_attribute ExecutionContext.HTTP_REQUEST
-      last_host = context.get_attribute ExecutionContext.HTTP_TARGET_HOST
+      last_request = context.get_attribute ExecutionContext::HTTP_REQUEST
+      last_host = context.get_attribute ExecutionContext::HTTP_TARGET_HOST
       host = last_host.to_uri
       url = last_request.get_uri
       URI.join(host, url.to_s)

data/vendor/bundle/jruby/2.5.0/gems/{manticore-0.6.4-java → manticore-0.7.1-java}/lib/manticore/version.rb

@@ -1,3 +1,3 @@
 module Manticore
-  VERSION = "0.6.4"
+  VERSION = "0.7.1"
 end

data/vendor/bundle/jruby/2.5.0/gems/{manticore-0.6.4-java → manticore-0.7.1-java}/lib/manticore.rb

@@ -5,7 +5,11 @@ require "cgi"
 require_relative "./manticore_jars.rb"
 require_relative "./org/manticore/manticore-ext"
 
-org.manticore.Manticore.new.load(JRuby.runtime, false)
+if defined? JRuby::Util.load_ext
+  JRuby::Util.load_ext 'org.manticore.Manticore'
+else
+  org.manticore.Manticore.new.load(JRuby.runtime, false)
+end
 
 require_relative "./manticore/version"
 
@@ -13,7 +17,27 @@ require_relative "./manticore/version"
 # with the beauty of Ruby.
 module Manticore
   # General base class for all Manticore exceptions
-  class ManticoreException < StandardError; end
+  class ManticoreException < StandardError
+    def initialize(arg = nil)
+      case arg
+      when nil
+        @_cause = nil
+        super()
+      when java.lang.Throwable
+        @_cause = arg
+        super(arg.message)
+      else
+        @_cause = nil
+        super(arg)
+      end
+    end
+
+    # @return cause which is likely to be a Java exception
+    # @overload Exception#cause
+    def cause
+      @_cause || super
+    end
+  end
 
   # Exception thrown if you attempt to read from a closed Response stream
   class StreamClosedException < ManticoreException; end

data/vendor/bundle/jruby/2.5.0/gems/{manticore-0.6.4-java → manticore-0.7.1-java}/manticore.gemspec

@@ -19,6 +19,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = '>= 2.3' # JRuby >= 9.1
+
   private_key = File.expand_path("~/.gemcert/gem-private_key.pem")
   if File.exists? private_key
     spec.signing_key = private_key
@@ -27,9 +29,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "openssl_pkcs8_pure"
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "jar-dependencies"
+  spec.add_development_dependency "jar-dependencies", "~> 0.4.1"
 
   spec.requirements << "jar org.apache.httpcomponents:httpclient, '~> 4.5.0'"
   spec.requirements << "jar org.apache.httpcomponents:httpmime,   '~> 4.5.0'"

data/vendor/bundle/jruby/2.5.0/gems/{manticore-0.6.4-java → manticore-0.7.1-java}/spec/manticore/client_spec.rb

@@ -130,7 +130,13 @@ describe Manticore::Client do
         let(:client) { Manticore::Client.new :ssl => {:verify => :strict} }
 
         it "breaks on SSL validation errors" do
-          expect { client.get("https://localhost:55444/").call }.to raise_exception(Manticore::ClientProtocolException)
+          begin
+            client.get("https://localhost:55445/").body
+          rescue Manticore::ClientProtocolException => e
+            expect( e.cause ).to be_a javax.net.ssl.SSLHandshakeException
+          else
+            fail "exception not raised"
+          end
         end
       end
 
@@ -563,7 +569,7 @@ describe Manticore::Client do
   describe "#head" do
     it "works" do
       response = client.head(local_server)
-      expect(JSON.load(response.body)).to be_nil
+      expect(response.body).to be_nil
     end
   end
 
@@ -830,7 +836,13 @@ describe Manticore::Client do
     let(:client) { Manticore::Client.new request_timeout: 1, connect_timeout: 1, socket_timeout: 1 }
 
     it "times out" do
-      expect { client.get(local_server "/?sleep=2").body }.to raise_exception(Manticore::SocketTimeout)
+      begin
+        client.get(local_server "/?sleep=2").body
+      rescue Manticore::SocketTimeout => e
+        expect( e.cause ).to be_a java.net.SocketTimeoutException
+      else
+        fail "exception not raised"
+      end
     end
 
     it "times out when custom request options are passed" do

data/vendor/bundle/jruby/2.5.0/gems/{manticore-0.6.4-java → manticore-0.7.1-java}/spec/manticore/response_spec.rb

@@ -6,7 +6,7 @@ describe Manticore::Response do
 
   its(:headers) { is_expected.to be_a Hash }
   its(:body) { is_expected.to be_a String }
-  its(:length) { is_expected.to be_a Fixnum }
+  its(:length) { is_expected.to be_a Integer }
 
   it "provides response header lookup via #[]" do
     expect(subject["Content-Type"]).to eq "application/json"

data/vendor/bundle/jruby/2.5.0/specifications/{manticore-0.6.4-java.gemspec → manticore-0.7.1-java.gemspec}

@@ -1,19 +1,20 @@
 # -*- encoding: utf-8 -*-
-# stub: manticore 0.6.4 java lib
+# stub: manticore 0.7.1 java lib
 
 Gem::Specification.new do |s|
   s.name = "manticore".freeze
-  s.version = "0.6.4"
+  s.version = "0.7.1"
   s.platform = "java".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Chris Heald".freeze]
-  s.date = "2018-06-28"
+  s.date = "2021-08-18"
   s.description = "Manticore is an HTTP client built on the Apache HttpCore components".freeze
   s.email = ["cheald@mashable.com".freeze]
   s.homepage = "https://github.com/cheald/manticore".freeze
   s.licenses = ["MIT".freeze]
+  s.required_ruby_version = Gem::Requirement.new(">= 2.3".freeze)
   s.requirements = ["jar org.apache.httpcomponents:httpclient, '~> 4.5.0'".freeze, "jar org.apache.httpcomponents:httpmime,   '~> 4.5.0'".freeze, "jar commons-logging:commons-logging,      '~> 1.2'".freeze, "jar commons-codec:commons-codec,          '~> 1.9'".freeze, "jar org.apache.httpcomponents:httpcore,   '~> 4.4.4'".freeze]
   s.rubygems_version = "2.7.10".freeze
   s.summary = "Manticore is an HTTP client built on the Apache HttpCore components".freeze
@@ -25,19 +26,19 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<openssl_pkcs8_pure>.freeze, [">= 0"])
-      s.add_development_dependency(%q<bundler>.freeze, ["~> 1.3"])
+      s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
       s.add_development_dependency(%q<rake>.freeze, [">= 0"])
-      s.add_development_dependency(%q<jar-dependencies>.freeze, [">= 0"])
+      s.add_development_dependency(%q<jar-dependencies>.freeze, ["~> 0.4.1"])
     else
       s.add_dependency(%q<openssl_pkcs8_pure>.freeze, [">= 0"])
-      s.add_dependency(%q<bundler>.freeze, ["~> 1.3"])
+      s.add_dependency(%q<bundler>.freeze, [">= 0"])
       s.add_dependency(%q<rake>.freeze, [">= 0"])
-      s.add_dependency(%q<jar-dependencies>.freeze, [">= 0"])
+      s.add_dependency(%q<jar-dependencies>.freeze, ["~> 0.4.1"])
     end
   else
     s.add_dependency(%q<openssl_pkcs8_pure>.freeze, [">= 0"])
-    s.add_dependency(%q<bundler>.freeze, ["~> 1.3"])
+    s.add_dependency(%q<bundler>.freeze, [">= 0"])
     s.add_dependency(%q<rake>.freeze, [">= 0"])
-    s.add_dependency(%q<jar-dependencies>.freeze, [">= 0"])
+    s.add_dependency(%q<jar-dependencies>.freeze, ["~> 0.4.1"])
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-scalyr
 version: !ruby/object:Gem::Version
-  version: 0.1.21.beta
+  version: 0.1.22.beta
 platform: ruby
 authors:
 - Edward Chee
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-16 00:00:00.000000000 Z
+date: 2021-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -179,7 +179,7 @@ files:
 - vendor/bundle/jruby/2.5.0/cache/logstash-core-5.6.4-java.gem
 - vendor/bundle/jruby/2.5.0/cache/logstash-core-plugin-api-2.1.28-java.gem
 - vendor/bundle/jruby/2.5.0/cache/logstash-devutils-1.3.6-java.gem
-- vendor/bundle/jruby/2.5.0/cache/manticore-0.6.4-java.gem
+- vendor/bundle/jruby/2.5.0/cache/manticore-0.7.1-java.gem
 - vendor/bundle/jruby/2.5.0/cache/method_source-0.8.2.gem
 - vendor/bundle/jruby/2.5.0/cache/minitar-0.5.4.gem
 - vendor/bundle/jruby/2.5.0/cache/multi_json-1.13.1.gem
@@ -2202,41 +2202,41 @@ files:
 - vendor/bundle/jruby/2.5.0/gems/logstash-devutils-1.3.6-java/lib/logstash/devutils/rspec/shared_examples.rb
 - vendor/bundle/jruby/2.5.0/gems/logstash-devutils-1.3.6-java/lib/logstash/devutils/rspec/spec_helper.rb
 - vendor/bundle/jruby/2.5.0/gems/logstash-devutils-1.3.6-java/logstash-devutils.gemspec
-- vendor/bundle/jruby/2.5.0/gems/manticore-0.6.4-java/APACHE-LICENSE-2.0.txt
-- vendor/bundle/jruby/2.5.0/gems/manticore-0.6.4-java/CHANGELOG.md
-- vendor/bundle/jruby/2.5.0/gems/manticore-0.6.4-java/Gemfile
-- vendor/bundle/jruby/2.5.0/gems/manticore-0.6.4-java/LICENSE.txt
-- vendor/bundle/jruby/2.5.0/gems/manticore-0.6.4-java/README.md
-- vendor/bundle/jruby/2.5.0/gems/manticore-0.6.4-java/Rakefile
-- vendor/bundle/jruby/2.5.0/gems/manticore-0.6.4-java/ext/manticore/org/manticore/HttpDeleteWithEntity.java
-- vendor/bundle/jruby/2.5.0/gems/manticore-0.6.4-java/ext/manticore/org/manticore/HttpGetWithEntity.java
-- vendor/bundle/jruby/2.5.0/gems/manticore-0.6.4-java/ext/manticore/org/manticore/Manticore.java
-- vendor/bundle/jruby/2.5.0/gems/manticore-0.6.4-java/gem-public_cert.pem
-- vendor/bundle/jruby/2.5.0/gems/manticore-0.6.4-java/lib/commons-codec/commons-codec/1.10/commons-codec-1.10.jar
-- vendor/bundle/jruby/2.5.0/gems/manticore-0.6.4-java/lib/commons-logging/commons-logging/1.2/commons-logging-1.2.jar
-- vendor/bundle/jruby/2.5.0/gems/manticore-0.6.4-java/lib/faraday/adapter/manticore.rb
-- vendor/bundle/jruby/2.5.0/gems/manticore-0.6.4-java/lib/manticore.rb
-- vendor/bundle/jruby/2.5.0/gems/manticore-0.6.4-java/lib/manticore/client.rb
-- vendor/bundle/jruby/2.5.0/gems/manticore-0.6.4-java/lib/manticore/client/proxies.rb
-- vendor/bundle/jruby/2.5.0/gems/manticore-0.6.4-java/lib/manticore/cookie.rb
-- vendor/bundle/jruby/2.5.0/gems/manticore-0.6.4-java/lib/manticore/facade.rb
-- vendor/bundle/jruby/2.5.0/gems/manticore-0.6.4-java/lib/manticore/java_extensions.rb
-- vendor/bundle/jruby/2.5.0/gems/manticore-0.6.4-java/lib/manticore/response.rb
-- vendor/bundle/jruby/2.5.0/gems/manticore-0.6.4-java/lib/manticore/stubbed_response.rb
-- vendor/bundle/jruby/2.5.0/gems/manticore-0.6.4-java/lib/manticore/version.rb
-- vendor/bundle/jruby/2.5.0/gems/manticore-0.6.4-java/lib/manticore_jars.rb
-- vendor/bundle/jruby/2.5.0/gems/manticore-0.6.4-java/lib/org/apache/httpcomponents/httpclient/4.5.2/httpclient-4.5.2.jar
-- vendor/bundle/jruby/2.5.0/gems/manticore-0.6.4-java/lib/org/apache/httpcomponents/httpcore/4.4.4/httpcore-4.4.4.jar
-- vendor/bundle/jruby/2.5.0/gems/manticore-0.6.4-java/lib/org/apache/httpcomponents/httpmime/4.5.2/httpmime-4.5.2.jar
-- vendor/bundle/jruby/2.5.0/gems/manticore-0.6.4-java/lib/org/manticore/manticore-ext.jar
-- vendor/bundle/jruby/2.5.0/gems/manticore-0.6.4-java/manticore.gemspec
-- vendor/bundle/jruby/2.5.0/gems/manticore-0.6.4-java/spec/manticore/client_proxy_spec.rb
-- vendor/bundle/jruby/2.5.0/gems/manticore-0.6.4-java/spec/manticore/client_spec.rb
-- vendor/bundle/jruby/2.5.0/gems/manticore-0.6.4-java/spec/manticore/cookie_spec.rb
-- vendor/bundle/jruby/2.5.0/gems/manticore-0.6.4-java/spec/manticore/facade_spec.rb
-- vendor/bundle/jruby/2.5.0/gems/manticore-0.6.4-java/spec/manticore/response_spec.rb
-- vendor/bundle/jruby/2.5.0/gems/manticore-0.6.4-java/spec/manticore/stubbed_response_spec.rb
-- vendor/bundle/jruby/2.5.0/gems/manticore-0.6.4-java/spec/spec_helper.rb
+- vendor/bundle/jruby/2.5.0/gems/manticore-0.7.1-java/APACHE-LICENSE-2.0.txt
+- vendor/bundle/jruby/2.5.0/gems/manticore-0.7.1-java/CHANGELOG.md
+- vendor/bundle/jruby/2.5.0/gems/manticore-0.7.1-java/Gemfile
+- vendor/bundle/jruby/2.5.0/gems/manticore-0.7.1-java/LICENSE.txt
+- vendor/bundle/jruby/2.5.0/gems/manticore-0.7.1-java/README.md
+- vendor/bundle/jruby/2.5.0/gems/manticore-0.7.1-java/Rakefile
+- vendor/bundle/jruby/2.5.0/gems/manticore-0.7.1-java/ext/manticore/org/manticore/HttpDeleteWithEntity.java
+- vendor/bundle/jruby/2.5.0/gems/manticore-0.7.1-java/ext/manticore/org/manticore/HttpGetWithEntity.java
+- vendor/bundle/jruby/2.5.0/gems/manticore-0.7.1-java/ext/manticore/org/manticore/Manticore.java
+- vendor/bundle/jruby/2.5.0/gems/manticore-0.7.1-java/gem-public_cert.pem
+- vendor/bundle/jruby/2.5.0/gems/manticore-0.7.1-java/lib/commons-codec/commons-codec/1.10/commons-codec-1.10.jar
+- vendor/bundle/jruby/2.5.0/gems/manticore-0.7.1-java/lib/commons-logging/commons-logging/1.2/commons-logging-1.2.jar
+- vendor/bundle/jruby/2.5.0/gems/manticore-0.7.1-java/lib/faraday/adapter/manticore.rb
+- vendor/bundle/jruby/2.5.0/gems/manticore-0.7.1-java/lib/manticore.rb
+- vendor/bundle/jruby/2.5.0/gems/manticore-0.7.1-java/lib/manticore/client.rb
+- vendor/bundle/jruby/2.5.0/gems/manticore-0.7.1-java/lib/manticore/client/proxies.rb
+- vendor/bundle/jruby/2.5.0/gems/manticore-0.7.1-java/lib/manticore/cookie.rb
+- vendor/bundle/jruby/2.5.0/gems/manticore-0.7.1-java/lib/manticore/facade.rb
+- vendor/bundle/jruby/2.5.0/gems/manticore-0.7.1-java/lib/manticore/java_extensions.rb
+- vendor/bundle/jruby/2.5.0/gems/manticore-0.7.1-java/lib/manticore/response.rb
+- vendor/bundle/jruby/2.5.0/gems/manticore-0.7.1-java/lib/manticore/stubbed_response.rb
+- vendor/bundle/jruby/2.5.0/gems/manticore-0.7.1-java/lib/manticore/version.rb
+- vendor/bundle/jruby/2.5.0/gems/manticore-0.7.1-java/lib/manticore_jars.rb
+- vendor/bundle/jruby/2.5.0/gems/manticore-0.7.1-java/lib/org/apache/httpcomponents/httpclient/4.5.2/httpclient-4.5.2.jar
+- vendor/bundle/jruby/2.5.0/gems/manticore-0.7.1-java/lib/org/apache/httpcomponents/httpcore/4.4.4/httpcore-4.4.4.jar
+- vendor/bundle/jruby/2.5.0/gems/manticore-0.7.1-java/lib/org/apache/httpcomponents/httpmime/4.5.2/httpmime-4.5.2.jar
+- vendor/bundle/jruby/2.5.0/gems/manticore-0.7.1-java/lib/org/manticore/manticore-ext.jar
+- vendor/bundle/jruby/2.5.0/gems/manticore-0.7.1-java/manticore.gemspec
+- vendor/bundle/jruby/2.5.0/gems/manticore-0.7.1-java/spec/manticore/client_proxy_spec.rb
+- vendor/bundle/jruby/2.5.0/gems/manticore-0.7.1-java/spec/manticore/client_spec.rb
+- vendor/bundle/jruby/2.5.0/gems/manticore-0.7.1-java/spec/manticore/cookie_spec.rb
+- vendor/bundle/jruby/2.5.0/gems/manticore-0.7.1-java/spec/manticore/facade_spec.rb
+- vendor/bundle/jruby/2.5.0/gems/manticore-0.7.1-java/spec/manticore/response_spec.rb
+- vendor/bundle/jruby/2.5.0/gems/manticore-0.7.1-java/spec/manticore/stubbed_response_spec.rb
+- vendor/bundle/jruby/2.5.0/gems/manticore-0.7.1-java/spec/spec_helper.rb
 - vendor/bundle/jruby/2.5.0/gems/method_source-0.8.2/Gemfile
 - vendor/bundle/jruby/2.5.0/gems/method_source-0.8.2/LICENSE
 - vendor/bundle/jruby/2.5.0/gems/method_source-0.8.2/README.markdown
@@ -4000,7 +4000,7 @@ files:
 - vendor/bundle/jruby/2.5.0/specifications/logstash-core-5.6.4-java.gemspec
 - vendor/bundle/jruby/2.5.0/specifications/logstash-core-plugin-api-2.1.28-java.gemspec
 - vendor/bundle/jruby/2.5.0/specifications/logstash-devutils-1.3.6-java.gemspec
-- vendor/bundle/jruby/2.5.0/specifications/manticore-0.6.4-java.gemspec
+- vendor/bundle/jruby/2.5.0/specifications/manticore-0.7.1-java.gemspec
 - vendor/bundle/jruby/2.5.0/specifications/method_source-0.8.2.gemspec
 - vendor/bundle/jruby/2.5.0/specifications/minitar-0.5.4.gemspec
 - vendor/bundle/jruby/2.5.0/specifications/multi_json-1.13.1.gemspec