loga 2.7.0 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a97eae050b9e31ef0ddb1e6f327563c4e0f54eb1a42ea7bb53b03e22c8fb9c9
-  data.tar.gz: 771373253651884fead19e93038d5c7e31827d3c562d2cd748e0acd66f31124e
+  metadata.gz: 9f60214dba9c061d960dfd2704ee5e99c6f56a07ce4c7cc6f96bbe515981243a
+  data.tar.gz: dd73dfe8323036995f6f65296ec0f9d3c753f58e1232a0a60b1702058313e00f
 SHA512:
-  metadata.gz: 28d17a44bf2c8c0a919916438c8935a4033e14176185ca87ff69987ee03507dee5ae854c2887ff89d174c78fd0fa846b8d8237392b6705eb552365202f2f7680
-  data.tar.gz: 45bf838fa85c9a3a01ba1134034b2ab2e577cd9f9c28ecceaf175935ff69627f156856dc8e383b5212829636934657ee4fb0c40f5e5e992a54eb1027ee47d74f
+  metadata.gz: 1457fd34f8bf23f3d97fff90806e8cf5572c74232de2439ff4e0ba0a37fdab762da3ea599ca58dc0f9a5861f8743859723ca4c9852054d0b0e237b72e3d84d66
+  data.tar.gz: 51390e73c632c180f8d5f41d2bbd231c61bed119a5518eae01f57095b4b659bb5d50c0f1a4d199cfd065e20374f5270b8e549b9fe03dd8a3a32097fd16ce3abf

data/.github/workflows/build-and-test.yml

