manageiq-loggers 1.1.1 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a32bea06f89fab47efe8276e4a6bb8847a4bb319d5f720a0fefa8b8e4af84df
-  data.tar.gz: 9bb69c8569b7cd7c1f412ef61ee2b5b1c720ed8749b11bff4cb7d374c8db75ed
+  metadata.gz: c55e72746b776be0f82b04de5ccbb9a231dc8b7d1856b553c1999554b7682d80
+  data.tar.gz: 34a98640f11f0a77663e9352aaff1b4883932b02b9d0ea81e607678416b7d55b
 SHA512:
-  metadata.gz: 3bcc952f60b915db50ca50fb798d78ee80554849a6f36026550d235a4365f2ebba1908ec82a5035a529bdda56299a98196811e7bb29e815919a814f758bc39ad
-  data.tar.gz: aa68849ecdc51297a67e256e35b6cc894e0ed5d1a9a369997e28a2f5791ac8f4411aac8cf72a2fee3cd596ddcb38a1eda6a959b34e2b5c78a5cfb4a130221632
+  metadata.gz: d5fbc6dde299dc4a10d357f037c0eba5b519c6d0e5b5549867f8eb69f03fc846c9a61af2dbed6c136878f8af585faaeeca298f1d80f46c35361095500c91bca1
+  data.tar.gz: 4b41a58754367d7cf3f9c05278a7d7935c35535d796c7ade14258395e76aa082444be14a2334a29863a133c90e77af6a07475f027f4301792b1b32c3e053fca1

data/.codeclimate.yml

@@ -31,4 +31,4 @@ plugins:
   rubocop:
     enabled: true
     config: ".rubocop_cc.yml"
-    channel: rubocop-0-82
+    channel: rubocop-1-56-3

data/.github/workflows/ci.yaml

@@ -1,33 +1,39 @@
+---
 name: CI
-
 on:
   push:
   pull_request:
   schedule:
-  - cron: '0 0 * * 0'
-
+  - cron: 0 0 * * 0
 jobs:
   ci:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         ruby-version:
-        - '2.6'
         - '2.7'
         - '3.0'
+        - '3.1'
+        - '3.2'
+        - '3.3'
+        rails-version:
+        - '6.1'
+        - '7.0'
+        - '7.1'
     env:
+      TEST_RAILS_VERSION: ${{ matrix.rails-version }}
       CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
     steps:
     - uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: ${{ matrix.ruby-version }}
+        ruby-version: "${{ matrix.ruby-version }}"
         bundler-cache: true
       timeout-minutes: 30
     - name: Run tests
       run: bundle exec rake
     - name: Report code coverage
-      if: ${{ github.ref == 'refs/heads/master' && matrix.ruby-version == '3.0' }}
+      if: ${{ github.ref == 'refs/heads/master' && matrix.ruby-version == '3.1' }}
       continue-on-error: true
       uses: paambaati/codeclimate-action@v5

data/CHANGELOG.md

