loga 2.8.1 → 2.9.0

data/spec/loga/sidekiq_spec.rb

@@ -32,11 +32,23 @@ RSpec.describe Loga::Sidekiq do
 
         m = ENV['BUNDLE_GEMFILE'].match(/sidekiq(?<version>\d+)/)
 
+        job_logger =
+          if Sidekiq.respond_to?(:options)
+            Sidekiq.options[:job_logger]
+          else
+            sidekiq_config = Sidekiq.instance_variable_get(:@config)
+            sidekiq_config && sidekiq_config[:job_logger]
+          end
+
         case m['version']
         when '51'
-          expect(Sidekiq.options[:job_logger]).to eq(Loga::Sidekiq5::JobLogger)
-        when '6'
-          expect(Sidekiq.options[:job_logger]).to eq(Loga::Sidekiq6::JobLogger)
+          expect(job_logger).to eq(Loga::Sidekiq5::JobLogger)
+        when '6', '60', '61', '62', '63', '64', '65'
+          expect(job_logger).to eq(Loga::Sidekiq6::JobLogger)
+        when '7', '70', '71', '72', '73'
+          expect(job_logger).to eq(Loga::Sidekiq7::JobLogger)
+        when '8', '80'
+          expect(job_logger).to eq(Loga::Sidekiq8::JobLogger)
         end
       end
     end

data/spec/spec_helper.rb

@@ -59,10 +59,16 @@ when /sidekiq(?<version>\d+)/
       'spec/loga/sidekiq6/**/*_spec.rb',
       'spec/loga/sidekiq_spec.rb',
     ].join(',')
-  when '7', '70', '71'
+  when '7', '70', '71', '72', '73'
     rspec_pattern = [
       'spec/integration/sidekiq7_spec.rb',
-      'spec/loga/sidekiq7/**/*_spec.rb',
+      'spec/loga/sidekiq_latest/**/*_spec.rb',
+      'spec/loga/sidekiq_spec.rb',
+    ].join(',')
+  when '8', '80'
+    rspec_pattern = [
+      'spec/integration/sidekiq8_spec.rb',
+      'spec/loga/sidekiq_latest/**/*_spec.rb',
       'spec/loga/sidekiq_spec.rb',
     ].join(',')
   else

data/spec/support/helpers.rb

@@ -18,4 +18,12 @@ module Helpers
     allow(loga).to receive(:logger).and_return(logger)
     loga
   end
+
+  def with_new_ruby(**data)
+    if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.4')
+      data[:test]
+    else
+      data[:else]
+    end
+  end
 end

data/spec/support/request_spec.rb

@@ -97,6 +97,13 @@ RSpec.shared_examples 'request logger' do
           { username: 'yoshi' },
           'HTTP_USER_AGENT' => 'Chrome', 'HTTP_X_REQUEST_ID' => '471a34dc'
 
+      method_missing_exception =
+        if Gem::Version.new(RUBY_VERSION) > Gem::Version.new('3.4.0dev')
+          "undefined method 'name' for nil"
+        else
+          "undefined method `name' for nil"
+        end
+
       expect(last_log_entry).to include(
         'version' => '1.1',
         'host' => 'bird.example.com',
@@ -115,7 +122,7 @@ RSpec.shared_examples 'request logger' do
         '_request.request_id' => '471a34dc',
         '_request.duration' => 0,
         '_exception.klass' => 'NoMethodError',
-        '_exception.message' => start_with("undefined method `name' for nil"),
+        '_exception.message' => start_with(method_missing_exception),
         '_exception.backtrace' => be_a(String),
         '_tags' => '471a34dc TEST_TAG',
       )

data/spec/unit/loga/formatters/gelf_formatter_spec.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
+require 'ostruct'
 
 describe Loga::Formatters::GELFFormatter do
   subject { described_class.new(params) }
@@ -65,7 +66,12 @@ describe Loga::Formatters::GELFFormatter do
       let(:message) { { message: 'Wooden house' } }
 
       it 'the short_message is a String reprentation of that Hash' do
-        expect(json['short_message']).to eq('{:message=>"Wooden house"}')
+        expect(json['short_message']).to eq(
+          with_new_ruby(
+            test: '{message: "Wooden house"}',
+            else: '{:message=>"Wooden house"}',
+          ),
+        )
       end
 
       include_examples 'valid GELF message'

data/spec/unit/loga/formatters/simple_formatter_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'loga/formatters/simple_formatter'
 
-# rubocop:disable Metrics/LineLength
+# rubocop:disable Layout/LineLength
 describe Loga::Formatters::SimpleFormatter do
   before { allow(Process).to receive(:pid).and_return(999) }
 
@@ -32,7 +32,12 @@ describe Loga::Formatters::SimpleFormatter do
       let(:message) { { record: 'Wooden house' } }
 
       specify do
