logstash-output-scalyr 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef843ec2b97b5a4f7f1f3005500cdc7e89bcf32a3a7766eb1528f866d4a9c7ee
-  data.tar.gz: ebdd84bc5c603ec0eaaf54467a4dff9cfe94badcaa2f32c172067eeadab8b759
+  metadata.gz: f07d1addbee89789c0819a0566262a22754990d87a70f479b33534f1d793410d
+  data.tar.gz: 72a1ebd3076e811232cfca2851b923e5fa0a2ef444cf3710d3268de41935532b
 SHA512:
-  metadata.gz: 2803a5befd9d127b23c0fa2a17aa0333d7e4616d6c2976584018b1244bab7d9e55ba205ebb65bfc701dd2fe500c4d0ad549f7d4fd2783b410b99c647827b9c53
-  data.tar.gz: cc745e6249def709126df87c5333469fe44ebbf6c1f6919c804ed1e424f72087c4bd8bc3ca64dfad69f0e2595c14a799dd659ccb4a2dd0b66ce5fc6a81fa7117
+  metadata.gz: b1e01a579378b28d69c184e6513d9c33f86963a4ce4bc6078cbbd78c9a380367605e369013417792041eb7b40efa3380c4e2b39b6b3b2bb2ec6761421329b92b
+  data.tar.gz: b5554805e01d55a70b20bfc51c70b1e1bf96164d24c43fe5e56dd1444c3891434a5202aa181341d318787605aacc92a6f21c2ff0601872636ff621de929dc292

data/README.md

