loga 2.7.0 → 2.8.1

data/gemfiles/sidekiq60.gemfile

@@ -4,6 +4,28 @@ source "https://rubygems.org"
 
 gem "sidekiq", "~> 6.0.0"
 
+group :development do
+  gem "appraisal"
+  gem "bundler", ">= 1.6"
+  gem "byebug"
+  gem "guard"
+  gem "guard-rspec"
+  gem "guard-rubocop"
+  gem "pry"
+  gem "rack-test"
+  gem "rake"
+  gem "fakeredis"
+  gem "rspec", "~> 3.7"
+  gem "rubocop"
+  gem "rubocop-rspec"
+  gem "timecop"
+  gem "psych"
+  gem "net-smtp"
+  gem "net-pop"
+  gem "net-imap"
+  gem "bigdecimal"
+end
+
 group :test do
   gem "simplecov", "~> 0.17.0"
 end

data/gemfiles/sidekiq61.gemfile

@@ -4,6 +4,28 @@ source "https://rubygems.org"
 
 gem "sidekiq", "~> 6.1.0"
 
+group :development do
+  gem "appraisal"
+  gem "bundler", ">= 1.6"
+  gem "byebug"
+  gem "guard"
+  gem "guard-rspec"
+  gem "guard-rubocop"
+  gem "pry"
+  gem "rack-test"
+  gem "rake"
+  gem "fakeredis"
+  gem "rspec", "~> 3.7"
+  gem "rubocop"
+  gem "rubocop-rspec"
+  gem "timecop"
+  gem "psych"
+  gem "net-smtp"
+  gem "net-pop"
+  gem "net-imap"
+  gem "bigdecimal"
+end
+
 group :test do
   gem "simplecov", "~> 0.17.0"
 end

data/gemfiles/sidekiq62.gemfile

@@ -4,6 +4,28 @@ source "https://rubygems.org"
 
 gem "sidekiq", "~> 6.2.0"
 
+group :development do
+  gem "appraisal"
+  gem "bundler", ">= 1.6"
+  gem "byebug"
+  gem "guard"
+  gem "guard-rspec"
+  gem "guard-rubocop"
+  gem "pry"
+  gem "rack-test"
+  gem "rake"
+  gem "fakeredis"
+  gem "rspec", "~> 3.7"
+  gem "rubocop"
+  gem "rubocop-rspec"
+  gem "timecop"
+  gem "psych"
+  gem "net-smtp"
+  gem "net-pop"
+  gem "net-imap"
+  gem "bigdecimal"
+end
+
 group :test do
   gem "simplecov", "~> 0.17.0"
 end

data/gemfiles/sidekiq63.gemfile

@@ -4,6 +4,28 @@ source "https://rubygems.org"
 
 gem "sidekiq", "~> 6.3.0"
 
+group :development do
+  gem "appraisal"
+  gem "bundler", ">= 1.6"
+  gem "byebug"
+  gem "guard"
+  gem "guard-rspec"
+  gem "guard-rubocop"
+  gem "pry"
+  gem "rack-test"
+  gem "rake"
+  gem "fakeredis"
+  gem "rspec", "~> 3.7"
+  gem "rubocop"
+  gem "rubocop-rspec"
+  gem "timecop"
+  gem "psych"
+  gem "net-smtp"
+  gem "net-pop"
+  gem "net-imap"
+  gem "bigdecimal"
+end
+
 group :test do
   gem "simplecov", "~> 0.17.0"
 end

data/gemfiles/sidekiq64.gemfile

@@ -4,6 +4,28 @@ source "https://rubygems.org"
 
 gem "sidekiq", "~> 6.4.0"
 