-        expect(subject).to eq("I, #{time_pid} {:record=>\"Wooden house\"}\n")
+        expect(subject).to eq(
+          with_new_ruby(
+            test: "I, #{time_pid} {record: \"Wooden house\"}\n",
+            else: "I, #{time_pid} {:record=>\"Wooden house\"}\n",
+          ),
+        )
       end
     end
 
@@ -80,7 +85,12 @@ describe Loga::Formatters::SimpleFormatter do
         end
 
         specify do
-          expect(subject).to eq("I, #{time_pid} Hello World data={:admin=>true, :user=>{:email=>\"hello@world.com\"}}\n")
+          expect(subject).to eq(
+            with_new_ruby(
+              test: "I, #{time_pid} Hello World data={admin: true, user: {email: \"hello@world.com\"}}\n",
+              else: "I, #{time_pid} Hello World data={:admin=>true, :user=>{:email=>\"hello@world.com\"}}\n",
+            ),
+          )
         end
       end
 
@@ -94,7 +104,12 @@ describe Loga::Formatters::SimpleFormatter do
         end
 
         specify do
-          expect(subject).to eq("I, #{time_pid} Hello World type=request data={:ssl=>true}\n")
+          expect(subject).to eq(
+            with_new_ruby(
+              test: "I, #{time_pid} Hello World type=request data={ssl: true}\n",
+              else: "I, #{time_pid} Hello World type=request data={:ssl=>true}\n",
+            ),
+          )
         end
       end
     end
@@ -129,4 +144,4 @@ describe Loga::Formatters::SimpleFormatter do
     end
   end
 end
-# rubocop:enable Metrics/LineLength
+# rubocop:enable Layout/LineLength

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: loga
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 2.9.0
 platform: ruby
 authors:
 - Funding Circle
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-13 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -65,6 +64,8 @@ files:
 - gemfiles/rails61.gemfile
 - gemfiles/rails70.gemfile
 - gemfiles/rails71.gemfile
+- gemfiles/rails72.gemfile
+- gemfiles/rails80.gemfile
 - gemfiles/sidekiq51.gemfile
 - gemfiles/sidekiq60.gemfile
 - gemfiles/sidekiq61.gemfile
@@ -72,9 +73,11 @@ files:
 - gemfiles/sidekiq63.gemfile
 - gemfiles/sidekiq64.gemfile
 - gemfiles/sidekiq65.gemfile
-- gemfiles/sidekiq7.gemfile
 - gemfiles/sidekiq70.gemfile
 - gemfiles/sidekiq71.gemfile
+- gemfiles/sidekiq72.gemfile
+- gemfiles/sidekiq73.gemfile
+- gemfiles/sidekiq80.gemfile
 - gemfiles/sinatra14.gemfile
 - gemfiles/sinatra2.gemfile
 - gemfiles/sinatra3.gemfile
@@ -100,6 +103,7 @@ files:
 - lib/loga/sidekiq5/job_logger.rb
 - lib/loga/sidekiq6/job_logger.rb
 - lib/loga/sidekiq7/job_logger.rb
+- lib/loga/sidekiq8/job_logger.rb
 - lib/loga/tagged_logging.rb
 - lib/loga/utilities.rb
 - lib/loga/version.rb
@@ -110,6 +114,8 @@ files:
 - spec/fixtures/rails61.rb
 - spec/fixtures/rails70.rb
 - spec/fixtures/rails71.rb
+- spec/fixtures/rails72.rb
+- spec/fixtures/rails80.rb
 - spec/fixtures/random_bin
 - spec/integration/rails/action_mailer_spec.rb
 - spec/integration/rails/railtie_spec.rb
@@ -119,10 +125,11 @@ files:
 - spec/integration/sidekiq61_spec.rb
 - spec/integration/sidekiq65_spec.rb
 - spec/integration/sidekiq7_spec.rb
+- spec/integration/sidekiq8_spec.rb
 - spec/integration/sinatra_spec.rb
 - spec/loga/sidekiq5/job_logger_spec.rb
 - spec/loga/sidekiq6/job_logger_spec.rb
-- spec/loga/sidekiq7/job_logger_spec.rb
+- spec/loga/sidekiq_latest/job_logger_spec.rb
 - spec/loga/sidekiq_spec.rb
 - spec/spec_helper.rb
 - spec/support/gethostname_shared.rb
@@ -144,7 +151,6 @@ homepage: https://github.com/FundingCircle/loga
 licenses:
 - BSD-3-Clause
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -159,8 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Facilitate log aggregation via unified logging
 test_files:
@@ -170,6 +175,8 @@ test_files:
 - spec/fixtures/rails61.rb
 - spec/fixtures/rails70.rb
 - spec/fixtures/rails71.rb
+- spec/fixtures/rails72.rb
+- spec/fixtures/rails80.rb
 - spec/fixtures/random_bin
 - spec/integration/rails/action_mailer_spec.rb
 - spec/integration/rails/railtie_spec.rb
