lenjador 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6359342424a40cb441683e064b1612f3b0f5713d9d0fec3e47b962c6e454c4f
-  data.tar.gz: 4e4f17a2c36d7878e62d8e69b594233e38af42bb389baa45e18d1aa59a33ea97
+  metadata.gz: 5d96edbeff69ee13444e45a5924d8fedd4907725831f9ce62fd2f3280b48b244
+  data.tar.gz: b7e501d6a7dba6b7461df12e72530796900a4241700dd676c48d6e6f8341e0b2
 SHA512:
-  metadata.gz: 3ae2521b86d68b591a786241dab8b45316a8c2a5dcafd2c7ef98ad9f13c13c1141f4e15c4cef1b6fc8f1b346d217e4a96a2f7f97431bc6448a90a70143345d7b
-  data.tar.gz: e04916f56b096f9236c7331ac3ccbbc03f4e9dae68eff047fa252be928bf09f832d61d4e321bfb4aa9234bfceebf65ef452892ff90390cf7debbfb76711826f6
+  metadata.gz: b1142e4a26fb13f3ba2d880de8c3b58e18eacc77de055d36b10c3a9783c6c1d597a50aab94f1611a43fc17f8490f6598049da6f5d4c9ed73af77be2fa5ccb26e
+  data.tar.gz: 6f6d29354c80eae57485fc2f3fa5f6e0643aad692763957ab43c8ba3041a8f5d9cbba6fb3e9453a121c6634d5e7e776d82df0286a966b97613d03c437b602827

data/.rubocop.yml

@@ -1,6 +1,9 @@
 inherit_gem:
   rubocop-salemove: config/default.yml
 
+AllCops:
+  TargetRubyVersion: 2.4
+
 Style/FrozenStringLiteralComment:
   Enabled: yes
   EnforcedStyle: always

data/.travis.yml

@@ -3,4 +3,3 @@ rvm:
   - 2.4
   - 2.5
   - 2.7
-  - jruby

data/lenjador.gemspec

@@ -4,13 +4,14 @@ lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
-  gem.name          = RUBY_PLATFORM =~ /java/ ? 'lenjador-jruby' : 'lenjador'
-  gem.version       = '2.0.1'
+  gem.name          = 'lenjador'
+  gem.version       = '2.1.0'
   gem.authors       = ['Salemove']
   gem.email         = ['support@salemove.com']
   gem.description   = "It's lenjadoric"
   gem.summary       = 'What description said'
   gem.license       = 'MIT'
+  gem.required_ruby_version = '>= 2.4'
 
   gem.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   gem.executables   = gem.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -18,13 +19,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.add_dependency 'lru_redux'
-
-  if RUBY_PLATFORM =~ /java/
-    gem.add_dependency 'jrjackson'
-  else
-    gem.add_dependency 'oj', '~> 3.6'
-    gem.add_development_dependency 'ruby-prof'
-  end
+  gem.add_dependency 'oj', '~> 3.6'
 
   gem.add_development_dependency 'benchmark-ips'
   gem.add_development_dependency 'bundler'
@@ -32,4 +27,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'rubocop-salemove'
+  gem.add_development_dependency 'ruby-prof'
 end

data/lib/lenjador.rb

@@ -58,6 +58,12 @@ class Lenjador
 
   def fatal?; @level <= Severity::FATAL; end
 
+  def level=(new_level)
+    raise ArgumentError, "invalid log level: #{new_level}" unless new_level.is_a?(Integer)
+
+    @level = new_level
+  end
+
   private
 
   def log(level, *args, &block)

data/lib/lenjador/adapters/stdout_adapter.rb

@@ -8,7 +8,7 @@ class Lenjador
       attr_reader :logger
 
       def initialize(_service_name)
-        @logger = Logger.new(STDOUT)
+        @logger = Logger.new($stdout)
       end
 
       def log(level, metadata = {})

data/lib/lenjador/adapters/stdout_json_adapter.rb

@@ -22,11 +22,11 @@ class Lenjador
         end
       elsif RUBY_ENGINE == 'jruby'
         def print_line(str)
-          @mutex.synchronize { $stdout.write(str + "\n") }
+          @mutex.synchronize { $stdout.write("#{str}\n") }
         end
       else
         def print_line(str)
-          $stdout.write(str + "\n")
+          $stdout.write("#{str}\n")
         end
       end
     end

data/lib/lenjador/preprocessors/blacklist.rb

@@ -20,7 +20,8 @@ class Lenjador
       end
 
       def process(data)