@@ -0,0 +1,72 @@
+name: Build & Test
+run-name:  Build & Test - ${{ github.ref_name }}
+
+on:
+  push:
+    branches:
+      - '**'
+
+jobs:
+  version-check:
+    runs-on: ubuntu-latest
+    if: "!contains(github.ref, 'master')"
+    steps:
+      - name: Checkout commit
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Gem versioned correctly
+        shell: sh
+        run: |
+          CHANGED=$(git diff origin/master HEAD --name-only | grep 'lib/loga') || exit 0
+          [[ -z "$CHANGED" ]] || (echo "$CHANGED" | grep 'version.rb') || exit 1
+
+  rubocop:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.3'
+          bundler-cache: true
+
+      - name: Run RuboCop
+        run: bundle exec rubocop
+
+  build-and-test:
+    runs-on: ubuntu-latest
+    services:
+      redis:
+        image: redis:7
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 6379:6379
+    strategy:
+      matrix:
+        ruby-version: ['2.7', '3.0', '3.1', '3.2', '3.3', 'head']
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+
+      - name: Set up Ruby ${{ matrix.ruby-version }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+
+      - name: Install appraisal gems
+        run: bundle exec appraisal install
+
+      - name: Test with RACK_ENV=development
+        run: RACK_ENV=development bundle exec appraisal rspec
+
+      - name: Test with RACK_ENV=production
+        run: RACK_ENV=production bundle exec appraisal rspec

data/.github/workflows/publish-gem.yml

@@ -0,0 +1,28 @@
+name: Deploy to RubyGems
+run-name: ${{ github.actor }} is publishing a new version
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  publish-gem:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.3'
+          bundler-cache: true
+
+      - name: Build gem
+        run: gem build loga.gemspec
+
+      - name: Publish gem
+        env:
+          GEM_HOST_API_KEY: ${{ secrets.RUBYGEMS_API_KEY }}
+        run: |
+          gem push loga-*.gem

data/.rubocop.yml

@@ -1,4 +1,8 @@
+inherit_from: .rubocop_todo.yml
+
 AllCops:
+  TargetRubyVersion: 2.7
+  NewCops: enable
   Exclude:
     - '*.gemspec'
     - 'gemfiles/*'

data/.rubocop_todo.yml

@@ -0,0 +1,206 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config --exclude-limit 10000000`
+# on 2024-02-09 15:03:07 UTC using RuboCop version 1.60.2.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 5
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation, Include.
+# Include: **/*.gemfile, **/Gemfile, **/gems.rb
+Bundler/OrderedGems:
+  Exclude:
+    - 'Gemfile'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Layout/EmptyLineAfterGuardClause:
+  Exclude:
+    - 'lib/loga/formatters/gelf_formatter.rb'
+
+# Offense count: 34
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
+# SupportedHashRocketStyles: key, separator, table
+# SupportedColonStyles: key, separator, table
+# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
+Layout/HashAlignment:
+  Exclude:
+    - 'lib/loga/configuration.rb'
+    - 'lib/loga/formatters/gelf_formatter.rb'
+    - 'lib/loga/rack/logger.rb'
+    - 'lib/loga/railtie.rb'
+    - 'lib/loga/sidekiq6/job_logger.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowDoxygenCommentStyle, AllowGemfileRubyComment.
+Layout/LeadingCommentSpace:
+  Exclude:
+    - 'lib/loga/railtie.rb'
+
+# Offense count: 2
+# Configuration parameters: AllowComments, AllowEmptyLambdas.
+Lint/EmptyBlock:
+  Exclude:
+    - 'Appraisals'
+    - 'spec/integration/sinatra_spec.rb'
+
+# Offense count: 1
+# Configuration parameters: AllowedParentClasses.
+Lint/MissingSuper:
+  Exclude:
+    - 'lib/loga/formatters/gelf_formatter.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Lint/RedundantCopDisableDirective:
+  Exclude:
+    - 'lib/loga/railtie.rb'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+Lint/SendWithMixinArgument:
+  Exclude:
+    - 'lib/loga/railtie.rb'
+
+# Offense count: 1
+# Configuration parameters: AllowedMethods, AllowedPatterns.
+Metrics/CyclomaticComplexity:
+  Max: 8
+
+# Offense count: 1
+# Configuration parameters: AllowedMethods, AllowedPatterns.
+Metrics/PerceivedComplexity:
+  Max: 9
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Migration/DepartmentName:
+  Exclude:
+    - 'lib/loga/railtie.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: PreferredName.
+Naming/RescuedExceptionsVariableName:
+  Exclude:
+    - 'lib/loga/sidekiq5/job_logger.rb'
+
+# Offense count: 3
+# Configuration parameters: Prefixes, AllowedPatterns.
+# Prefixes: when, with, without
+RSpec/ContextWording:
+  Exclude:
+    - 'spec/support/gethostname_shared.rb'
+    - 'spec/support/timecop_shared.rb'
+    - 'spec/unit/loga/configuration_spec.rb'
+
+# Offense count: 41
+# Configuration parameters: AllowSubject.
+RSpec/MultipleMemoizedHelpers:
+  Max: 12
+
+# Offense count: 6
+# Configuration parameters: AllowedPatterns.
+# AllowedPatterns: ^expect_, ^assert_
+RSpec/NoExpectationExample:
+  Exclude:
+    - 'spec/integration/sidekiq60_spec.rb'
+    - 'spec/integration/sidekiq61_spec.rb'
+    - 'spec/integration/sidekiq65_spec.rb'
+    - 'spec/integration/sidekiq7_spec.rb'
+
+# Offense count: 2
+# Configuration parameters: Include, CustomTransform, IgnoreMethods, IgnoreMetadata.
+# Include: **/*_spec.rb
+RSpec/SpecFilePathFormat:
+  Exclude:
+    - '**/spec/routing/**/*'
+    - 'spec/integration/rails/action_mailer_spec.rb'
+    - 'spec/integration/rails/railtie_spec.rb'
+
+# Offense count: 1
+RSpec/SubjectDeclaration:
+  Exclude:
+    - 'spec/unit/loga/event_spec.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AllowedReceivers.
+Style/CollectionCompact:
+  Exclude:
+    - 'lib/loga/configuration.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: Keywords, RequireColon.
+# Keywords: TODO, FIXME, OPTIMIZE, HACK, REVIEW, NOTE
+Style/CommentAnnotation:
+  Exclude:
+    - 'lib/loga/configuration.rb'
+
+# Offense count: 25
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: always, always_true, never
+Style/FrozenStringLiteralComment:
+  Exclude:
+    - 'Appraisals'
+    - 'Gemfile'
+    - 'Guardfile'
+    - 'Rakefile'
+    - 'lib/loga.rb'
+    - 'lib/loga/configuration.rb'
+    - 'lib/loga/event.rb'
+    - 'lib/loga/ext/core/tempfile.rb'
+    - 'lib/loga/ext/rails/rack/debug_exceptions.rb'
+    - 'lib/loga/ext/rails/rack/logger.rb'
+    - 'lib/loga/ext/rails/rack/logger3.rb'
+    - 'lib/loga/formatters/gelf_formatter.rb'
+    - 'lib/loga/formatters/simple_formatter.rb'
+    - 'lib/loga/log_subscribers/action_mailer.rb'
+    - 'lib/loga/parameter_filter.rb'
+    - 'lib/loga/rack/logger.rb'
+    - 'lib/loga/rack/request.rb'
+    - 'lib/loga/rack/request_id.rb'
+    - 'lib/loga/railtie.rb'
+    - 'lib/loga/service_version_strategies.rb'
+    - 'lib/loga/sidekiq5/job_logger.rb'
+    - 'lib/loga/sidekiq6/job_logger.rb'
+    - 'lib/loga/tagged_logging.rb'
+    - 'lib/loga/utilities.rb'
+    - 'lib/loga/version.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/GlobalStdStream:
+  Exclude:
+    - 'lib/loga/configuration.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: literals, strict
+Style/MutableConstant:
+  Exclude:
+    - 'lib/loga/rack/request.rb'
+
+# Offense count: 2
+Style/OpenStructUse:
+  Exclude:
+    - 'spec/unit/loga/formatters/gelf_formatter_spec.rb'
+
+# Offense count: 3
+# This cop supports safe autocorrection (--autocorrect).
+Style/RedundantFileExtensionInRequire:
+  Exclude:
+    - 'lib/loga/railtie.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Style/RedundantFreeze:
+  Exclude:
+    - 'lib/loga/sidekiq7/job_logger.rb'

data/Appraisals

@@ -1,12 +1,4 @@
-if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.7.0')
-  appraise 'rails42' do
-    gem 'rails', '~> 4.2.0'
-  end
-
-  appraise 'rails50' do
-    gem 'rails', '~> 5.0.0'
-  end
-
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.0.0')
   appraise 'rails52' do
     gem 'rails', '~> 5.2.0'
   end
@@ -16,60 +8,80 @@ appraise 'sinatra14' do
   gem 'sinatra', '~> 1.4.0'
 end
 
-if Gem::Version.new(RUBY_VERSION) > Gem::Version.new('2.5.0')
-  appraise 'rails60' do
-    gem 'rails', '~> 6.0.0'
-  end
+appraise 'sinatra2' do
+  gem 'sinatra', '~> 2.2.4'
+end
 
-  appraise 'sidekiq60' do
-    gem 'sidekiq', '~> 6.0.0'
-  end
+appraise 'sinatra3' do
+  gem 'sinatra', '~> 3.2.0'
+end
 
-  appraise 'sidekiq61' do
-    gem 'sidekiq', '~> 6.1.0'
-  end
+appraise 'sinatra4' do
+  gem 'sinatra', '~> 4.0.0'
+end
 
-  appraise 'sidekiq62' do
-    gem 'sidekiq', '~> 6.2.0'
-  end
+appraise 'sidekiq51' do
+  gem 'sidekiq', '~> 5.1.0'
+end
 
-  appraise 'sidekiq63' do
-    gem 'sidekiq', '~> 6.3.0'
-  end
+appraise 'sidekiq60' do
+  gem 'sidekiq', '~> 6.0.0'
+end
 
-  appraise 'sidekiq64' do
-    gem 'sidekiq', '~> 6.4.0'
-  end
+appraise 'sidekiq61' do
+  gem 'sidekiq', '~> 6.1.0'
+end
 
-  appraise 'sidekiq65' do
-    gem 'sidekiq', '~> 6.5.0'
-  end
+appraise 'sidekiq62' do
+  gem 'sidekiq', '~> 6.2.0'
+end
+
+appraise 'sidekiq63' do
+  gem 'sidekiq', '~> 6.3.0'
 end
 
-if Gem::Version.new(RUBY_VERSION) > Gem::Version.new('2.7.0')
+appraise 'sidekiq64' do
+  gem 'sidekiq', '~> 6.4.0'
+end
+
+appraise 'sidekiq65' do
+  gem 'sidekiq', '~> 6.5.0'
+end
+
+appraise 'sidekiq70' do
+  gem 'sidekiq', '~> 7.0.0'
+end
+
+appraise 'sidekiq71' do
+  gem 'sidekiq', '~> 7.1.0'
+end
+
+appraise 'sidekiq7' do
+  gem 'sidekiq', '~> 7.0'
+end
+
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.2.0')
+  appraise 'rails60' do
+    gem 'rails', '~> 6.0.0'
+  end
+
   appraise 'rails61' do
     gem 'rails', '~> 6.1.4.4'
   end
+end
 
+if Gem::Version.new(RUBY_VERSION) > Gem::Version.new('3.0.0')
   appraise 'rails70' do
     gem 'rails', '~> 7.0.0'
+    gem 'base64'
+    gem 'mutex_m'
   end
 
-  appraise 'sidekiq7' do
-    gem 'sidekiq', '~> 7.0'
+  appraise 'rails71' do
+    gem 'rails', '~> 7.1.0'
+    gem 'base64'
+    gem 'mutex_m'
   end
-
-  appraise 'sidekiq70' do
-    gem 'sidekiq', '~> 7.0.0'
-  end
-
-  appraise 'sidekiq71' do
-    gem 'sidekiq', '~> 7.1.0'
-  end
-end
-
-appraise 'sidekiq51' do
-  gem 'sidekiq', '~> 5.1.0'
 end
 
 appraise 'unit' do

data/CHANGELOG.md

@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.8.1] - 2023-02-12
+### Added
+- Improve CI pipeline
+### Fixed
+- Support for rails 7.1
+
+## [2.8.0] - 2023-11-14
+### Added
+- Support open-telemetry and add trace_id and span_id to logs events
+
 ## [2.7.0] - 2023-03-28
 ### Added
 - Support for sidekiq 7

data/Gemfile

@@ -3,6 +3,28 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in loga.gemspec
 gemspec
 
+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/rails52.gemfile

@@ -4,8 +4,30 @@ source "https://rubygems.org"
 
 gem "rails", "~> 5.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"
+  gem "simplecov", "~> 0.17.0"
 end
 
 gemspec path: "../"

data/gemfiles/rails60.gemfile

@@ -4,6 +4,28 @@ source "https://rubygems.org"
 
 gem "rails", "~> 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/rails61.gemfile

@@ -4,6 +4,28 @@ source "https://rubygems.org"
 
 gem "rails", "~> 6.1.4.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

data/gemfiles/rails70.gemfile

@@ -3,6 +3,30 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 7.0.0"
+gem "base64"
+gem "mutex_m"
+
+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"

data/gemfiles/rails71.gemfile

@@ -0,0 +1,35 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 7.1.0"
+gem "base64"
+gem "mutex_m"
+
+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/sidekiq51.gemfile

@@ -4,6 +4,28 @@ source "https://rubygems.org"
 
 gem "sidekiq", "~> 5.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