@@ -179,10 +186,11 @@ test_files:
 - spec/integration/sidekiq61_spec.rb
 - spec/integration/sidekiq65_spec.rb
 - spec/integration/sidekiq7_spec.rb
+- spec/integration/sidekiq8_spec.rb
 - spec/integration/sinatra_spec.rb
 - spec/loga/sidekiq5/job_logger_spec.rb
 - spec/loga/sidekiq6/job_logger_spec.rb
-- spec/loga/sidekiq7/job_logger_spec.rb
+- spec/loga/sidekiq_latest/job_logger_spec.rb
 - spec/loga/sidekiq_spec.rb
 - spec/spec_helper.rb
 - spec/support/gethostname_shared.rb

data/spec/loga/sidekiq7/job_logger_spec.rb

@@ -1,127 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require 'loga/sidekiq7/job_logger'
-
-RSpec.describe Loga::Sidekiq7::JobLogger do
-  subject(:job_logger) { described_class.new(logger) }
-
-  let(:target) { StringIO.new }
-
-  let(:json_line) do
-    target.rewind
-    JSON.parse(target.read.split("\n").last)
-  end
-
-  let(:logger) { Loga.logger }
-
-  before do
-    Loga.reset
-
-    Loga.configure(
-      service_name: 'hello_world_app',
-      service_version: '1.0',
-      device: target,
-      format: :gelf,
-    )
-  end
-
-  # https://github.com/mperham/sidekiq/blob/v6.1.2/lib/sidekiq/job_logger.rb
-  it 'inherits from ::Sidekiq::JobLogger' do
-    expect(subject).to be_a(Sidekiq::JobLogger)
-  end
-
-  describe '#call' do
-    context 'when the job passess successfully' do
-      let(:item_data) do
-        {
-          'class' => 'HardWorker',
-          'args' => ['asd'],
-          'retry' => true,
-          'queue' => 'default',
-          'jid' => '591f6f66ee0d218fb451dfb6',
-          'created_at' => 1_528_799_582.904939,
-          'enqueued_at' => 1_528_799_582.9049861,
-        }
-      end
-
-      it 'has the the required attributes on call' do
-        job_logger.call(item_data, 'queue') do
-          # something
-        end
-
-        expected_body = {
-          'version' => '1.1',
-          'level' => 6,
-          '_type' => 'sidekiq',
-          '_created_at' => 1_528_799_582.904939,
-          '_enqueued_at' => 1_528_799_582.9049861,
-          '_jid' => '591f6f66ee0d218fb451dfb6',
-          '_retry' => true,
-          '_queue' => 'default',
-          '_service.name' => 'hello_world_app',
-          '_class' => 'HardWorker',
-          '_service.version' => '1.0',
-          '_tags' => '',
-          '_params' => ['asd'],
-        }
-
-        aggregate_failures do
-          expect(json_line).to include(expected_body)
-          expect(json_line['_duration']).to be_a(Float)
-          expect(json_line['timestamp']).to be_a(Float)
-          expect(json_line['host']).to be_a(String)
-          expect(json_line['short_message']).to match(/HardWorker with jid:*/)
-        end
-      end
-    end
-
-    context 'when the job fails' do
-      let(:item_data) do
-        {
-          'class' => 'HardWorker',
-          'args' => ['asd'],
-          'retry' => true,
-          'queue' => 'default',
-          'jid' => '591f6f66ee0d218fb451dfb6',
-          'created_at' => 1_528_799_582.904939,
-          'enqueued_at' => 1_528_799_582.9049861,
-        }
-      end
-
-      it 'has the the required attributes on call' do
-        failed_job = lambda do
-          job_logger.call(item_data, 'queue') do
-            raise StandardError
-          end
-        end
-
-        expected_body = {
-          'version' => '1.1',
-          'level' => 4,
-          '_type' => 'sidekiq',
-          '_created_at' => 1_528_799_582.904939,
-          '_enqueued_at' => 1_528_799_582.9049861,
-          '_jid' => '591f6f66ee0d218fb451dfb6',
-          '_retry' => true,
-          '_queue' => 'default',
-          '_service.name' => 'hello_world_app',
-          '_class' => 'HardWorker',
-          '_service.version' => '1.0',
-          '_tags' => '',
-          '_params' => ['asd'],
-          '_exception' => 'StandardError',
-        }
-
-        aggregate_failures do
-          expect(&failed_job).to raise_error(StandardError)
-          expect(json_line['_duration']).to be_a(Float)
-          expect(json_line).to include(expected_body)
-          expect(json_line['timestamp']).to be_a(Float)
-          expect(json_line['host']).to be_a(String)
-          expect(json_line['short_message']).to match(/HardWorker with jid:*/)
-        end
-      end
-    end
-  end
-end