@@ -5,6 +5,16 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [1.2.1] - 2025-05-21
+### Fixed
+- Handle nil caller_object in Journald logger [(#91)](https://github.com/ManageIQ/manageiq-loggers/pull/91)
+
+## [1.2.0] - 2024-09-30
+### Added
+- Test with ruby 3.1 and 3.0 [(#65)](https://github.com/ManageIQ/manageiq-loggers/pull/65)
+- Add ActiveSupport versions into the test matrix [(#77)](https://github.com/ManageIQ/manageiq-loggers/pull/77)
+- Add a wrap method to support BroadcastLogger [(#63)](https://github.com/ManageIQ/manageiq-loggers/pull/63)
+
 ## [1.1.1] - 2023-12-13
 ### Fixed
 - Fix Journald::Formatter's arguments list [(#61)](https://github.com/ManageIQ/manageiq-loggers/pull/61)
@@ -92,7 +102,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [0.1.0] - 2019-01-08
 
-[Unreleased]: https://github.com/ManageIQ/manageiq-loggers/compare/v1.1.1...master
+[Unreleased]: https://github.com/ManageIQ/manageiq-loggers/compare/v1.2.1...v1.2.z
+[1.2.1]: https://github.com/ManageIQ/manageiq-loggers/compare/v1.2.0...v1.2.1
+[1.2.0]: https://github.com/ManageIQ/manageiq-loggers/compare/v1.1.1...v1.2.0
 [1.1.1]: https://github.com/ManageIQ/manageiq-loggers/compare/v1.1.0...v1.1.1
 [1.1.0]: https://github.com/ManageIQ/manageiq-loggers/compare/v1.0.1...v1.1.0
 [1.0.1]: https://github.com/ManageIQ/manageiq-loggers/compare/v1.0.0...v1.0.1

data/Gemfile

@@ -2,3 +2,15 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in manageiq-loggers.gemspec
 gemspec
+
+minimum_version =
+  case ENV['TEST_RAILS_VERSION']
+  when "6.1"
+    "~>6.1.7"
+  when "7.0"
+    "~>7.0.8"
+  else
+    "~>7.1.4"
+  end
+
+gem "activesupport", minimum_version

data/lib/manageiq/loggers/base.rb

@@ -10,6 +10,19 @@ module ManageIQ
     class Base < Logger
       MAX_LOG_LINE_LENGTH = 8.kilobytes
 
+      class << self
+        def wrap(source, *loggers)
+          loggers.flatten!
+          if ActiveSupport.gem_version >= Gem::Version.new("7.1.0")
+            require 'active_support/broadcast_logger'
+            ActiveSupport::BroadcastLogger.new(*loggers.unshift(source))
+          else
+            loggers.each { |logger| source.extend(ActiveSupport::Logger.broadcast(logger)) }
+            source
+          end
+        end
+      end
+
       def initialize(*_, **_)
         super
         self.level = INFO
@@ -28,6 +41,10 @@ module ManageIQ
         @local_levels = {}
       end
 
+      def wrap(loggers)
+        self.class.wrap(self, loggers)
+      end
+
       # Silences the logger for the duration of the block.
       #
       # Taken from activesupport/logger_silence

data/lib/manageiq/loggers/cloud_watch.rb

@@ -1,5 +1,5 @@
 require 'active_support'
-require 'active_support/core_ext/string'
+require 'active_support/core_ext/object'
 require 'active_support/logger'
 
 module ManageIQ
@@ -20,7 +20,8 @@ module ManageIQ
 
         creds = {:access_key_id => access_key_id, :secret_access_key => secret_access_key}
         cloud_watch_logdev = CloudWatchLogger::Client.new(creds, log_group, log_stream)
-        super(cloud_watch_logdev).tap { |logger| logger.extend(ActiveSupport::Logger.broadcast(container_logger)) }
+        cloud_watch_logger = super(cloud_watch_logdev)
+        cloud_watch_logger.wrap(container_logger)
       end
 
       def initialize(logdev, *args)

data/lib/manageiq/loggers/journald.rb

@@ -40,15 +40,21 @@ module ManageIQ
         end
 
         message = formatter.call(format_severity(severity), nil, progname, message)
-        caller_object = caller_locations(3, 1).first
+
+        # The call stack is different depending on if we are using the newer
+        # ActiveSupport::BroadcastLogger or the older ActiveSupport::Logger.broadcast
+        # so we have to account for that difference when walking up the caller_locations
+        # to get the "real" logging location.
+        callstack_start = ActiveSupport.gem_version >= Gem::Version.new("7.1.0") ? 7 : 3
+        caller_object = caller_locations(callstack_start, 1)&.first
 
         Systemd::Journal.message(
           :message           => message,
           :priority          => log_level_map[severity],
           :syslog_identifier => progname,
-          :code_line         => caller_object.lineno,
-          :code_file         => caller_object.absolute_path,
-          :code_func         => caller_object.label
+          :code_line         => caller_object&.lineno,
+          :code_file         => caller_object&.absolute_path,
+          :code_func         => caller_object&.label
         )
       end
 

data/lib/manageiq/loggers/version.rb

@@ -1,5 +1,5 @@
 module ManageIQ
   module Loggers
-    VERSION = "1.1.1".freeze
+    VERSION = "1.2.1".freeze
   end
 end

data/manageiq-loggers.gemspec

@@ -21,12 +21,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "activesupport",     ">= 5.0", "< 7.1"
+  spec.add_runtime_dependency "activesupport",     ">= 5.0"
   spec.add_runtime_dependency "manageiq-password", "< 2"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "cloudwatchlogger"
-  spec.add_development_dependency "manageiq-style"
+  spec.add_development_dependency "manageiq-style", ">= 1.5.2"
   spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "simplecov", ">= 0.21.2"

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-loggers
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.1
 platform: ruby
 authors:
 - ManageIQ Authors
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-13 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -17,9 +16,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +23,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: manageiq-password
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +71,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -142,8 +135,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
-email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -176,7 +167,6 @@ homepage: https://github.com/ManageIQ/manageiq-loggers
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -191,8 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Loggers for ManageIQ projects
 test_files: []