+group :development do
+  gem "appraisal"
+  gem "bundler", ">= 1.6"
+  gem "byebug"
+  gem "guard"
+  gem "guard-rspec"
+  gem "guard-rubocop"
+  gem "pry"
+  gem "rack-test"
+  gem "rake"
+  gem "fakeredis"
+  gem "rspec", "~> 3.7"
+  gem "rubocop"
+  gem "rubocop-rspec"
+  gem "timecop"
+  gem "psych"
+  gem "net-smtp"
+  gem "net-pop"
+  gem "net-imap"
+  gem "bigdecimal"
+end
+
 group :test do
   gem "simplecov", "~> 0.17.0"
 end

data/gemfiles/sidekiq65.gemfile

@@ -4,6 +4,28 @@ source "https://rubygems.org"
 
 gem "sidekiq", "~> 6.5.0"
 
+group :development do
+  gem "appraisal"
+  gem "bundler", ">= 1.6"
+  gem "byebug"
+  gem "guard"
+  gem "guard-rspec"
+  gem "guard-rubocop"
+  gem "pry"
+  gem "rack-test"
+  gem "rake"
+  gem "fakeredis"
+  gem "rspec", "~> 3.7"
+  gem "rubocop"
+  gem "rubocop-rspec"
+  gem "timecop"
+  gem "psych"
+  gem "net-smtp"
+  gem "net-pop"
+  gem "net-imap"
+  gem "bigdecimal"
+end
+
 group :test do
   gem "simplecov", "~> 0.17.0"
 end

data/gemfiles/sidekiq7.gemfile

@@ -4,6 +4,28 @@ source "https://rubygems.org"
 
 gem "sidekiq", "~> 7.0"
 
+group :development do
+  gem "appraisal"
+  gem "bundler", ">= 1.6"
+  gem "byebug"
+  gem "guard"
+  gem "guard-rspec"
+  gem "guard-rubocop"
+  gem "pry"
+  gem "rack-test"
+  gem "rake"
+  gem "fakeredis"
+  gem "rspec", "~> 3.7"
+  gem "rubocop"
+  gem "rubocop-rspec"
+  gem "timecop"
+  gem "psych"
+  gem "net-smtp"
+  gem "net-pop"
+  gem "net-imap"
+  gem "bigdecimal"
+end
+
 group :test do
   gem "simplecov", "~> 0.17.0"
 end

data/gemfiles/sidekiq70.gemfile

@@ -4,6 +4,28 @@ source "https://rubygems.org"
 
 gem "sidekiq", "~> 7.0.0"
 
+group :development do
+  gem "appraisal"
+  gem "bundler", ">= 1.6"
+  gem "byebug"
+  gem "guard"
+  gem "guard-rspec"
+  gem "guard-rubocop"
+  gem "pry"
+  gem "rack-test"
+  gem "rake"
+  gem "fakeredis"
+  gem "rspec", "~> 3.7"
+  gem "rubocop"
+  gem "rubocop-rspec"
+  gem "timecop"
+  gem "psych"
+  gem "net-smtp"
+  gem "net-pop"
+  gem "net-imap"
+  gem "bigdecimal"
+end
+
 group :test do
   gem "simplecov", "~> 0.17.0"
 end

data/gemfiles/sidekiq71.gemfile

@@ -4,6 +4,28 @@ source "https://rubygems.org"
 
 gem "sidekiq", "~> 7.1.0"
 
+group :development do
+  gem "appraisal"
+  gem "bundler", ">= 1.6"
+  gem "byebug"
+  gem "guard"
+  gem "guard-rspec"
+  gem "guard-rubocop"
+  gem "pry"
+  gem "rack-test"
+  gem "rake"
+  gem "fakeredis"
+  gem "rspec", "~> 3.7"
+  gem "rubocop"
+  gem "rubocop-rspec"
+  gem "timecop"
+  gem "psych"
+  gem "net-smtp"
+  gem "net-pop"
+  gem "net-imap"
+  gem "bigdecimal"
+end
+
 group :test do
   gem "simplecov", "~> 0.17.0"
 end

data/gemfiles/sinatra14.gemfile

@@ -4,6 +4,28 @@ source "https://rubygems.org"
 
 gem "sinatra", "~> 1.4.0"
 