@@ -5,12 +5,12 @@
 
 This plugin implements a Logstash output plugin that uploads data to [Scalyr](http://www.scalyr.com).
 
-You can view documentation for this plugin [on the Scalyr website](https://www.scalyr.com/solutions/logstash).
+You can view documentation for this plugin [on the Scalyr website](https://app.scalyr.com/solutions/logstash).
 
 # 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.2.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.3.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 
 
@@ -305,3 +305,28 @@ bundle exec rspec
 ```
 
 in the root of the repo.
+
+# Releasing
+
+## Updating version
+
+Currently references to the version need to be manually updated, files to look in for this are `logstash-putput-scalyr.gemspec`,
+ `client.rb`, twice in the CircleCI `Dockerfile`, and under "Quick Start" in this `README.md`.
+
+The changelog should also be updated with the latest version and changes of note.
+
+## Releasing to RubyGems.org
+
+To deploy the current code on your machine run these commands:
+
+```
+bundle check --path vendor/bundle || bundle install --deployment
+curl -u RUBY_USER:RUBY_PASSWORD https://rubygems.org/api/v1/api_key.yaml > ~/.gem/credentials
+chmod 0600 ~/.gem/credentials
+bundle exec rake vendor
+bundle exec rspec
+bundle exec rake publish_gem
+```
+
+`RUBY_USER` and `RUBY_PASSWORD` should be replaced with the username and password to the RubyGems.org account you wish to release to,
+ these credentials should be found in Keeper.

data/lib/scalyr/common/client.rb

@@ -82,6 +82,8 @@ class ClientSession
       @http.ca_file = @ssl_ca_bundle_path
       @http.verify_mode = OpenSSL::SSL::VERIFY_PEER
       @http.verify_depth = @ssl_verify_depth
+    else
+      @http.verify_mode = OpenSSL::SSL::VERIFY_NONE
     end
   end  # def initialize
 
@@ -161,7 +163,7 @@ class ClientSession
 
     post = Net::HTTP::Post.new uri_path
     post.add_field('Content-Type', 'application/json')
-    version = 'output-logstash-scalyr 0.1.2'
+    version = 'output-logstash-scalyr 0.1.3'
     post.add_field('User-Agent', version + ';' + RUBY_VERSION + ';' + RUBY_PLATFORM)
 
     if not encoding.nil?

data/logstash-output-scalyr.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-output-scalyr'
-  s.version         = '0.1.2'
+  s.version         = '0.1.3'
   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)"
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'net-http-persistent'
   s.add_runtime_dependency 'logstash-core-plugin-api', '>= 1.60', '<= 2.99'
   s.add_runtime_dependency 'logstash-codec-plain'
-  s.add_runtime_dependency 'ffi', '>= 1.9.25'
+  s.add_runtime_dependency 'ffi', '>= 1.9.18'
   s.add_runtime_dependency 'rbzip2', '0.3.0'
   s.add_development_dependency 'logstash-devutils'
 end

data/vendor/bundle/jruby/2.5.0/bin/jruby_executable_hooks

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+
+title = "ruby #{ARGV*" "}"
+$0    = ARGV.shift
+Process.setproctitle(title) if Process.methods.include?(:setproctitle)
+
+require 'rubygems'
+begin
+  require 'executable-hooks/hooks'
+  Gem::ExecutableHooks.run($0)
+rescue LoadError
+  warn "unable to load executable-hooks/hooks" if ENV.key?('ExecutableHooks_DEBUG')
+end unless $0.end_with?('/executable-hooks-uninstaller')
+
+content = File.read($0)
+
+if
+  (index = content.index("\n#!ruby\n")) && index > 0
+then
+  skipped_content = content.slice!(0..index)
+  start_line = skipped_content.count("\n") + 1
+  eval content, binding, $0, start_line
+else
+  eval content, binding, $0
+end

data/vendor/bundle/jruby/2.5.0/gems/connection_pool-2.2.3/Changes.md

@@ -0,0 +1,130 @@
+# connection_pool Changelog
+
+2.2.3
+------
+
+- Pool now throws `ConnectionPool::TimeoutError` on timeout. [#130]
+- Use monotonic clock present in all modern Rubies [Tero Tasanen, #109]
+- Remove code hacks necessary for JRuby 1.7
+- Expose wrapped pool from ConnectionPool::Wrapper [Thomas Lecavelier, #113]
+
+2.2.2
+------
+
+- Add pool `size` and `available` accessors for metrics and monitoring
+  purposes [#97, robholland]
+
+2.2.1
+------
+
+- Allow CP::Wrapper to use an existing pool [#87, etiennebarrie]
+- Use monotonic time for more accurate timeouts [#84, jdantonio]
+
+2.2.0
+------
+
+- Rollback `Timeout` handling introduced in 2.1.1 and 2.1.2.  It seems
+  impossible to safely work around the issue. Please never, ever use
+  `Timeout.timeout` in your code or you will see rare but mysterious bugs. [#75]
+
+2.1.3
+------
+
+- Don't increment created count until connection is successfully
+  created. [mylesmegyesi, #73]
+
+2.1.2
+------
+
+- The connection\_pool will now close any connections which respond to
+  `close` (Dalli) or `disconnect!` (Redis).  This ensures discarded connections
+  from the fix in 2.1.1 are torn down ASAP and don't linger open.
+
+
+2.1.1
+------
+
+- Work around a subtle race condition with code which uses `Timeout.timeout` and
+  checks out a connection within the timeout block.  This might cause
+  connections to get into a bad state and raise very odd errors. [tamird, #67]
+
+
+2.1.0
+------
+
+- Refactoring to better support connection pool subclasses [drbrain,
+  #55]
+- `with` should return value of the last expression [#59]
+
+
+2.0.0
+-----
+
+- The connection pool is now lazy.  Connections are created as needed
+  and retained until the pool is shut down. [drbrain, #52]
+
+1.2.0
+-----
+
+- Add `with(options)` and `checkout(options)`. [mattcamuto]
+  Allows the caller to override the pool timeout.
+```ruby
+@pool.with(:timeout => 2) do |conn|
+end
+```
+
+1.1.0
+-----
+
+- New `#shutdown` method (simao)
+
+    This method accepts a block and calls the block for each
+    connection in the pool. After calling this method, trying to get a
+    connection from the pool raises `PoolShuttingDownError`.
+
+1.0.0
+-----
+
+- `#with_connection` is now gone in favor of `#with`.
+
+- We no longer pollute the top level namespace with our internal
+`TimedStack` class.
+
+0.9.3
+--------
+
+- `#with_connection` is now deprecated in favor of `#with`.
+
+    A warning will be issued in the 0.9 series and the method will be
+    removed in 1.0.
+
+- We now reuse objects when possible.
+
+    This means that under no contention, the same object will be checked
+    out from the pool after subsequent calls to `ConnectionPool#with`.
+
+    This change should have no impact on end user performance. If
+    anything, it should be an improvement, depending on what objects you
+    are pooling.
+
+0.9.2
+--------
+
+- Fix reentrant checkout leading to early checkin.
+
+0.9.1
+--------
+
+- Fix invalid superclass in version.rb
+
+0.9.0
+--------
+
+- Move method\_missing magic into ConnectionPool::Wrapper (djanowski)
+- Remove BasicObject superclass (djanowski)
+
+0.1.0
+--------
+
+- More precise timeouts and better error message
+- ConnectionPool now subclasses BasicObject so `method_missing` is more effective.

data/vendor/bundle/jruby/2.5.0/gems/connection_pool-2.2.3/Gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gemspec(development_group: :runtime)
+
+gem "standard"

data/vendor/bundle/jruby/2.5.0/gems/connection_pool-2.2.3/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2011 Mike Perham
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/vendor/bundle/jruby/2.5.0/gems/connection_pool-2.2.3/README.md

@@ -0,0 +1,121 @@
+connection\_pool
+=================
+[![Build Status](https://travis-ci.org/mperham/connection_pool.svg)](https://travis-ci.org/mperham/connection_pool)
+
+Generic connection pooling for Ruby.
+
+MongoDB has its own connection pool.  ActiveRecord has its own connection pool.
+This is a generic connection pool that can be used with anything, e.g. Redis,
+Dalli and other Ruby network clients.
+
+
+Usage
+-----
+
+Create a pool of objects to share amongst the fibers or threads in your Ruby
+application:
+
+``` ruby
+$memcached = ConnectionPool.new(size: 5, timeout: 5) { Dalli::Client.new }
+```
+
+Then use the pool in your application:
+
+``` ruby
+$memcached.with do |conn|
+  conn.get('some-count')
+end
+```
+
+If all the objects in the connection pool are in use, `with` will block
+until one becomes available.  If no object is available within `:timeout` seconds,
+`with` will raise a `Timeout::Error`.
+
+Optionally, you can specify a timeout override using the with-block semantics:
+
+``` ruby
+$memcached.with(timeout: 2.0) do |conn|
+  conn.get('some-count')
+end
+```
+
+This will only modify the resource-get timeout for this particular
+invocation. This is useful if you want to fail-fast on certain non critical
+sections when a resource is not available, or conversely if you are comfortable
+blocking longer on a particular resource. This is not implemented in the below
+`ConnectionPool::Wrapper` class.
+
+## Migrating to a Connection Pool
+
+You can use `ConnectionPool::Wrapper` to wrap a single global connection,
+making it easier to migrate existing connection code over time:
+
+``` ruby
+$redis = ConnectionPool::Wrapper.new(size: 5, timeout: 3) { Redis.new }
+$redis.sadd('foo', 1)
+$redis.smembers('foo')
+```
+
+The wrapper uses `method_missing` to checkout a connection, run the requested
+method and then immediately check the connection back into the pool.  It's
+**not** high-performance so you'll want to port your performance sensitive code
+to use `with` as soon as possible.
+
+``` ruby
+$redis.with do |conn|
+  conn.sadd('foo', 1)
+  conn.smembers('foo')
+end
+```
+
+Once you've ported your entire system to use `with`, you can simply remove
+`Wrapper` and use the simpler and faster `ConnectionPool`.
+
+
+## Shutdown
+
+You can shut down a ConnectionPool instance once it should no longer be used.
+Further checkout attempts will immediately raise an error but existing checkouts
+will work.
+
+```ruby
+cp = ConnectionPool.new { Redis.new }
+cp.shutdown { |conn| conn.quit }
+```
+
+Shutting down a connection pool will block until all connections are checked in and closed.
+**Note that shutting down is completely optional**; Ruby's garbage collector will reclaim
+unreferenced pools under normal circumstances.
+
+## Current State
+
+There are several methods that return information about a pool.
+
+```ruby
+cp = ConnectionPool.new(size: 10) { Redis.new }
+cp.size # => 10
+cp.available # => 10
+
+cp.with do |conn|
+  cp.size # => 10
+  cp.available # => 9
+end
+```
+
+Notes
+-----
+
+- Connections are lazily created as needed.
+- There is no provision for repairing or checking the health of a connection;
+  connections should be self-repairing.  This is true of the Dalli and Redis
+  clients.
+- **WARNING**: Don't ever use `Timeout.timeout` in your Ruby code or you will see
+  occasional silent corruption and mysterious errors.  The Timeout API is unsafe
+  and cannot be used correctly, ever.  Use proper socket timeout options as
+  exposed by Net::HTTP, Redis, Dalli, etc.
+
+
+Author
+------
+
+Mike Perham, [@mperham](https://twitter.com/mperham), <http://mikeperham.com>

data/vendor/bundle/jruby/2.5.0/gems/connection_pool-2.2.3/Rakefile

@@ -0,0 +1,7 @@
+require "bundler/gem_tasks"
+
+require "rake/testtask"
+require "standard/rake"
+Rake::TestTask.new
+
+task default: :test

data/vendor/bundle/jruby/2.5.0/gems/connection_pool-2.2.3/connection_pool.gemspec

@@ -0,0 +1,20 @@
+require "./lib/connection_pool/version"
+
+Gem::Specification.new do |s|
+  s.name = "connection_pool"
+  s.version = ConnectionPool::VERSION
+  s.platform = Gem::Platform::RUBY
+  s.authors = ["Mike Perham", "Damian Janowski"]
+  s.email = ["mperham@gmail.com", "damian@educabilia.com"]
+  s.homepage = "https://github.com/mperham/connection_pool"
+  s.description = s.summary = "Generic connection pool for Ruby"
+
+  s.files = `git ls-files`.split("\n")
+  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.require_paths = ["lib"]
+  s.license = "MIT"
+  s.add_development_dependency "bundler"
+  s.add_development_dependency "minitest", ">= 5.0.0"
+  s.add_development_dependency "rake"
+end

data/vendor/bundle/jruby/2.5.0/gems/connection_pool-2.2.3/lib/connection_pool.rb

@@ -0,0 +1,110 @@
+require "timeout"
+require "connection_pool/version"
+
+class ConnectionPool
+  class Error < ::RuntimeError; end
+  class PoolShuttingDownError < ::ConnectionPool::Error; end
+  class TimeoutError < ::Timeout::Error; end
+end
+
+# Generic connection pool class for sharing a limited number of objects or network connections
+# among many threads.  Note: pool elements are lazily created.
+#
+# Example usage with block (faster):
+#
+#    @pool = ConnectionPool.new { Redis.new }
+#    @pool.with do |redis|
+#      redis.lpop('my-list') if redis.llen('my-list') > 0
+#    end
+#
+# Using optional timeout override (for that single invocation)
+#
+#    @pool.with(timeout: 2.0) do |redis|
+#      redis.lpop('my-list') if redis.llen('my-list') > 0
+#    end
+#
+# Example usage replacing an existing connection (slower):
+#
+#    $redis = ConnectionPool.wrap { Redis.new }
+#
+#    def do_work
+#      $redis.lpop('my-list') if $redis.llen('my-list') > 0
+#    end
+#
+# Accepts the following options:
+# - :size - number of connections to pool, defaults to 5
+# - :timeout - amount of time to wait for a connection if none currently available, defaults to 5 seconds
+#
+class ConnectionPool
+  DEFAULTS = {size: 5, timeout: 5}
+
+  def self.wrap(options, &block)
+    Wrapper.new(options, &block)
+  end
+
+  def initialize(options = {}, &block)
+    raise ArgumentError, "Connection pool requires a block" unless block
+
+    options = DEFAULTS.merge(options)
+
+    @size = Integer(options.fetch(:size))
+    @timeout = options.fetch(:timeout)
+
+    @available = TimedStack.new(@size, &block)
+    @key = :"pool-#{@available.object_id}"
+    @key_count = :"pool-#{@available.object_id}-count"
+  end
+
+  def with(options = {})
+    Thread.handle_interrupt(Exception => :never) do
+      conn = checkout(options)
+      begin
+        Thread.handle_interrupt(Exception => :immediate) do
+          yield conn
+        end
+      ensure
+        checkin
+      end
+    end
+  end
+
+  def checkout(options = {})
+    if ::Thread.current[@key]
+      ::Thread.current[@key_count] += 1
+      ::Thread.current[@key]
+    else
+      ::Thread.current[@key_count] = 1
+      ::Thread.current[@key] = @available.pop(options[:timeout] || @timeout)
+    end
+  end
+
+  def checkin
+    if ::Thread.current[@key]
+      if ::Thread.current[@key_count] == 1
+        @available.push(::Thread.current[@key])
+        ::Thread.current[@key] = nil
+      else
+        ::Thread.current[@key_count] -= 1
+      end
+    else
+      raise ConnectionPool::Error, "no connections are checked out"
+    end
+
+    nil
+  end
+
+  def shutdown(&block)
+    @available.shutdown(&block)
+  end
+
+  # Size of this connection pool
+  attr_reader :size
+
+  # Number of pool entries available for checkout at this instant.
+  def available
+    @available.length
+  end
+end
+
+require "connection_pool/timed_stack"
+require "connection_pool/wrapper"