logstash-logger 0.24.1 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '072939788bcf388d76724ff50216a9428402634c'
-  data.tar.gz: b56a87e489b4f61d01d729007e9fe193e7557722
+  metadata.gz: 5e1ac7a22d1e29a706c724c69e31f6d8481af909
+  data.tar.gz: 87a7b265d354455021af800ae4c22bf28ee8e3cf
 SHA512:
-  metadata.gz: 47ff10a039ff172bf2fc2f220258c42a40d7c5a33721b4e6091b1764f808156b22119f99994327dfbceb72fda116072fa07c7df5230ad068d782208bbc77303b
-  data.tar.gz: 81d52c7aadfde04bd54cfa4b875c378c7c977cea6b6ccd4178acdd14815a160ea18dc67aff34f11f86b5c19daa7f77db2d0aeda76343fbdea705992597f724ce
+  metadata.gz: 9ed6a184198bde25c4a0fdbe0e4b563642e4b62ac343ae9996b07511d1b9295d37d7a5f38bcf950790b92ee1bfc1ababee32631db1f0bfcf5032f092bfd9128c
+  data.tar.gz: cac8e3fd8a892e38b1f1a01e201bbeb51bad6cb2669adbd5c317b1cedbcf208c60cdd89445e18e16b38e1576473fac104d72f2aa0ead8113455c48f8152e31bf

data/.travis.yml

@@ -5,40 +5,24 @@ cache: bundler
 after_success:
   bundle exec codeclimate-test-reporter
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.9
-  - 2.2.6
-  - 2.3.3
-  - 2.4.0
-  - jruby-19mode
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
   - jruby-9.1.5.0
   - rubinius-3
 gemfile:
-  - gemfiles/rails_3.2.gemfile
   - gemfiles/rails_4.0.gemfile
   - gemfiles/rails_4.1.gemfile
   - gemfiles/rails_4.2.gemfile
   - gemfiles/rails_5.0.gemfile
+  - gemfiles/rails_5.1.gemfile
 matrix:
-  exclude:
-    - rvm: 1.9.3
-      gemfile: gemfiles/rails_5.0.gemfile
-    - rvm: jruby-19mode
-      gemfile: gemfiles/rails_5.0.gemfile
-    - rvm: 2.0.0
-      gemfile: gemfiles/rails_5.0.gemfile
-    - rvm: 2.1.9
-      gemfile: gemfiles/rails_5.0.gemfile
-    - rvm: 2.2.5
-      gemfile: gemfiles/rails_3.2.gemfile
-    - rvm: 2.3.1
-      gemfile: gemfiles/rails_3.2.gemfile
   allow_failures:
     - rvm: rubinius-3
-    - rvm: 2.4.0
-    - rvm: jruby-19mode
-    - rvm: jruby-9.1.5.0
+    - rvm: 2.4.1
+      gemfile: gemfiles/rails_4.0.gemfile
+    - rvm: 2.4.1
+      gemfile: gemfiles/rails_4.1.gemfile
 addons:
   code_climate:
     repo_token: 4d712355fa2863c0f33f413eeede4e52cc221c4bc989a692d97574b1f6010b69

data/Appraisals

@@ -1,6 +1,6 @@
-appraise "rails-3.2" do
-  gem "rails", "~> 3.2.18"
-end
+#appraise "rails-3.2" do
+  #gem "rails", "~> 3.2.18"
+#end
 
 appraise "rails-4.0" do
   gem "rails", "~> 4.0.0"
@@ -17,3 +17,7 @@ end
 appraise "rails-5.0" do
   gem "rails", "~> 5.0.0"
 end