+group :development do
+  gem "appraisal"
+  gem "bundler", ">= 1.6"
+  gem "byebug"
+  gem "guard"
+  gem "guard-rspec"
+  gem "guard-rubocop"
+  gem "pry"
+  gem "rack-test"
+  gem "rake"
+  gem "fakeredis"
+  gem "rspec", "~> 3.7"
+  gem "rubocop"
+  gem "rubocop-rspec"
+  gem "timecop"
+  gem "psych"
+  gem "net-smtp"
+  gem "net-pop"
+  gem "net-imap"
+  gem "bigdecimal"
+end
+
 group :test do
   gem "simplecov", "~> 0.17.0"
 end

data/gemfiles/sinatra2.gemfile

@@ -0,0 +1,33 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sinatra", "~> 2.2.4"
+
+group :development do
+  gem "appraisal"
+  gem "bundler", ">= 1.6"
+  gem "byebug"
+  gem "guard"
+  gem "guard-rspec"
+  gem "guard-rubocop"
+  gem "pry"
+  gem "rack-test"
+  gem "rake"
+  gem "fakeredis"
+  gem "rspec", "~> 3.7"
+  gem "rubocop"
+  gem "rubocop-rspec"
+  gem "timecop"
+  gem "psych"
+  gem "net-smtp"
+  gem "net-pop"
+  gem "net-imap"
+  gem "bigdecimal"
+end
+
+group :test do
+  gem "simplecov", "~> 0.17.0"
+end
+
+gemspec path: "../"

data/gemfiles/sinatra3.gemfile

@@ -0,0 +1,33 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sinatra", "~> 3.2.0"
+
+group :development do
+  gem "appraisal"
+  gem "bundler", ">= 1.6"
+  gem "byebug"
+  gem "guard"
+  gem "guard-rspec"
+  gem "guard-rubocop"
+  gem "pry"
+  gem "rack-test"
+  gem "rake"
+  gem "fakeredis"
+  gem "rspec", "~> 3.7"
+  gem "rubocop"
+  gem "rubocop-rspec"
+  gem "timecop"
+  gem "psych"
+  gem "net-smtp"
+  gem "net-pop"
+  gem "net-imap"
+  gem "bigdecimal"
+end
+
+group :test do
+  gem "simplecov", "~> 0.17.0"
+end
+
+gemspec path: "../"

data/gemfiles/sinatra4.gemfile

@@ -0,0 +1,33 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sinatra", "~> 4.0.0"
+
+group :development do
+  gem "appraisal"
+  gem "bundler", ">= 1.6"
+  gem "byebug"
+  gem "guard"
+  gem "guard-rspec"
+  gem "guard-rubocop"
+  gem "pry"
+  gem "rack-test"
+  gem "rake"
+  gem "fakeredis"
+  gem "rspec", "~> 3.7"
+  gem "rubocop"
+  gem "rubocop-rspec"
+  gem "timecop"
+  gem "psych"
+  gem "net-smtp"
+  gem "net-pop"
+  gem "net-imap"
+  gem "bigdecimal"
+end
+
+group :test do
+  gem "simplecov", "~> 0.17.0"
+end
+
+gemspec path: "../"

data/gemfiles/unit.gemfile

@@ -2,6 +2,28 @@
 
 source "https://rubygems.org"
 
+group :development do
+  gem "appraisal"
+  gem "bundler", ">= 1.6"
+  gem "byebug"
+  gem "guard"
+  gem "guard-rspec"
+  gem "guard-rubocop"
+  gem "pry"
+  gem "rack-test"
+  gem "rake"
+  gem "fakeredis"
+  gem "rspec", "~> 3.7"
+  gem "rubocop"
+  gem "rubocop-rspec"
+  gem "timecop"
+  gem "psych"
+  gem "net-smtp"
+  gem "net-pop"
+  gem "net-imap"
+  gem "bigdecimal"
+end
+
 group :test do
   gem "simplecov", "~> 0.17.0"
 end

