metlo 0.0.2-x86_64-linux → 0.0.4-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04c4f41b397eecedc7f0a5963c1a1c0888678d5c84ae11c053b799bc199f43bd
-  data.tar.gz: 13077725d93eb8c0d8cf38cd72cb81865f6b655cf3cae2fe104522761d5d76a8
+  metadata.gz: 7053e3bea4b9cdce9e972d9a1d8bd3472083bd9b5854d7c65adb3b65aa07fc41
+  data.tar.gz: b9c45cf4f0ded32e1b57b03df5a6261cd51458ecffecc169d8f48d88ad310422
 SHA512:
-  metadata.gz: c2261ba50f9bf8cbb62115fc3fdee710bbf077e9bebf61295cf73e24574a76537f43fa808cdcd999295b0b00b2c24029a8362047c4c64d0f6983d039ca2e4e88
-  data.tar.gz: 801e240efef61523a410cc979f69bdbd7dbb7eaf6abd36694a2208fe5a06f4844769a574785053ce14cb0fe63c5ec1844d7cc3d4933052dff90412df554d5bbe
+  metadata.gz: b61ce747e854712c258d967077ba6dfb42413975439075015d09c0388da489f27682970b081c843b34be44821b94ca82b133878182e53737a9eda92d7be47974
+  data.tar.gz: 29485d67e1009b47d2ebfacf0a23e9bbea7c4f87ef97d27f312782eb6e726487db23cf3bc35175eac949f8eb5ff805106114566bb9a55192afa6e9b5fc8f8426

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

data/metlo.gemspec

@@ -2,6 +2,8 @@
 
 require_relative "lib/metlo/version"
 
+raise "RUBY_TARGET_PLATFORM env var not defined" if ENV["RUBY_TARGET_PLATFORM"].nil?
+
 Gem::Specification.new do |spec|
   spec.name = "metlo"
   spec.version = Metlo::VERSION
@@ -15,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://www.github.com/metlo-labs/metlo"
 
-  spec.platform = Gem::Platform::CURRENT
+  spec.platform = ENV["RUBY_TARGET_PLATFORM"]
   
   spec.files = [
     ".standard.yml",

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: x86_64-linux
 authors:
 - Metlo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-26 00:00:00.000000000 Z
+date: 2023-07-28 00:00:00.000000000 Z
 dependencies: []
 description: The Ruby Agent for Metlo
 email: