insights-loggers-ruby 0.1.4 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48a427d726b55c9f26567a1ccae337c75fab2130361272527351492b29c99fff
-  data.tar.gz: 5bfd681d01537945399e9de46d17c9c9d235448d63117adadf2e5cc063844f88
+  metadata.gz: 4ba6c9d34a5f6d8de910652624371cd65569d4ec195e38d34abf0943f6486541
+  data.tar.gz: fe91d27236ab5d11c8930972efb26c789f00fcee2ca849a25b4a6b61f04068a9
 SHA512:
-  metadata.gz: cfa674afa253c9be709e7da36ffc985b2fbf838672800739992d4c0c735d6647c05fd7908d043e7bd5cc2a2d0b10ad4210c940d793e5d145a9033c63e7111e2f
-  data.tar.gz: 8cd5c7582c467fdf8717502d0acb35d59b31665bec9a7841f923d1d73f2a64870c9a2ac57f8b45811006fa79a2896e6fbc3b4b4e9115e15267bfa45b3458cacd
+  metadata.gz: 566482f5d024def7b0eb70fa3b56ef6a7d9f8d0c1daa01503ba1bcbad30e4f3e7b4c49844217f0c74791cbd964229120de4113243b7bc0f471333ba8774440fd
+  data.tar.gz: 5efcd7e237ff8b4a5f4a51c9391170448f2001186edbddb4c21ee5ca5c5b9d7ce51614f90ecbc22e56d2c34f2834110bc75886d52ced3596f84128e38bfa88d7

data/README.md

@@ -25,15 +25,15 @@ Or install it yourself as:
 ### Example
 ```ruby
 require 'insights/loggers'
-logger_class = "Insights::Loggers::LoggingService"
-logger = Insights::Loggers::Base.create_logger(logger_class)
-logger.class #=> Insights::Loggers::LoggingService
+logger_class = "Insights::Loggers::StdErrorLogger"
+logger = Insights::Loggers::Factory.create_logger(logger_class)
+logger.class #=> Insights::Loggers::StdErrorLogger
 logger.info("test")
 #{"@timestamp":"2021-04-28T12:56:28.682015 ","pid":11561,"tid":"3fd1d4c2ffd4","level":"info","message":"test","tags":["insights_application"],"labels":{"app":"insights_application"}}
 #^^^standard error output (it is not return value)
 #=> true
 #
-logger = Insights::Loggers::Base.create_logger(logger_class, {:app_name => "MyApp"})
+logger = Insights::Loggers::Factory.create_logger(logger_class, {:app_name => "MyApp"})
 logger.warn("test")
 #{"@timestamp":"2021-04-28T13:31:40.311131 ","pid":11561,"tid":"3fd1d4c2ffd4","level":"warning","message":"test","tags":["MyApp"],"labels":{"app":"MyApp"}}
 #^^^standard error output
@@ -45,14 +45,14 @@ ManageIQ::Loggers::Base
 ManageIQ::Loggers::Container
 ManageIQ::Loggers::CloudWatch
 ManageIQ::Loggers::Journald
-Insights::Loggers::LoggingService
+Insights::Loggers::StdErrorLogger
 TopologicalInventory::Providers::Common::Logger
 ```
 
 First for refers to gem `manageiq-loggers` and
 last one refers to `topological_inventory-providers-common` gem.
 