data/lib/loga/formatters/gelf_formatter.rb

@@ -39,12 +39,7 @@ module Loga
       private
 
       def build_event(time, message)
-        event = case message
-                when Loga::Event
-                  message
-                else
-                  Loga::Event.new(message: message)
-                end
+        event = message.is_a?(Loga::Event) ? message : Loga::Event.new(message: message)
 
         event.timestamp ||= time
         # Overwrite sidekiq_context data anything manually specified
@@ -54,6 +49,7 @@ module Loga
           hash.merge! compute_type(event.type)
           # Overwrite hash with Loga's additional fields
           hash.merge! loga_additional_fields
+          hash.merge! open_telemetry_fields
         end
         event
       end
@@ -103,6 +99,17 @@ module Loga
         }
       end
 
+      def open_telemetry_fields
+        return {} unless defined?(::OpenTelemetry::Trace)
+
+        span = ::OpenTelemetry::Trace.current_span
+
+        {
+          trace_id: span.context.hex_trace_id,
+          span_id: span.context.hex_span_id,
+        }
+      end
+
       def sidekiq_context
         return {} unless defined?(::Sidekiq::Context)
 

data/lib/loga/railtie.rb

@@ -86,10 +86,10 @@ module Loga
 
         private
 
-        def render_exception_with_loga(arg, exception)
+        def render_exception_with_loga(arg, exception, *args)
           env = arg.is_a?(ActionDispatch::Request) ? arg.env : arg
           env['loga.exception'] = exception
-          render_exception_without_loga(arg, exception)
+          render_exception_without_loga(arg, exception, *args)
         end
       end
 

data/lib/loga/version.rb

@@ -1,3 +1,3 @@
 module Loga
-  VERSION = '2.7.0'.freeze
+  VERSION = '2.8.1'.freeze
 end

data/loga.gemspec

@@ -20,19 +20,4 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activesupport', '>= 2.3.8'
   spec.add_dependency 'rack'
-
-  spec.add_development_dependency 'appraisal', '~> 2.4'
-  spec.add_development_dependency 'bundler',   '>= 1.6'
-  spec.add_development_dependency 'byebug'
-  spec.add_development_dependency 'guard',         '~> 2.13'
-  spec.add_development_dependency 'guard-rspec',   '~> 4.7'
-  spec.add_development_dependency 'guard-rubocop', '~> 1.2'
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'rack-test'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'fakeredis'
-  spec.add_development_dependency 'rspec',    '~> 3.7'
-  spec.add_development_dependency 'rubocop',  '~> 0.57.0'
-  spec.add_development_dependency 'rubocop-rspec'
-  spec.add_development_dependency 'timecop'
 end

data/spec/fixtures/{rails50.rb → rails71.rb}

@@ -9,7 +9,7 @@ class Dummy < Rails::Application
   config.eager_load = true
   config.filter_parameters += [:password]
   config.secret_key_base = '2624599ca9ab3cf3823626240138a128118a87683bf03ab8f155844c33b3cd8cbbfa3ef5e29db6f5bd182f8bd4776209d9577cfb46ac51bfd232b00ab0136b24'