+
+appraise "rails-5.1" do
+  gem "rails", "~> 5.1.0"
+end

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.25.0
+
+- Drops support for Rails 3.2, MRI Ruby < 2.2, and JRuby 1.7, since these have been EOL'ed.
+- Adds support for customizing events on a per-logger level. [#113](https://github.com/dwbutler/logstash-logger/pull/113)
+
 ## 0.24.1
 
 - Fixes logging of a hash with symbol keys. [#116](https://github.com/dwbutler/logstash-logger/pull/116)

data/README.md

@@ -1,5 +1,5 @@
 # LogStashLogger
-[![Build Status](https://travis-ci.org/dwbutler/logstash-logger.svg?branch=master)](https://travis-ci.org/dwbutler/logstash-logger) [![Code Climate](https://codeclimate.com/github/dwbutler/logstash-logger/badges/gpa.svg)](https://codeclimate.com/github/dwbutler/logstash-logger) [![codecov.io](http://codecov.io/github/dwbutler/logstash-logger/coverage.svg?branch=master)](http://codecov.io/github/dwbutler/logstash-logger?branch=master)
+[![Build Status](https://travis-ci.org/dwbutler/logstash-logger.svg?branch=master)](https://travis-ci.org/dwbutler/logstash-logger) [![Code Climate](https://codeclimate.com/github/dwbutler/logstash-logger/badges/gpa.svg)](https://codeclimate.com/github/dwbutler/logstash-logger) [![codecov.io](http://codecov.io/github/dwbutler/logstash-logger/coverage.svg?branch=master)](http://codecov.io/github/dwbutler/logstash-logger?branch=master) [![Gem Version](https://badge.fury.io/rb/logstash-logger.svg)](https://badge.fury.io/rb/logstash-logger)
 
 LogStashLogger extends Ruby's `Logger` class to log directly to
 [Logstash](https://www.elastic.co/products/logstash).
@@ -306,6 +306,13 @@ config = LogStashLogger.configure do |config|
 end
 ```
 
+You can also customize events on a per-logger basis by passing a callable object
+(lambda or proc) to the `customize_event` option when creating a logger:
+
+```ruby
+LogStashLogger.new(customize_event: ->(event){ event['other_field'] = 'other_field' })
+``` 
+
 ## Buffering / Automatic Retries
 
 For devices that establish a connection to a remote service, log messages are buffered internally
@@ -394,7 +401,7 @@ end
 
 ## Rails Integration
 
-Verified to work with both Rails 3, 4, and 5.
+Supports Rails 4 and 5.
 
 By default, every Rails log message will be written to logstash in `LogStash::Event` JSON format.
 
@@ -690,11 +697,11 @@ end
 
 Verified to work with:
 
-* MRI Ruby 1.9.3, 2.0, 2.1, 2.2, 2.3
-* JRuby 1.7, 9.0
+* MRI Ruby 2.2 - 2.4
+* JRuby 9.x
 * Rubinius
 
-Ruby 1.8.7 is not supported.
+Ruby versions < 2.2 are EOL'ed and no longer supported.
 
 ## What type of logger should I use?
 
@@ -760,6 +767,11 @@ for other fields.
 
 ## Breaking changes
 
+### Version 0.25+
+
+Rails 3.2, MRI Ruby < 2.2, and JRuby 1.7 are no longer supported, since they have been
+EOL'ed. If you are on an older version of Ruby, you will need to use 0.24 or below.
+
 ### Version 0.5+
  * The `source` event key has been replaced with `host` to better match the latest logstash.
  * The `(host, port, type)` constructor has been deprecated in favor of an options hash constructor.
@@ -804,6 +816,7 @@ logger = LogStashLogger.new('localhost', 5228, :tcp)
 * [glaszig](https://github.com/glaszig)
 * [Bin Lan](https://github.com/lanxx019)
 * [Joao Fernandes](https://github.com/jcmfernandes)
+* [CoolElvis](https://github.com/coolelvis)
 
 ## Contributing
 

data/gemfiles/rails_4.0.gemfile

@@ -2,8 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "codecov", :require => false, :group => :test
-gem "codeclimate-test-reporter", :group => :test, :require => nil
+gem "codecov", require: false, group: :test
+gem "codeclimate-test-reporter", group: :test, require: nil
 gem "rails", "~> 4.0.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_4.1.gemfile

@@ -2,8 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "codecov", :require => false, :group => :test
-gem "codeclimate-test-reporter", :group => :test, :require => nil
+gem "codecov", require: false, group: :test
+gem "codeclimate-test-reporter", group: :test, require: nil
 gem "rails", "~> 4.1.1"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_4.2.gemfile

@@ -2,8 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "codecov", :require => false, :group => :test
-gem "codeclimate-test-reporter", :group => :test, :require => nil
+gem "codecov", require: false, group: :test
+gem "codeclimate-test-reporter", group: :test, require: nil
 gem "rails", "~> 4.2.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_5.0.gemfile

@@ -2,8 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "codecov", :require => false, :group => :test
-gem "codeclimate-test-reporter", :group => :test, :require => nil
+gem "codecov", require: false, group: :test
+gem "codeclimate-test-reporter", group: :test, require: nil
 gem "rails", "~> 5.0.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_5.1.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "codecov", require: false, group: :test
+gem "codeclimate-test-reporter", group: :test, require: nil
+gem "rails", "~> 5.1.0"
+
+gemspec path: "../"

data/lib/logstash-logger/formatter.rb

@@ -10,11 +10,11 @@ module LogStashLogger
     autoload :Cee, 'logstash-logger/formatter/cee'
     autoload :CeeSyslog, 'logstash-logger/formatter/cee_syslog'
 
-		def self.new(formatter_type)
-    	build_formatter(formatter_type)
+    def self.new(formatter_type, customize_event: nil)
+      build_formatter(formatter_type, customize_event)
     end
 
-    def self.build_formatter(formatter_type)
+    def self.build_formatter(formatter_type, customize_event)
       formatter_type ||= DEFAULT_FORMATTER
 
       formatter = if custom_formatter_instance?(formatter_type)
@@ -22,7 +22,7 @@ module LogStashLogger
       elsif custom_formatter_class?(formatter_type)
         formatter_type.new
       else
-        formatter_klass(formatter_type).new
+        formatter_klass(formatter_type).new(customize_event: customize_event)
       end
 
       formatter.send(:extend, ::LogStashLogger::TaggedLogging::Formatter)

data/lib/logstash-logger/formatter/base.rb

@@ -9,6 +9,11 @@ module LogStashLogger
     class Base < ::Logger::Formatter
       include ::LogStashLogger::TaggedLogging::Formatter
 
+      def initialize(customize_event: nil)
+        @customize_event = customize_event
+        super()
+      end
+
       def call(severity, time, progname, message)
         @event = build_event(message, severity, time)
       end
@@ -45,6 +50,8 @@ module LogStashLogger
 
         LogStashLogger.configuration.customize_event_block.call(event) if LogStashLogger.configuration.customize_event_block.respond_to?(:call)
 
+        @customize_event.call(event) if @customize_event
+
         # In case Time#to_json has been overridden
         if event.timestamp.is_a?(Time)
           event.timestamp = event.timestamp.iso8601(3)

data/lib/logstash-logger/logger.rb

@@ -46,7 +46,7 @@ module LogStashLogger
   end
 
   def self.build_logger(opts)
-    formatter = Formatter.new(opts.delete(:formatter))
+    formatter = Formatter.new(opts.delete(:formatter), customize_event: opts.delete(:customize_event))
 
     logger = case opts[:type]
     when :multi_logger

data/lib/logstash-logger/version.rb

@@ -1,3 +1,3 @@
 module LogStashLogger
-  VERSION = "0.24.1"
+  VERSION = "0.25.0"
 end

data/logstash-logger.gemspec

@@ -21,25 +21,14 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'logstash-event', '~> 1.2'
 
   gem.add_development_dependency 'rails'
-  if RUBY_VERSION < '2'
-    gem.add_development_dependency 'mime-types', '< 3'
-  end
   gem.add_development_dependency 'redis'
   gem.add_development_dependency 'poseidon'
   gem.add_development_dependency 'aws-sdk'
 
-  if RUBY_VERSION < '2' || defined?(JRUBY_VERSION)
+  if defined?(JRUBY_VERSION)
     gem.add_development_dependency 'SyslogLogger'
   end
 
-  if RUBY_VERSION < '2'
-    gem.add_development_dependency 'json', '~> 1.8'
-  end
-
-  if RUBY_VERSION < '2.1'
-    gem.add_development_dependency 'nokogiri', '~> 1.6.8'
-  end
-
   gem.add_development_dependency 'rspec', '>= 3'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'pry'

data/spec/logger_spec.rb

@@ -115,4 +115,14 @@ describe LogStashLogger do
     expect(listener_event["test1"]).to eq("response1")
   end
 
+  describe 'customize_event on instance' do
+    let!(:customize_event) { ->(event){ event['custom'] = 'custom' } }
+    let!(:logger) { LogStashLogger.new(host: host, port: port, type: connection_type, sync: true, customize_event: customize_event)}
+
+    specify 'logger produce messages with custom field' do
+      logger.info('test')
+      expect(listener_event['custom']).to eq('custom')
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-logger
 version: !ruby/object:Gem::Version
-  version: 0.24.1
+  version: 0.25.0
 platform: ruby
 authors:
 - David Butler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-07 00:00:00.000000000 Z
+date: 2017-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-event
@@ -173,6 +173,7 @@ files:
 - gemfiles/rails_4.1.gemfile
 - gemfiles/rails_4.2.gemfile
 - gemfiles/rails_5.0.gemfile
+- gemfiles/rails_5.1.gemfile
 - lib/logstash-logger.rb
 - lib/logstash-logger/buffer.rb
 - lib/logstash-logger/configuration.rb