zgcp_toolkit 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 691381f36c471f3cfbf429041d6fb30398115834b1e7f996a92bdb62a5c189f3
-  data.tar.gz: f07d99fdbea33895b07542d9744c5682e499ffdb3c2f7bdaea216f3a146f330a
+  metadata.gz: cd687c8e796176929ce117783a4d5f9f9948a27260d744feee40c497d670f5b0
+  data.tar.gz: 83c0d180249472a52495955606395869804c8c4a26732e308bfc670cd67124f8
 SHA512:
-  metadata.gz: fb1188320cfcc660b9dde35e862c51fcb4ff81d2fef9cd3bce349f3b1e6ad8f2c7f1c59716eab35067209a85e55ffe2b0577a07d555fa6bddcc836b4589da210
-  data.tar.gz: 95cf1705da9ce68c5c4ae128cff61933e840096604db4a77e3668c72541a733c505ba535b4711669a643f92fa6b71549e8555c347980c299a5849bdfe1089423
+  metadata.gz: bd1d70407f154d0440f31300d8a577e37066fa95f5871b04111c9b2ce7524f281fc7afa61eb498becf0d369c598e2b8d85aae2b0dda23c803c84baa398b5b458
+  data.tar.gz: b7982e5efdd431ba08d0c99dff3ac02d063199dd5354c49af5b90e94f70d0d7375f405ab90786ece8d13cd7ed9824ca6796a1ad5b678dc648bcfa0e38bdd5ee9

data/README.md

@@ -72,6 +72,9 @@ rescue_from StandardError do |e|
   logger = ZgcpToolkit::Logger.new(Rails.env)
   logger.error_request(e, request)
 
+  # You can report error (Error Reporting) with: 
+  # ZgcpToolkit::Logger.report_error_request(e, request)
+
   # If you want send notity to slack 
   # logger.error_request(e, request, push_slack: true)
 

data/lib/zgcp_toolkit.rb

@@ -3,5 +3,6 @@ require "zgcp_toolkit/version"
 module ZgcpToolkit; end
 
 require 'zgcp_toolkit/logger'
+require 'zgcp_toolkit/formatter/request'
 require 'zgcp_toolkit/generators/templates/zgcp_toolkit'
 require 'zgcp_toolkit/generators/zgcp_toolkit_generator'

data/lib/zgcp_toolkit/formatter/request.rb

@@ -0,0 +1,101 @@
+module ZgcpToolkit::Formatter
+  class Request
+    FILTERED_ENV_LIST = %w(
+      CONTENT_LENGTH
+      CONTENT_TYPE
+      HTTP_ACCEPT
+      HTTP_ACCEPT_ENCODING
+      HTTP_ACCEPT_LANGUAGE
+      HTTP_CACHE_CONTROL
+      HTTP_COOKIE
+      HTTP_HOST
+      HTTP_ORIGIN
+      HTTP_REFERER
+      HTTP_SEC_CH_UA
+      HTTP_SEC_CH_UA_MOBILE
+      HTTP_SEC_FETCH_DEST
+      HTTP_SEC_FETCH_MODE
+      HTTP_SEC_FETCH_SITE
+      HTTP_SEC_FETCH_USER
+      HTTP_UPGRADE_INSECURE_REQUESTS
+      HTTP_USER_AGENT
+      HTTP_VERSION
+      HTTP_VIA
+      HTTP_X_FORWARDED_FOR
+      HTTP_X_FORWARDED_PROTO
+      ORIGINAL_FULLPATH
+      ORIGINAL_SCRIPT_NAME
+      PATH_INFO
+      QUERY_STRING
+      REMOTE_ADDR
+      REMOTE_PORT
+      REQUEST_METHOD
+      REQUEST_URI
+      SERVER_NAME
+      SERVER_PORT
+      SERVER_PROTOCOL
+    ).freeze
+
+    def call(request)
+      log_object = {}
+      log_object[:request]     = request_filter(request)
+      log_object[:session]     = session_filter(request)
+      log_object[:environment] = environment_filter(request)
+      log_object
+    end
+
+    def format_for_report(request)
+      log_object = {}
+      log_object[:request]     = beauty_format request_filter(request)
+      log_object[:session]     = beauty_format session_filter(request)
+      log_object[:environment] = beauty_format separation_environment_filter(request)
+
+      result = log_object.map { |key, value| "#{key.capitalize}:\n#{value}\n" }
+      result.join("\n")
+    end
+
+    private
+
+    def beauty_format(data)
+      data.map { |k,v| "#{k.to_s.indent(4)}: #{v}" }.join("\n")
+    end
+
+    def environment_filter(request)
+      result = {}
+      request.filtered_env.keys.each do |key|
+        result[key] = request.filtered_env[key]
+      end
+      result
+    end
+
+    def separation_environment_filter(request)
+      result = {}
+      FILTERED_ENV_LIST.each do |key|
+        result[key] = request.filtered_env[key]
+      end
+      result
+    end
+
+    def session_filter(request)
+      result = {}
+      result[:session_id]   = request.ssl? ? "[FILTERED]" : request.session['session_id'] || request.env['rack.session.options'][:id].inspect
+      result[:data_session] = request.session.to_hash
+      result
+    end
+
+    def request_filter(request)
+      result = {}
+      result[:url]            = request.url
+      result[:request_method] = request.request_method
+      result[:ip_address]     = request.remote_ip
+      result[:parameters]     = request.filtered_parameters.inspect
+      result[:timestamp]      = Time.current
+      result[:server]         = Socket.gethostname
+      result[:process]        = $$
+      if defined?(Rails) && Rails.respond_to?(:root)
+        result[:rails_root] = Rails.root
+      end
+      result
+    end
+  end
+end