-  config.session_store :cookie_store, key: '_rails50_session'
+  config.session_store :cookie_store, key: '_rails70_session'
 
   config.log_tags = [:uuid, 'TEST_TAG']
   config.loga = {

data/spec/integration/rails/action_mailer_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe Loga::LogSubscribers::ActionMailer, if: Rails.env.production? do

data/spec/integration/rails/railtie_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ostruct'
 
 RSpec.describe Loga::Railtie do
@@ -17,7 +19,11 @@ RSpec.describe Loga::Railtie do
       let(:formatter) { Loga::Formatters::SimpleFormatter }
 
       it 'assign Loga logger to Rails logger' do
-        expect(Loga.logger).to equal(Rails.logger)
+        if defined?(ActiveSupport::BroadcastLogger)
+          expect(Loga.logger).to be_a(Logger)
+        else
+          expect(Loga.logger).to equal(Rails.logger)
+        end
       end
 
       it 'configures Loga with a simple formatter' do
@@ -29,7 +35,11 @@ RSpec.describe Loga::Railtie do
   context 'when production', if: Rails.env.production? do
     describe 'loga_initialize_logger' do
       it 'assign Loga logger to Rails logger' do
-        expect(Loga.logger).to equal(Rails.logger)
+        if defined?(ActiveSupport::BroadcastLogger)
+          expect(Loga.logger).to be_a(Logger)
+        else
+          expect(Loga.logger).to equal(Rails.logger)
+        end
       end
 
       it 'configures Loga with a structured formatter' do
@@ -38,7 +48,7 @@ RSpec.describe Loga::Railtie do
       end
 
       it 'disables colorized logging' do
-        expect(app.config.colorize_logging).to eq(false)
+        expect(app.config.colorize_logging).to be(false)
       end
     end
 

data/spec/integration/rails/request_spec.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
-RSpec.describe 'Structured logging with Rails', timecop: true,
-                                                if: Rails.env.production? do
+RSpec.describe 'Structured logging with Rails', :timecop,
+               if: Rails.env.production? do
   let(:app) { Rails.application }
 
   let(:log_entries) do

data/spec/integration/sidekiq5_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'timecop'
 require 'fakeredis'
@@ -24,8 +26,8 @@ describe 'Sidekiq client logger' do
       attr_reader :latest_error, :mutex, :cond
 
       def initialize
-        @mutex = ::Mutex.new
-        @cond = ::ConditionVariable.new
+        @mutex = Mutex.new
+        @cond = ConditionVariable.new
       end
 
       def processor_died(_inst, err)
@@ -84,7 +86,7 @@ describe 'Sidekiq client logger' do
     aggregate_failures do
       expect(last_element['class']).to eq 'MySidekiqWorker'
       expect(last_element['args']).to eq ['Bob']
-      expect(last_element['retry']).to eq true
+      expect(last_element['retry']).to be true
       expect(last_element['queue']).to eq 'default'
     end
   end
@@ -107,16 +109,16 @@ describe 'Sidekiq client logger' do
 
     aggregate_failures do
       expect(json_line).to include(
-        '_queue'=> 'default',
-        '_retry'=> true,
-        '_params'=> ['Bob'],
-        '_class'=> 'MySidekiqWorker',
-        '_type'=> 'sidekiq',
-        '_service.name'=> 'hello_world_app',
-        '_service.version'=> '1.0',
-        '_tags'=> '',
-        'level'=> 6,
-        'version'=> '1.1',
+        '_queue' => 'default',
+        '_retry' => true,
+        '_params' => ['Bob'],
+        '_class' => 'MySidekiqWorker',
+        '_type' => 'sidekiq',
+        '_service.name' => 'hello_world_app',
+        '_service.version' => '1.0',
+        '_tags' => '',
+        'level' => 6,
+        'version' => '1.1',
       )
 
       %w[_created_at _enqueued_at _jid _duration timestamp host].each do |key|

data/spec/integration/sidekiq60_spec.rb

@@ -31,8 +31,8 @@ describe 'Sidekiq client logger' do
       attr_reader :cond
 
       def initialize
-        @mutex = ::Mutex.new
-        @cond = ::ConditionVariable.new
+        @mutex = Mutex.new
+        @cond = ConditionVariable.new
       end
 
       def processor_died(_inst, err)
@@ -103,7 +103,7 @@ describe 'Sidekiq client logger' do
     aggregate_failures do
       expect(last_element['class']).to eq 'MySidekiqWorker'
       expect(last_element['args']).to eq ['Bob']
-      expect(last_element['retry']).to eq true
+      expect(last_element['retry']).to be true
       expect(last_element['queue']).to eq 'default'
     end
   end