-        if data.is_a? Hash
+        case data
+        when Hash
           data.inject({}) do |mem, (key, val)|
             if (field = @fields_to_process[key.to_s])
               send(action_method(field[:action]), mem, key, val)
@@ -28,7 +29,7 @@ class Lenjador
               mem.merge(key => process(val))
             end
           end
-        elsif data.is_a? Array
+        when Array
           data.inject([]) do |mem, val|
             mem + [process(val)]
           end

data/lib/lenjador/utils.rb

@@ -1,11 +1,17 @@
 # frozen_string_literal: true
 
 require 'time'
+require 'oj'
 
 class Lenjador
   module Utils
     DECIMAL_FRACTION_OF_SECOND = 3
     NO_TRACE_INFORMATION = {}.freeze
+    DUMP_OPTIONS = {
+      mode: :custom,
+      time_format: :xmlschema,
+      second_precision: 3
+    }.freeze
 
     # Build logstash json compatible event
     #
@@ -43,28 +49,8 @@ class Lenjador
     end
     private_class_method :overwritable_params
 
-    if RUBY_PLATFORM =~ /java/
-      require 'jrjackson'
-
-      DUMP_OPTIONS = {
-        timezone: 'utc',
-        date_format: "YYYY-MM-dd'T'HH:mm:ss.SSSX"
-      }.freeze
-
-      def self.generate_json(obj)
-        JrJackson::Json.dump(obj, DUMP_OPTIONS)
-      end
-    else
-      require 'oj'
-      DUMP_OPTIONS = {
-        mode: :custom,
-        time_format: :xmlschema,
-        second_precision: 3
-      }.freeze
-
-      def self.generate_json(obj)
-        Oj.dump(obj, DUMP_OPTIONS)
-      end
+    def self.generate_json(obj)
+      Oj.dump(obj, DUMP_OPTIONS)
     end
 
     def self.underscore(input)

data/spec/lenjador/adapters/stdout_json_adapter_spec.rb

@@ -16,7 +16,7 @@ describe Lenjador::Adapters::StdoutJsonAdapter do
     end
   end
 
-  describe '#log' do
+  describe '#log' do # rubocop:disable RSpec/MultipleMemoizedHelpers
     let(:adapter) { described_class.new(service_name) }
     let(:metadata) { {x: 'y'} }
     let(:event) { {a: 'b', x: 'y'} }
@@ -34,7 +34,7 @@ describe Lenjador::Adapters::StdoutJsonAdapter do
 
     it 'sends serialized event to $stdout' do
       adapter.log(info, metadata)
-      expect(output).to eq serialized_event + "\n"
+      expect(output).to eq("#{serialized_event}\n")
     end
   end
 

data/spec/lenjador/utils_spec.rb

@@ -46,7 +46,7 @@ describe Lenjador::Utils do
       end
     end
 
-    context 'when OpenTracing is defined' do
+    context 'when OpenTracing is defined' do # rubocop:disable RSpec/MultipleMemoizedHelpers
       let(:trace_id) { 'trace-id' }
       let(:span_id) { 'span-id' }
 

data/spec/lenjador_spec.rb

@@ -128,4 +128,23 @@ describe Lenjador do
       end
     end
   end
+
+  it 'allows changing log level on existing instance' do
+    logger = described_class.build('test_service', level: 'info')
+
+    logger.level = ::Logger::DEBUG
+    expect(logger.debug?).to eq(true)
+
+    logger.level = ::Logger::INFO
+    expect(logger.debug?).to eq(false)
+    expect(logger.info?).to eq(true)
+
+    logger.level = ::Logger::WARN
+    expect(logger.info?).to eq(false)
+    expect(logger.warn?).to eq(true)
+
+    logger.level = ::Logger::ERROR
+    expect(logger.warn?).to eq(false)
+    expect(logger.error?).to eq(true)
+  end
 end

data/spec/spec_helper.rb

@@ -5,7 +5,7 @@ Bundler.setup
 
 require 'lenjador'
 
-Dir[File.dirname(__FILE__) + '/support/*.rb'].sort.each { |f| require f }
+Dir["#{File.dirname(__FILE__)}/support/*.rb"].sort.each { |f| require f }
 
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lenjador
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Salemove
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-28 00:00:00.000000000 Z
+date: 2021-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lru_redux
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.6'
 - !ruby/object:Gem::Dependency
-  name: ruby-prof
+  name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: benchmark-ips
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubocop-salemove
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-salemove
+  name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -188,7 +188,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="