loga 2.8.0 → 2.9.0

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: loga
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.9.0
 platform: ruby
 authors:
 - Funding Circle
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-24 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -38,202 +37,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.13'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.7'
-- !ruby/object:Gem::Dependency
-  name: guard-rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: fakeredis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.57.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.57.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: timecop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Log aggregation through unified logging middleware, while respecting
   the original log format.
 email:
@@ -242,11 +45,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
 - ".codeclimate.yml"
+- ".github/workflows/build-and-test.yml"
+- ".github/workflows/publish-gem.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -254,12 +59,13 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/rails42.gemfile
-- gemfiles/rails50.gemfile
 - gemfiles/rails52.gemfile
 - gemfiles/rails60.gemfile
 - gemfiles/rails61.gemfile
 - gemfiles/rails70.gemfile
+- gemfiles/rails71.gemfile
+- gemfiles/rails72.gemfile
+- gemfiles/rails80.gemfile
 - gemfiles/sidekiq51.gemfile
 - gemfiles/sidekiq60.gemfile
 - gemfiles/sidekiq61.gemfile
@@ -267,10 +73,15 @@ 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
+- gemfiles/sinatra4.gemfile
 - gemfiles/unit.gemfile
 - lib/loga.rb
 - lib/loga/configuration.rb
@@ -292,17 +103,19 @@ 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
 - loga.gemspec
 - spec/fixtures/README.md
-- spec/fixtures/rails42.rb
-- spec/fixtures/rails50.rb
 - spec/fixtures/rails52.rb
 - spec/fixtures/rails60.rb
 - 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
@@ -312,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
@@ -337,7 +151,6 @@ homepage: https://github.com/FundingCircle/loga
 licenses:
 - BSD-3-Clause
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -352,18 +165,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Facilitate log aggregation via unified logging
 test_files:
 - spec/fixtures/README.md
-- spec/fixtures/rails42.rb
-- spec/fixtures/rails50.rb
 - spec/fixtures/rails52.rb
 - spec/fixtures/rails60.rb
 - 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
@@ -373,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/.circleci/config.yml

@@ -1,112 +0,0 @@
-basic_build: &basic_build
-  working_directory: ~/loga
-  docker:
-    - image: cimg/ruby:2.7.5
-
-test_build: &test_build
-  working_directory: ~/loga
-  steps:
-    - checkout
-    - &restore_gems
-      restore_cache:
-        keys:
-          - v2-gems-{{ checksum "Gemfile" }}-{{ checksum "Appraisals"}}-{{ .Environment.CIRCLE_JOB }}
-          - v2-gems-{{ checksum "Gemfile" }}
-    - &bundle_install
-      run: bundle install --jobs 4 --path=vendor/bundle --retry 3
-    - run: bundle exec appraisal install
-    - &cache_gems
-      save_cache:
-        key: v2-gems-{{ checksum "Gemfile" }}-{{ checksum "Appraisals"}}-{{ .Environment.CIRCLE_JOB }}
-        paths:
-          - gemfiles/vendor/bundle
-          - vendor/bundle
-    - attach_workspace:
-        at: ./tmp
-    - run: RACK_ENV=development bundle exec appraisal rspec
-    - run: RACK_ENV=production bundle exec appraisal rspec
-    - store_artifacts:
-        path: coverage
-
-version: 2
-jobs:
-  ruby-2.5:
-    docker:
-      - image: circleci/ruby:2.5
-    <<: *test_build
-  ruby-2.6:
-    docker:
-      - image: circleci/ruby:2.6
-    <<: *test_build
-  ruby-2.7:
-    docker:
-      - image: cimg/ruby:2.7
-      - image: redis:7
-    <<: *test_build
-  ruby-3.0:
-    docker:
-      - image: cimg/ruby:3.0
-      - image: redis:7
-    <<: *test_build
-  rubocop:
-    <<: *basic_build
-    steps:
-      - checkout
-      - *restore_gems
-      - *bundle_install
-      - *cache_gems
-      - run: bundle exec rubocop
-  push-to-rubygems:
-    <<: *basic_build
-    steps:
-      - checkout
-      - *restore_gems
-      - *bundle_install
-      - *cache_gems
-      - run:
-          name: Build the gem
-          command: gem build $CIRCLE_PROJECT_REPONAME.gemspec
-      - deploy:
-          name: Publish to rubygems
-          command: |
-            mkdir ~/.gem
-            echo ":rubygems_api_key: $RUBYGEMS_API_KEY" >  ~/.gem/credentials
-            chmod 0600 ~/.gem/credentials
-            gem push $CIRCLE_PROJECT_REPONAME-$(echo $CIRCLE_TAG | sed -e 's/v//').gem
-workflows:
-  version: 2
-  test-then-push-gem:
-    jobs:
-      - rubocop:
-          filters:
-            tags:
-              only: /.*/
-      - ruby-2.5:
-          filters:
-            tags:
-              only: /.*/
-      - ruby-2.6:
-          filters:
-            tags:
-              only: /.*/
-      - ruby-2.7:
-          filters:
-            tags:
-              only: /.*/
-      - ruby-3.0:
-          filters:
-            tags:
-              only: /.*/
-      - push-to-rubygems:
-          context: org-rubygems
-          filters:
-            tags:
-              only: /^v\d.+/
-            branches:
-              ignore: /.*/
-          requires:
-            - rubocop
-            - ruby-2.5
-            - ruby-2.6
-            - ruby-2.7
-            - ruby-3.0

data/gemfiles/rails42.gemfile

@@ -1,11 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 4.2.0"
-
-group :test do
-  gem "simplecov"
-end
-
-gemspec path: "../"

data/gemfiles/rails50.gemfile

@@ -1,11 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 5.0.0"
-
-group :test do
-  gem "simplecov"
-end
-
-gemspec path: "../"

data/gemfiles/sidekiq7.gemfile

@@ -1,11 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "sidekiq", "~> 7.0"
-
-group :test do
-  gem "simplecov", "~> 0.17.0"
-end
-
-gemspec path: "../"

data/spec/loga/sidekiq7/job_logger_spec.rb

@@ -1,125 +0,0 @@
-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