data/lib/zgcp_toolkit/logger.rb

@@ -1,4 +1,5 @@
 require 'dry/configurable'
+require "google/cloud/error_reporting"
 require 'zgcp_toolkit/logger/stdout'
 require 'zgcp_toolkit/logger/google_cloud_logging'
 
@@ -30,13 +31,20 @@ module ZgcpToolkit
         begin
           yield(logger) if block_given?
         rescue StandardError => e
-          logger.error(e, push_slack: logger.send_unexpected_error_to_slack)
-          logger.flush!
+          Google::Cloud::ErrorReporting.report e
         end
 
         logger
       end
 
+      def report_error_request(error, request)
+        message = ZgcpToolkit::Formatter::Request.new.format_for_report(request)
+
+        Google::Cloud::ErrorReporting.report error do |event|
+          event.message = event.message + "\n\n" + message
+        end
+      end
+  
       private
 
       def valid_name?(log_name)
@@ -58,18 +66,18 @@ module ZgcpToolkit
     end
 
     [:debug, :info, :warn, :error, :fatal, :unknown].each do |log_level_method|
-      define_method(log_level_method) do |log, push_slack: false|
+      define_method(log_level_method) do |log, **kwargs|
         log_object =
           case log
           when StandardError
             obj = { message: log.message, backtrace: log.backtrace.first(backtrace_limit) }
-            obj.merge!(push_slack: true) if push_slack
+            obj.merge!(kwargs)
             obj
           when Hash
             log
           when String
             obj = { message: log }
-            obj.merge!(push_slack: true) if push_slack
+            obj.merge!(kwargs)
             obj
           else
             raise UnsupportedLogType, "#{log.class.name} is not supported!"
@@ -79,7 +87,7 @@ module ZgcpToolkit
     end
 
     def error_request(error, request, **args)
-      filter_request_params = format_request_env(request)
+      filter_request_params = ZgcpToolkit::Formatter::Request.new.call(request)
 
       error({ message: error.message, backtrace: error.backtrace.first(backtrace_limit) }.merge!(filter_request_params).merge!(args))
     end
@@ -87,45 +95,5 @@ module ZgcpToolkit
     def flush!
       loggers.each { |a| a.flush! }
     end
-
-    private
-
-    def format_request_env(request)
-      log_object = {}
-      log_object[:request]     = request_filter(request)
-      log_object[:session]     = session_filter(request)
-      log_object[:environment] = environment_filter(request)
-      log_object
-    end
-
-    def environment_filter(request)
-      result = {}
-      request.filtered_env.keys.each do |key|
-        result[key] = request.filtered_env[key]
-      end
-      result
-    end
-
-    def session_filter(request)
-      result = {}
-      result[:session_id]   = request.ssl? ? "[FILTERED]" : request.session['session_id'] || request.env['rack.session.options'][:id].inspect
-      result[:data_session] = request.session.to_hash
-      result
-    end
-
-    def request_filter(request)
-      result = {}
-      result[:url]            = request.url
-      result[:request_method] = request.request_method
-      result[:ip_address]     = request.remote_ip
-      result[:parameters]     = request.filtered_parameters.inspect
-      result[:timestamp]      = Time.current
-      result[:server]         = Socket.gethostname
-      result[:process]        = $$
-      if defined?(Rails) && Rails.respond_to?(:root)
-        result[:rails_root] = Rails.root
-      end
-      result
-    end
   end
 end

data/lib/zgcp_toolkit/version.rb

@@ -1,3 +1,3 @@
 module ZgcpToolkit
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/zgcp_toolkit.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'stackdriver', '~> 0.20.1'
   spec.add_dependency 'dry-configurable', '~> 0.11.6'
+  spec.add_dependency 'google-cloud-error_reporting', '~> 0.42.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zgcp_toolkit
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - ZIGExN VeNtura developers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-09 00:00:00.000000000 Z
+date: 2021-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stackdriver
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.11.6
+- !ruby/object:Gem::Dependency
+  name: google-cloud-error_reporting
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.42.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.42.0
 description: Manage essential toolset
 email: kuruma-dev@zigexn.vn
 executables: []
@@ -55,6 +69,7 @@ files:
 - bin/console
 - bin/setup
 - lib/zgcp_toolkit.rb
+- lib/zgcp_toolkit/formatter/request.rb
 - lib/zgcp_toolkit/generators/templates/zgcp_toolkit.rb
 - lib/zgcp_toolkit/generators/zgcp_toolkit_generator.rb
 - lib/zgcp_toolkit/logger.rb