insights-loggers-ruby 0.1.6 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4c5770a83d1155b302ab246cde573db7d4ba736ffb709921dced6e594c72626
-  data.tar.gz: cdcb01d4be0d549247510a1b605eb2964074079cf350cebd1560dcae480e961b
+  metadata.gz: b3c5b0ec28bca5abab1df123d3c7156f2d6121ed47cb2cfc85aaff4e46913704
+  data.tar.gz: 407cab2b0891fdbba9427961efd53fd9e32e64de0547cd7ab90696fa386ed8d0
 SHA512:
-  metadata.gz: 783f3771ab119d5a36550941919cd474f387e6899e7fbf42bf5ccfe3761995a2b591ad81c593d4d5ab18e5462976b4749ab6b9109739d0157c137d8b89f8a253
-  data.tar.gz: 0f359ef12081f15d39f173374447b5bdb4d0bd4aa1fc50bee770dc5ca84f0c7e7814ebe7dc4ab287a4964ac747f1d3717a63aa1582772a06ecf370ead289f36f
+  metadata.gz: fe581909260b999d40c69934063acaa2939ce3a19b4c07b35a9a60613343d294946d00ae67b6b49e66ddb14147d740933b40fba2485a41c0fbdb16e69c139c5a
+  data.tar.gz: 45451921677cdc7963e216e38508a524d8cc8f06e869f257f54acb74b85556df480cac1559c50fcfdeb62c9502ca57f9aa902192c44cd0a34664b75d22e36a68

data/README.md

@@ -45,6 +45,7 @@ ManageIQ::Loggers::Base
 ManageIQ::Loggers::Container
 ManageIQ::Loggers::CloudWatch
 ManageIQ::Loggers::Journald
+Insights::Loggers::Container
 Insights::Loggers::StdErrorLogger
 TopologicalInventory::Providers::Common::Logger
 ```
@@ -80,7 +81,7 @@ Standard error logger produces formatted output:
  "pid":11561, # process id
  "tid":"3fd1d4c2ffd4", # thread id
  "service": "progname",
- "level":"warning", #info, warning, error, debug
+ "level":"warning", # info(default), warning, error, debug
  "message":"test",
  "request_id": "REQ_ID", # Thread.current[:request_id]
  "tags":["MyApp"],

data/insights-loggers-ruby.gemspec

@@ -23,10 +23,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "activesupport", "~> 5.2", ">= 5.2.4.3"
-  spec.add_runtime_dependency "topological_inventory-providers-common", "~> 3.0.1"
+
   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/cloud_watch.rb

@@ -0,0 +1,33 @@
+# inspired by https://github.com/ManageIQ/manageiq-loggers/blob/master/lib/manageiq/loggers/cloud_watch.rb
+require 'active_support/core_ext/string'
+require 'active_support/logger'
+
+module Insights
+  module Loggers
+    class CloudWatch < ManageIQ::Loggers::Base
+      NAMESPACE_FILE = "/var/run/secrets/kubernetes.io/serviceaccount/namespace".freeze
+
+      def self.new(*args)
+        access_key_id     = ENV["CW_AWS_ACCESS_KEY_ID"].presence
+        secret_access_key = ENV["CW_AWS_SECRET_ACCESS_KEY"].presence
+        log_group_name    = ENV["CLOUD_WATCH_LOG_GROUP"].presence
+        log_stream_name   = ENV["HOSTNAME"].presence
+        container_logger = Insights::Loggers::Container.new
+
+        return container_logger unless access_key_id && secret_access_key && log_group_name && log_stream_name
+
+        require 'cloudwatchlogger'
+
+        creds = {:access_key_id => access_key_id, :secret_access_key => secret_access_key}
+        cloud_watch_logdev = CloudWatchLogger::Client.new(creds, log_group_name, log_stream_name)
+        super(cloud_watch_logdev).tap { |logger| logger.extend(ActiveSupport::Logger.broadcast(container_logger)) }
+      end
+
+      def initialize(logdev, *args)
+        super
+        self.formatter = ManageIQ::Loggers::Container::Formatter.new
+        self.level = ENV['LOG_LEVEL'] if ENV['LOG_LEVEL']
+      end
+    end
+  end
+end

data/lib/insights/loggers/container.rb

@@ -0,0 +1,18 @@
+require 'active_support/core_ext/string'
+require 'active_support/logger'
+
+module Insights
+  module Loggers
+    class Container < ManageIQ::Loggers::Container
+      def initialize(logdev = STDOUT, *args)
+        super
+        self.level = ENV['CONTAINER_LOG_LEVEL'] || ENV['LOG_LEVEL'] || DEBUG
+      end
+
+      def level=(new_level)
+        # overwrite method ManageIQ::Loggers::Container#level=
+        method(__method__).super_method.super_method.call(new_level)
+      end
+    end
+  end
+end

data/lib/insights/loggers/factory.rb

@@ -2,7 +2,7 @@ module Insights
   module Loggers
     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"
@@ -47,9 +55,25 @@ module Insights
         when "Insights::Loggers::StdErrorLogger"
           require "manageiq/loggers/base"
           require "manageiq/loggers/container"
+          require "insights/loggers/container"
           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 "Insights::Loggers::CloudWatch"
+          require "manageiq/loggers/base"
+          require "manageiq/loggers/container"
+          require "insights/loggers/container"
+          require "insights/loggers/cloud_watch"
         when "TopologicalInventory::Providers::Common::Logger"
           require "topological_inventory/providers/common/logging"
+        when "Insights::Loggers::Container"
+          require "manageiq/loggers/base"
+          require "manageiq/loggers/container"
+          require "insights/loggers/container"
         else
           raise ArgumentError, "Can't load libraries for #{logger_class}."
         end

data/lib/insights/loggers/std_error_logger.rb

@@ -1,10 +1,11 @@
 module Insights
   module Loggers
-    class StdErrorLogger < ManageIQ::Loggers::Container
+    class StdErrorLogger < Container
       def initialize(*args)
         super
         self.reopen(STDERR)
         self.formatter = Formatter.new
+        self.level = INFO
       end
 
       def app_name_for_formatter(app_name)

data/lib/insights/loggers/version.rb

@@ -1,5 +1,5 @@
 module Insights
   module Loggers
-    VERSION = "0.1.6".freeze
+    VERSION = "0.1.10".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: insights-loggers-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.10
 platform: ruby
 authors:
 - Insights Authors
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-06 00:00:00.000000000 Z
+date: 2021-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,20 +30,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.2.4.3
-- !ruby/object:Gem::Dependency
-  name: topological_inventory-providers-common
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: manageiq-loggers
   requirement: !ruby/object:Gem::Requirement
@@ -70,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
@@ -178,6 +178,8 @@ files:
 - insights-loggers-ruby.gemspec
 - lib/insights-loggers.rb
 - lib/insights/loggers.rb
+- lib/insights/loggers/cloud_watch.rb
+- lib/insights/loggers/container.rb
 - lib/insights/loggers/factory.rb
 - lib/insights/loggers/std_error_logger.rb
 - lib/insights/loggers/version.rb