-`insights-loggers-ruby` adds own logger `Insights::Loggers::LoggingService`
+`insights-loggers-ruby` adds own logger `Insights::Loggers::StdErrorLogger`
 which is producing log to standard error output.
 This standard error output can be consumed by [haberdasher](https://github.com/RedHatInsights/haberdasher) tool.
 
@@ -61,18 +61,18 @@ This standard error output can be consumed by [haberdasher](https://github.com/R
 Logger object can be built with method:
 
 ```
-Insights::Loggers::Base.create_logger
+Insights::Loggers::Factory.create_logger
 ```
 First parameter is `logger_class` and second parameter is
 hash with parameters.
 Supported hash parameters are:
 
 - `:log_path` - required for `ManageIQ::Loggers::Base` logger, it specifies the path to log file
-- `:app_name` - applicable for `Insights::Loggers::LoggingService`, it specifies the tags and labels values in formatted output
+- `:app_name` - applicable for `Insights::Loggers::StdErrorLogger`, it specifies the tags and labels values in formatted output
 
-### Formatted output for `Insights::Loggers::LoggingService` logger
+### Formatted output for `Insights::Loggers::StdErrorLogger` logger
 
-Logging service produces formatted output:
+Standard error logger produces formatted output:
 
 ```
 {"@timestamp":"2021-04-28T13:31:40.311131 ",
@@ -91,7 +91,7 @@ when app_name is not set in hash parameters.
 
 ## Dependencies
 
-Logging service inherits from `ManageIQ::Loggers::Container` class and
+Standard error logger inherits from `ManageIQ::Loggers::Container` class and
 thanks to that `manageiq-loggers` is required dependency.
 
 Usage other loggers is possible also from `manageiq-loggers` gem.

data/insights-loggers-ruby.gemspec

@@ -22,11 +22,13 @@ 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"
-  spec.add_runtime_dependency "topological_inventory-providers-common", "~> 3.0.1"
+  spec.add_runtime_dependency "activesupport", "~> 5.2", ">= 5.2.4.3"
+
   spec.add_runtime_dependency "manageiq-loggers", "~> 0.4", ">= 0.4.2"
 
-  spec.add_runtime_dependency "cloudwatchlogger", "~> 0.3.0"
+  spec.add_runtime_dependency "cloudwatchlogger", "~> 0.2.1"
+
+  spec.add_development_dependency "topological_inventory-providers-common", "~> 3.0.1"
   spec.add_development_dependency "manageiq-style", "~> 1.3.0"
   spec.add_development_dependency "rake", "~> 12.3", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"

data/lib/insights/loggers.rb

@@ -1,2 +1,2 @@
 require "insights/loggers/version"
-require "insights/loggers/base"
+require "insights/loggers/factory"

data/lib/insights/loggers/{base.rb → factory.rb}

@@ -1,8 +1,8 @@
 module Insights
   module Loggers
-    class Base
+    class Factory
       def self.create_logger(logger_class, args = nil)
-        logger_library_loader(logger_class)
+        logger_library_loader(logger_class, args)
         klass = logger_class.safe_constantize
 
         if klass
@@ -23,10 +23,18 @@ module Insights
           logger.app_name_for_formatter(args[:app_name])
         end
 
+        if args && args[:extend_module]
+          logger.extend(args[:extend_module].safe_constantize)
+        end
+
         logger
       end
 
-      private_class_method def self.logger_library_loader(logger_class)
+      EXTENDED_LIBRARY_FROM_MODULE = {
+        "TopologicalInventory::Providers::Common::LoggingFunctions" => "topological_inventory/providers/common/logging"
+      }.freeze
+
+      private_class_method def self.logger_library_loader(logger_class, args = nil)
         case logger_class
         when "ManageIQ::Loggers::Base"
           require "manageiq/loggers/base"
@@ -44,10 +52,16 @@ module Insights
 
           require "manageiq/loggers/base"
           require "manageiq/loggers/journald"
-        when "Insights::Loggers::LoggingService"
+        when "Insights::Loggers::StdErrorLogger"
           require "manageiq/loggers/base"
           require "manageiq/loggers/container"
-          require "insights/loggers/logging_service"
+          require "insights/loggers/std_error_logger"
+          if args && args[:extend_module]
+            library_path = EXTENDED_LIBRARY_FROM_MODULE[args[:extend_module]]
+            raise ArgumentError, "Unable to find library for #{args[:extend_module]}" unless library_path
+
+            require EXTENDED_LIBRARY_FROM_MODULE[args[:extend_module]]
+          end
         when "TopologicalInventory::Providers::Common::Logger"
           require "topological_inventory/providers/common/logging"
         else

data/lib/insights/loggers/{logging_service.rb → std_error_logger.rb}

@@ -1,6 +1,6 @@
 module Insights
   module Loggers
-    class LoggingService < ManageIQ::Loggers::Container
+    class StdErrorLogger < ManageIQ::Loggers::Container
       def initialize(*args)
         super
         self.reopen(STDERR)

data/lib/insights/loggers/version.rb

@@ -1,5 +1,5 @@
 module Insights
   module Loggers
-    VERSION = "0.1.4".freeze
+    VERSION = "0.1.9".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: insights-loggers-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.9
 platform: ruby
 authors:
 - Insights Authors
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-03 00:00:00.000000000 Z
+date: 2021-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: topological_inventory-providers-common
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '5.2'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 5.2.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: '5.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.2.4.3
 - !ruby/object:Gem::Dependency
   name: manageiq-loggers
   requirement: !ruby/object:Gem::Requirement
@@ -64,14 +56,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.2.1
+- !ruby/object:Gem::Dependency
+  name: topological_inventory-providers-common
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: manageiq-style
   requirement: !ruby/object:Gem::Requirement
@@ -172,8 +178,8 @@ files:
 - insights-loggers-ruby.gemspec
 - lib/insights-loggers.rb
 - lib/insights/loggers.rb
-- lib/insights/loggers/base.rb
-- lib/insights/loggers/logging_service.rb
+- lib/insights/loggers/factory.rb
+- lib/insights/loggers/std_error_logger.rb
 - lib/insights/loggers/version.rb
 homepage: https://github.com/ManageIQ/manageiq-loggers
 licenses: