metlo 0.0.3-x86_64-darwin → 0.0.5-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b32879e3e1bb16bb0fe42fd41cec3cc8b3361712f234d21bc2c8198cf0ff308
-  data.tar.gz: f12d5d2bafa6bdfbc1eb5bb34f6be33f7570b298ef8e452330d8db31c16de423
+  metadata.gz: 675298f51ccc2075fb963c683f41852f11c27a19545e5a322b0ae4953a0d2391
+  data.tar.gz: 3e1bc5b093d348f0e93a0661417b21932b01866c0359ac9bafd02d2898497266
 SHA512:
-  metadata.gz: 22b352e7c4a45b89869845142c25d167f66f97275820337c36c81aa5a87151f3e8ecd37d75920c1e0230cd3fd4beb920f77c044e2dbd785a1a079c34d8dc90e7
-  data.tar.gz: 4fa3af703baeb1c04905db86fd3d74124a207012d60ee68295989f8b42c5d2ca9127c09f5f58206d3abd74f65cd7249dbb5803f5378d06415cf26083ccf9753a
+  metadata.gz: 2d4da87ecb24a9ebff9815fdf89ced6824a41fe0f60290ab769abc26f5f2a449917c5e0c49eff1223a430098af8cb799b3c7de65a6c80303219b5f18b5480d90
+  data.tar.gz: 8cac0b09538141b929fa7da96b10f5e0eb08a630f50b5a9939ea32e1922c69ead9a6ffec3b2e5d9f3ebb7c77fc9044bee09628a69aaea031ff92da64648c81ca

data/lib/metlo/version.rb

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

data/lib/metlo.rb

@@ -1,10 +1,11 @@
 require_relative "metlo/version"
 require "json"
+require "logger"
 require_relative "./libmetlo"
 
 module Metlo
 
-    class ResponseTimer
+    class Metlo
         
         @@MAX_RES_ITER_COUNT = 10
         @@MAX_BODY_LENGTH = 10 * 1024
@@ -25,15 +26,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,12 +59,12 @@ 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
                 # Value missing.
-                if metlo_url.include? "app.metlo.com"
+                if metlo_url.is_a? String and metlo_url.include? "app.metlo.com"
                     backend_port = 443
                 else
                     backend_port = 8000
@@ -56,39 +74,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 +105,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)
@@ -117,6 +121,8 @@ module Metlo
                     log_level,
                     encryption_key
                 )
+            else
+                @logger.warn("Metlo is currently disabled due to a configuration issue which can be found above. Metlo will not block requests or record traces.")
             end
         end
 
@@ -211,7 +217,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 +260,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 → metlo_darwin.gemspec}

@@ -25,9 +25,9 @@ Gem::Specification.new do |spec|
     "README.md",
     "Rakefile",
     "lib/metlo.rb",
-    "lib/libmetlo.so",
+    "lib/libmetlo.bundle",
     "lib/metlo/version.rb",
-    "metlo.gemspec",
+    "metlo_darwin.gemspec",
     "sig/metlo.rbs",
   ]
   spec.require_paths = ["lib"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metlo
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: x86_64-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:
@@ -20,10 +20,10 @@ files:
 - Gemfile
 - README.md
 - Rakefile
-- lib/libmetlo.so
+- lib/libmetlo.bundle
 - lib/metlo.rb
 - lib/metlo/version.rb
-- metlo.gemspec
+- metlo_darwin.gemspec
 - sig/metlo.rbs
 homepage: https://www.metlo.com
 licenses: