metlo 0.0.2-arm64-darwin → 0.0.4-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94a089b9b957b18388d0893b6209076d7b8b0724fb14cc7d54285e07e0e55343
-  data.tar.gz: 73b65162c00790c74809838b8b5fc0aff1140a61933c3fa09ba510169172718a
+  metadata.gz: 813e849e9d6138abfc95c9f9991cfc58b86d86c4a3fd026a62ae4b5f63b21224
+  data.tar.gz: eda5aeba1e4a9d665e1fe3d1391e69201ba1ef3569bcf22e75618d04946a1d33
 SHA512:
-  metadata.gz: 113bec7da70c8489fd9b5f782b0669f41c89ee7d2251c59d1f9a32adf3c9be89e273e27ff8afc2f0fc3e02f786be07fe7c85013ab05fa9285c2caaa57feb8c42
-  data.tar.gz: d10cd9a8ae74611c946e3688a0f6efaa73a0f325b32db910a495aacd9423b6092142939d20777b19951331549c19bdba5efac52e1f0bed6445deafa90f2162d1
+  metadata.gz: c6c09989ed89c0ca8d94e2e4a1178a44e3f02f43a91291faf43b294be49bfa26de93e3ec5d9e0b48fc8b0b9e813133dac79f9e301131ad740470aba651cd7611
+  data.tar.gz: c10b1f2c410f5b63839f41e36670f7b35073760d45ec8e9da8131f86853e35c345d25fc93b6c82e6dbdf3e83855686942a28a277953bf01dfa33d693a3adf7e5

data/lib/metlo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Metlo
-  VERSION = "0.0.2"
+  VERSION = "0.0.4"
 end

data/lib/metlo.rb

@@ -4,7 +4,7 @@ require_relative "./libmetlo"
 
 module Metlo
 
-    class ResponseTimer
+    class Metlo
         
         @@MAX_RES_ITER_COUNT = 10
         @@MAX_BODY_LENGTH = 10 * 1024
@@ -25,15 +25,32 @@ module Metlo
             block_response = params[:block_response]
             get_user = params[:get_user]
 
+            if not (log_level.nil?) 
+                if not (log_level.is_a? String)
+                    log_level = "info"
+                    @logger = Logger.new($stdout,convert_log_level(log_level))
+                    @logger.warn("log_level is not a string. log_level is expected to be one of trace, debug, info, warn, error.\nDefaulting log level to info.")
+                elsif not (@@LOG_LEVELS.include? log_level)
+                    log_level = "info"
+                    @logger = Logger.new($stdout,convert_log_level(log_level))
+                    @logger.warn("log_level is not one of trace, debug, info, warn, error.\nDefaulting log level to info")
+                end
+            else
+                log_level = "info"
+                @logger = Logger.new($stdout,convert_log_level(log_level))
+            end
+
+            setup_log(@logger)
+
             # Metlo URL
             if not (metlo_url.is_a? String)
-                p "metlo_url is not a string"
+                @logger.warn("metlo_url is not a string")
                 @disable = true
             end
 
             # Metlo API Key
             if not (api_key.is_a? String)
-                p "api_key is not a string"
+                @logger.warn("api_key is not a string")
                 @disable = true
             end
 
@@ -41,7 +58,7 @@ module Metlo
             if not (backend_port.nil?)
                 # Value is present
                 if not (backend_port.is_a? Integer)
-                    p "backend_port is not an integer"
+                    @logger.warn("backend_port is not an integer")
                     @disable = true
                 end
             else
@@ -56,39 +73,25 @@ module Metlo
             # Collector Port
             if not (collector_port.nil?)
                 if not (collector_port.is_a? Integer)
-                    p "collector_port is not an integer"
+                    @logger.warn("collector_port is not an integer")
                     @disable = true
                 end 
             else
                 collector_port = 8081
             end
 
-            if not (log_level.nil?)
-                if not (log_level.is_a? String)
-                    p "log_level is not a string. log_level is expected to be one of trace, debug, info, warn, error."
-                    p "Defaulting log level to info."
-                    log_level = "info"
-                elsif not (@@LOG_LEVELS.include? log_level)
-                    p "log_level is not one of trace, debug, info, warn, error."
-                    p "Defaulting log level to info"
-                    log_level = "info"
-                end
-            else
-                log_level = "info"
-            end
-
             if not (encryption_key.nil?) and not (encryption_key.is_a? String)
-                p "Encryption key is expected to be a string."
+                @logger.warn("Encryption key is expected to be a string.")
                 encryption_key = nil
             end
             
             if not (block_response.nil?)
                 if not defined? block_response == "expression"
-                    p "block_response param is expected to be a symbol to a method/function"
+                    @logger.warn("block_response param is expected to be a symbol to a method/function")
                     @block_fn = method(:metlo_default_block)
                 else
                     if not(((defined? method(block_response)) == "method") and (method(block_response).arity == 1))
-                        p "block_response param is expected to be a method that takes a single param"
+                        @logger.warn("block_response param is expected to be a method that takes a single param")
                         @block_fn = method(:metlo_default_block)
                     else
                         @block_fn = method(block_response)
@@ -101,7 +104,7 @@ module Metlo
 
             if not (get_user.nil?)
                 if not (defined? get_user == "expression" and defined? method(get_user) == "method" and method(get_user).arity == 1)
-                    p "get_user param is expected to be a method that takes a single param env"
+                    @logger.warn("get_user param is expected to be a method that takes a single param env")
                     @get_user = nil
                 else
                     @get_user = method(get_user)
@@ -211,7 +214,7 @@ module Metlo
                     body_tmp.rewind
                 end
             else
-                p "Metlo doesn't currently handle streaming responses"
+                @logger.debug("Metlo doesn't currently handle streaming responses")
             end
 
             # Check response type
@@ -254,7 +257,31 @@ module Metlo
         end
 
         def metlo_default_block(env)
-        return [403,{},["Forbidden"]]
+            return [403,{},["Forbidden"]]
         end
+
+        def setup_log(logger)
+            logger.formatter = proc do |severity, datetime, _progname, msg|
+                datefmt = datetime.strftime('%Y-%m-%dT%H:%M:%S.%6N')
+                "[timestamp=#{datefmt} level=#{severity.ljust(5)}] Metlo: #{msg}\n"
+              end              
+        end
+
+        def convert_log_level(level)
+            if level == "trace"
+                return Logger::DEBUG
+            elsif level == "debug"
+                return Logger::DEBUG
+            elsif level == "info"
+                return Logger::INFO
+            elsif level == "warn"
+                return Logger::WARN
+            elsif level == "error"
+                return Logger::ERROR
+            else
+                return Logger::INFO
+            end                
+        end
+
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metlo
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: arm64-darwin
 authors:
 - Metlo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-27 00:00:00.000000000 Z
+date: 2023-07-28 00:00:00.000000000 Z
 dependencies: []
 description: The Ruby Agent for Metlo
 email: