zuora_connect 2.0.60t → 3.0.0k

data/config/initializers/redis.rb

@@ -12,21 +12,21 @@ class RedisFlash
 end
 
 if defined?(Redis.current)
-  Redis.current = Redis.new(:id => "#{ZuoraConnect::Telegraf.full_process_name(process_name: 'Redis')}", :url => redis_url, :timeout => 6, :reconnect_attempts => 2)
+  Redis.current = Redis.new(:id => "#{ZuoraObservability::Env.full_process_name(process_name: 'Redis')}", :url => redis_url, :timeout => 6, :reconnect_attempts => 2)
   browser_urls['Redis'] = { "url" => redis_url }
   if defined?(Resque.redis)
     if resque_url != redis_url
-      Resque.redis = Redis.new(:id => "#{ZuoraConnect::Telegraf.full_process_name(process_name: 'Resque')}", :url => resque_url, :timeout => 6, :reconnect_attempts => 2) 
+      Resque.redis = Redis.new(:id => "#{ZuoraObservability::Env.full_process_name(process_name: 'Resque')}", :url => resque_url, :timeout => 6, :reconnect_attempts => 2)
       browser_urls['Resque'] = { "url" => resque_url }
     else
       Resque.redis = Redis.current
     end
   end
   if defined?(flash_url.present?)
-    RedisFlash.current = Redis.new(:id => "#{ZuoraConnect::Telegraf.full_process_name(process_name: 'Flash')}", :url => flash_url, :timeout => 6, :reconnect_attempts => 2) 
+    RedisFlash.current = Redis.new(:id => "#{ZuoraObservability::Env.full_process_name(process_name: 'Flash')}", :url => flash_url, :timeout => 6, :reconnect_attempts => 2)
     browser_urls['Flash'] = { "url" => flash_url }
   end
 end
 if defined?(RedisBrowser)
   RedisBrowser.configure("connections" => browser_urls)
-end
+end

data/config/initializers/resque.rb

@@ -34,15 +34,3 @@ Resque.module_eval do
     Hash[queue_names.zip(sizes)]
   end
 end
-
-if defined?(Resque.logger)
-  Resque.logger = ZuoraConnect.custom_logger(name: "Resque", type: 'Monologger', level: MonoLogger::INFO) 
-  Resque::Scheduler.logger = ZuoraConnect.custom_logger(name: "ResqueScheduler") if defined?(Resque::Scheduler)
-end
-if defined?(Delayed::Worker.logger)
-  Delayed::Worker.logger = ZuoraConnect.custom_logger(name: "DelayedJob", type: 'Monologger', level: MonoLogger::INFO) 
-end
-
-Makara::Logging::Logger.logger = ZuoraConnect.custom_logger(name: "Makara") if defined?(Makara)
-ElasticAPM.agent.config.logger = ZuoraConnect.custom_logger(name: "ElasticAPM", level: MonoLogger::WARN) if defined?(ElasticAPM) && ElasticAPM.running?
-ActionMailer::Base.logger = ZuoraConnect.custom_logger(name: "ActionMailer", type: 'Monologger') if defined?(ActionMailer)

data/config/initializers/unicorn.rb

@@ -6,7 +6,7 @@ if defined?(Unicorn::WorkerKiller)
       if defined?(Prometheus)
         Prometheus::UNICORN_KILLS.set(1)
       else
-        ZuoraConnect::AppInstance.write_to_telegraf(direction: 'Unicorn-Killer', tags: {app_instance: 0}, values: {kill: 1})
+        ZuoraObservability::Metrics.write_to_telegraf(direction: 'Unicorn-Killer', tags: {app_instance: 0}, values: {kill: 1})
       end
     end
   end
@@ -34,4 +34,4 @@ if defined?(Unicorn::HttpServer) && defined?(Prometheus)
   class Unicorn::Worker
     prepend WorkerExtensions
   end
-end
+end

data/config/routes.rb

@@ -1,6 +1,5 @@
 ZuoraConnect::Engine.routes.draw do
   get '/health' => 'static#health'
-  get '/internal/data' => 'static#metrics'
   post '/initialize_app' => 'static#initialize_app'
 
   if ENV['PROVISION_USER'].present? && ENV['PROVISION_SECRET'].present?

data/lib/metrics/net.rb

@@ -68,12 +68,12 @@ class HttpLogger
       log_request_body(request)
       log_request_headers(request)
       if defined?(response) && response
-        tags = tags.merge({status: response.code.to_i}) 
+        tags = tags.merge({status: response.code.to_i})
         log_response_code(response)
         log_response_headers(response)
         log_response_body(response.body)
       end
-      ZuoraConnect::AppInstance.write_to_telegraf(direction: :outbound, tags: tags, values: values)
+      ZuoraObservability::Metrics.write_to_telegraf(direction: :outbound, tags: tags, values: values)
     end
   end
 
@@ -95,7 +95,7 @@ class HttpLogger
   end
 
   HTTP_METHODS_WITH_BODY = Set.new(%w(POST PUT GET PATCH))
-  
+
   def log_request_body(request)
     if self.class.log_request_body
       if HTTP_METHODS_WITH_BODY.include?(request.method)
@@ -149,8 +149,8 @@ class HttpLogger
   def truncate_body(body)
     if collapse_body_limit && collapse_body_limit > 0 && body && body.size >= collapse_body_limit
       body_piece_size = collapse_body_limit / 2
-      body[0..body_piece_size] + 
-        "\n\n<some data truncated>\n\n" + 
+      body[0..body_piece_size] +
+        "\n\n<some data truncated>\n\n" +
         body[(body.size - body_piece_size)..body.size]
     else
       body
@@ -203,7 +203,7 @@ class Net::HTTP
 
   def request(request, body = nil, &block)
     HttpLogger.perform(self, request, body) do
-      request_without_logging(request, body, &block) 
+      request_without_logging(request, body, &block)
     end
   end
 end
@@ -215,4 +215,4 @@ if defined?(Rails)
       HttpLogger.logger = ZuoraConnect.logger unless HttpLogger.logger
     end
   end
-end
+end

data/lib/middleware/metrics_middleware.rb

@@ -1,37 +1,6 @@
 module ZuoraConnect
   require 'uri'
 
-  # Object of this class is passed to the ActiveSupport::Notification hook
-  class PageRequest
-
-    # This method is triggered when a non error page is loaded (not 404)
-    def call(name, started, finished, unique_id, payload)
-      # If the url contains any css or JavaScript files then do not collect metrics for them
-      return nil if ["css", "assets", "jpg", "png", "jpeg", "ico"].any? { |word| payload[:path].include?(word) }
-
-      # Getting the endpoint and the content_type
-      content_hash = {:html => "text/html", :js => "application/javascript", :json => "application/json", :csv => "text/csv"}
-      content_type = content_hash.key?(payload[:format]) ? content_hash[payload[:format]] : payload[:format]
-      content_type = content_type.to_s.gsub('text/javascript', 'application/javascript')
-
-      # payloads with 500 requests do not have status as it is not set by the controller
-      # https://github.com/rails/rails/issues/33335
-      #status_code = payload[:status] ? payload[:status] : payload[:exception_object].present? ? 500 : ""
-      if payload[:exception].present? 
-        status_code, exception = [500, payload[:exception].first]
-      else
-        status_code, exception = [payload[:status], nil]
-      end
-
-      tags = {method: payload[:method], status: status_code, error_type: exception, content_type: content_type, controller: payload[:controller], action: payload[:action]}.compact
-
-      values = {view_time: payload[:view_runtime], db_time: payload[:db_runtime], response_time: ((finished-started)*1000)}.compact
-      values = values.map{ |k,v| [k,v.round(2)]}.to_h
-
-      ZuoraConnect::AppInstanceBase.write_to_telegraf(direction: :inbound, tags: tags, values: values)
-    end
-  end
-
   class MetricsMiddleware
 
     require "zuora_connect/version"
@@ -42,7 +11,7 @@ module ZuoraConnect
     end
 
     def call(env)
-      @bad_headers = ["HTTP_X_FORWARDED_FOR", "HTTP_X_FORWARDED_HOST", "HTTP_X_FORWARDED_PORT", "HTTP_X_FORWARDED_PROTO", "HTTP_X_FORWARDED_SCHEME", "HTTP_X_FORWARDED_SSL"] 
+      @bad_headers = ["HTTP_X_FORWARDED_FOR", "HTTP_X_FORWARDED_HOST", "HTTP_X_FORWARDED_PORT", "HTTP_X_FORWARDED_PROTO", "HTTP_X_FORWARDED_SCHEME", "HTTP_X_FORWARDED_SSL"]
       if !ActionDispatch::Request::HTTP_METHODS.include?(env["REQUEST_METHOD"].upcase)
         [405, {"Content-Type" => "text/plain"}, ["Method Not Allowed"]]
       else
@@ -65,15 +34,18 @@ module ZuoraConnect
         @bad_headers.each { |header| env.delete(header) }
 
         if defined?(Prometheus) && env['PATH_INFO'] == '/connect/internal/metrics'
+
           # Prometheus Stuff
-          metrics = ZuoraConnect::AppInstance.get_metrics('stats')
+          metrics = ZuoraObservability::Metrics.resque 
+          metrics = defined?(ZuoraConnect::AppInstance.get_metrics) ? ZuoraConnect::AppInstance.get_metrics(metrics) : metrics
+         
           redis_up = metrics.present? && metrics.dig(:Resque, :Workers_Total).present? ? 1 : 0
           Prometheus::REDIS_CONNECTION.set(redis_up)
 
           process_prometheus_metric(metrics: metrics)
 
           if defined?(Unicorn) && Unicorn.respond_to?(:listener_names)
-            ZuoraConnect::AppInstanceBase.unicorn_listener_stats.each do |key, value|
+            ZuoraObservability::Metrics.unicorn_listener.each do |key, value|
               gauge = Prometheus.const_get("unicorn_#{key}".gsub(/[^a-zA-Z0-9_]/, '_').upcase)
               gauge.set(value) if gauge.present?
             end
@@ -84,14 +56,7 @@ module ZuoraConnect
         start_time = Time.now
         begin
           @status, @headers, @response = @app.call(env)
-        ensure 
-          
-          # If the url contains any CSS or JavaScript files then do not collect metrics for them
-          if ["css", "assets", "jpg", "png", "jpeg", "ico"].any? { |word| env['PATH_INFO'].include?(word) } || /.*\.js$/.match(env['PATH_INFO'])
-            tags = {status: @status, controller: 'ActionController', action: 'Assets', app_instance: 0}
-            values = {response_time: ((Time.now - start_time)*1000).round(2) }
-            ZuoraConnect::AppInstanceBase.write_to_telegraf(direction: 'request-inbound-assets', tags: tags, values: values)
-          end
+        ensure
 
           # Uncomment following block of code for handling engine requests/requests without controller
           # else
@@ -112,7 +77,7 @@ module ZuoraConnect
 
               values = {response_time: ((Time.now - start_time)*1000).round(2) }
 
-              ZuoraConnect::AppInstanceBase.write_to_telegraf(direction: :inbound, tags: tags, values: values)
+              ZuoraObservability::Metrics.write_to_telegraf(direction: :inbound, tags: tags, values: values)
             end
           end
           Thread.current[:inbound_metric] = nil
@@ -140,7 +105,7 @@ module ZuoraConnect
             gauge_name.to_sym,
             docstring: "#{key} metric",
             labels: %i(type name),
-            preset_labels: { type: type, name: ZuoraConnect::Telegraf.app_name },
+            preset_labels: { type: type, name: ZuoraObservability::Env.app_name },
             store_settings: most_recent_aggregation
           )
           gauge.set(value)

data/lib/resque/plugins/app_instance_job.rb

@@ -12,14 +12,14 @@ module Resque
         when "Hash"
           data = args.merge({:worker_class => self.to_s})
         end
-        if Rails.logger.is_a?(Ougai::Logger) 
+        if Rails.logger.is_a?(Ougai::Logger) && !Rails.env.development?
           Rails.logger.with_fields = {job: data, trace_id: SecureRandom.uuid, name: "RailsWorker"}
         end
 
         begin
-          connection_count ||= 0 
+          connection_count ||= 0
           @appinstance = ZuoraConnect::AppInstance.find(args['app_instance_id'].to_i)
-          Rails.logger.info('Starting job') 
+          job_start_log(args)
 
           @appinstance.new_session(holding_pattern: true)
         rescue ActiveRecord::RecordNotFound => exception
@@ -52,12 +52,12 @@ module Resque
           return
         rescue ZuoraConnect::Exceptions::ConnectCommunicationError => exception
           Rails.logger.warn("Enqueue Job Again ~ 2 mins", exception)
-          @appinstance.queue_pause(time: 2.minutes.to_i) 
+          @appinstance.queue_pause(time: 2.minutes.to_i)
           Resque.enqueue_to(self.job.queue, self.job.payload['class'], args)
           return
         rescue Net::ReadTimeout, Net::OpenTimeout, Errno::ECONNRESET, Errno::ECONNREFUSED, SocketError => exception
           Rails.logger.warn("Enqueue Job Again ~ 2 mins", exception)
-          @appinstance.queue_pause(time: 2.minutes.to_i) 
+          @appinstance.queue_pause(time: 2.minutes.to_i)
           Resque.enqueue_to(self.job.queue, self.job.payload['class'], args)
           return
         end
@@ -68,6 +68,10 @@ module Resque
         @appinstance.cache_app_instance if defined?(@appinstance)
         Rails.logger.flush if Rails.logger.methods.include?(:flush)
       end
+
+      def job_start_log(args)
+       Rails.logger.info("Starting job")
+      end
     end
   end
-end
+end

data/lib/resque/plugins/custom_logger.rb

@@ -17,7 +17,7 @@ module Resque
         when "Hash"
           data = args.merge({:worker_class => self.to_s})
         end
-        if Rails.logger.is_a?(Ougai::Logger) 
+        if Rails.logger.is_a?(Ougai::Logger) && !Rails.env.development?
           Rails.logger.with_fields = {job: data, trace_id: SecureRandom.uuid, name: "RailsWorker"}
         end
         data = {:msg => 'Starting job', :job => data}

data/lib/zuora_connect.rb

@@ -9,12 +9,11 @@ require 'resque/silence_done'
 require 'resque/self_lookup'
 require 'resque/plugins/custom_logger'
 require 'resque/plugins/app_instance_job'
-require 'logging/connect_formatter'
-require 'metrics/influx/point_value'
 require 'metrics/net'
 require 'mono_logger'
 require 'zuora_connect/zuora_audit'
 require 'active_record'
+require 'zuora_observability'
 ::ActiveRecord::Base.send :include, ZuoraConnect::ZuoraAudit
 
 module ZuoraConnect
@@ -29,68 +28,9 @@ module ZuoraConnect
        when 'test'
         Rails.logger
       else
-        @logger ||= custom_logger(name: "Connect", level: Rails.logger.level)
+        @logger ||= ZuoraObservability::Logger.custom_logger(name: "Connect", level: Rails.logger.level)
       end
     end
-
-    def custom_logger(name: "", level: Rails.logger.present? ? Rails.logger.level : MonoLogger::INFO, type: :ougai)
-      #puts name + ' - ' + {Logger::WARN => 'Logger::WARN', Logger::ERROR => 'Logger::ERROR', Logger::DEBUG => 'Logger::DEBUG', Logger::INFO => 'Logger::INFO' }[level] + ' - '
-      if type == :ougai
-        require 'ougai'
-        require "ougai/formatters/customizable"
-        #logger = Ougai::Logger.new(MonoLogger.new(STDOUT))
-        logger = Ougai::Logger.new(STDOUT)
-        logger.level = level
-        if ZuoraConnect.configuration.json_logging
-          logger.formatter = Ougai::Formatters::ConnectFormatter.new(name)
-          logger.before_log = lambda do |data|
-            data[:trace_id] = ZuoraConnect::RequestIdMiddleware.request_id if ZuoraConnect::RequestIdMiddleware.request_id.present?
-            data[:zuora_trace_id] = ZuoraConnect::RequestIdMiddleware.zuora_request_id if ZuoraConnect::RequestIdMiddleware.zuora_request_id.present?
-            #data[:traces] = {amazon_id: data[:trace_id], zuora_id: data[:zuora_trace_id]}
-          end
-        else
-          logger.formatter = Ougai::Formatters::Customizable.new(
-            format_err: proc do |data|
-              next nil unless data.key?(:err)
-              err = data.delete(:err)
-              "  #{err[:name]} (#{err[:message]})\n #{err[:stack]}"
-            end,
-            format_data: proc do |data|
-              data.delete(:app_instance_id); data.delete(:tenant_ids); data.delete(:organization); data.delete(:environment)
-              format('%s %s: %s', 'DATA'.ljust(6), Time.now.strftime('%FT%T.%6NZ'), "#{data.to_json}") if data.present?
-            end,
-            format_msg: proc do |severity, datetime, _progname, data|
-              msg = data.delete(:msg)
-              format('%s %s: %s', severity.ljust(6), datetime, msg)
-            end
-          )
-          logger.formatter.datetime_format = '%FT%T.%6NZ'
-        end
-      else
-        logger = MonoLogger.new(STDOUT)
-        logger.level = level
-        logger.formatter =  proc do |serverity, datetime, progname, msg|
-          begin
-            msg = JSON.parse(msg)
-          rescue JSON::ParserError => ex
-          end
-          if ZuoraConnect.configuration.json_logging
-            require 'json'
-            store = {
-              name: name,
-              level: serverity,
-              timestamp: datetime.strftime('%FT%T.%6NZ'),
-              pid: Process.pid,
-              message: name == "ActionMailer" ? msg.strip : msg
-            }
-            JSON.dump(store) + "\n"
-          else
-            format('%s %s: %s', serverity.ljust(6), datetime, msg) + "\n"
-          end
-        end
-      end
-      return logger
-    end
   end
 
   module Controllers
@@ -147,7 +87,7 @@ module ZuoraConnect
       verify_server_cert: false,
       log_level: Logger::INFO,
       service_name: ENV['DEIS_APP'].present? ? ENV['DEIS_APP'] : Rails.application.class.parent_name,
-      logger: ZuoraConnect.custom_logger(name: "ElasticAPM", level: MonoLogger::WARN)
+      logger: ZuoraObservability::Logger.custom_logger(name: "ElasticAPM", level: MonoLogger::WARN)
     })
     defaults.merge!({disable_send: true}) if defined?(Rails::Console)
 

data/lib/zuora_connect/controllers/helpers.rb

@@ -138,12 +138,8 @@ module ZuoraConnect
             end
             ZuoraConnect.logger.error(ex) if !ZuoraConnect::AppInstance::IGNORED_LOCALS.include?(ex.locale.to_s.downcase)
           end
-          begin
-            if @appinstance.user_timezone.blank?
-              Time.zone = session["#{@appinstance.id}::user::timezone"] ? session["#{@appinstance.id}::user::timezone"] : @appinstance.timezone
-            end
-          rescue
-            ZuoraConnect.logger.error(ex)
+          if @appinstance.user_timezone.blank?
+            @appinstance.set_timezone(timezone: session["#{@appinstance.id}::user::timezone"], type: :default)
           end
         end
       rescue ZuoraConnect::Exceptions::InvalidCredentialSet => ex
@@ -306,7 +302,8 @@ module ZuoraConnect
     private
       def setup_instance_via_prod_mode
         zuora_entity_id = request.headers['ZuoraCurrentEntity'] || cookies['ZuoraCurrentEntity']
-
+        ZuoraConnect::ZuoraUser.current_user_id = nil 
+        
         if zuora_entity_id.present?
           zuora_tenant_id = cookies['Zuora-Tenant-Id']
           zuora_user_id = cookies['Zuora-User-Id']
@@ -681,27 +678,30 @@ module ZuoraConnect
 
       def setup_instance_via_dev_mode
         session["appInstance"] = ZuoraConnect.configuration.dev_mode_appinstance
-        user = ZuoraConnect.configuration.dev_mode_user
-        key = ZuoraConnect.configuration.dev_mode_pass
-        values = {:user => user , :key => key, :appinstance => session["appInstance"]}
-        @appinstance = ZuoraConnect::AppInstance.find_by(:id => values[:appinstance].to_i)
+        session["#{ZuoraConnect.configuration.dev_mode_appinstance}::admin"] =  ZuoraConnect.configuration.dev_mode_admin
+ 
+        values = {
+          id: ZuoraConnect.configuration.dev_mode_appinstance,
+          access_token: ZuoraConnect.configuration.dev_mode_user, 
+          refresh_token: ZuoraConnect.configuration.dev_mode_pass, 
+          token: ZuoraConnect.configuration.dev_mode_pass+ZuoraConnect.configuration.dev_mode_pass, 
+          api_token: ZuoraConnect.configuration.dev_mode_pass+ZuoraConnect.configuration.dev_mode_pass
+        }
+        
+        @appinstance = ZuoraConnect::AppInstance.find_by(:id => ZuoraConnect.configuration.dev_mode_appinstance.to_i)
         ZuoraConnect::ZuoraUser.current_user_id = 0
         if @appinstance.blank?
           Apartment::Tenant.switch!("public")
           begin
-            Apartment::Tenant.create(values[:appinstance].to_s)
+            Apartment::Tenant.create(ZuoraConnect.configuration.dev_mode_appinstance.to_s)
           rescue Apartment::TenantExists => ex
-            Apartment::Tenant.drop(values[:appinstance].to_s)
+            Apartment::Tenant.drop(ZuoraConnect.configuration.dev_mode_appinstance.to_s)
             retry
           end
-
-          @appinstance = ZuoraConnect::AppInstance.new(:id => values[:appinstance].to_i, :access_token => values[:user], :refresh_token => values[:key], :token => "#{values[:key]}#{values[:key]}", :api_token => "#{values[:key]}#{values[:key]}")
-          @appinstance.save(:validate => false)
-        end
-        if @appinstance.access_token.blank? || @appinstance.refresh_token.blank? || @appinstance.token.blank? || @appinstance.api_token.blank?
-          @appinstance.update_attributes!(:access_token =>  values["user"], :refresh_token =>  values["key"], :token => "#{values[:key]}#{values[:key]}", :api_token => "#{values[:key]}#{values[:key]}")
+          @appinstance = ZuoraConnect::AppInstance.new()
         end
-        session["#{@appinstance.id}::admin"] =  ZuoraConnect.configuration.dev_mode_admin
+        @appinstance.assign_attributes(values)
+        @appinstance.save(:validate => false)
       end
     end
   end

data/lib/zuora_connect/engine.rb

@@ -10,9 +10,10 @@ module ZuoraConnect
 
     initializer "connect", before: :load_config_initializers do |app|
       Rails.application.routes.prepend do
+        get '/connect/internal/data' => 'zuora_observability/metrics#metrics'
         mount ZuoraConnect::Engine, at: "/connect"
         match '/api/connect/health', via: :all, to: 'zuora_connect/static#health'
-        match '/api/connect/internal/data', via: :all, to: 'zuora_connect/static#metrics'
+        match '/api/connect/internal/data', via: :all, to: 'zuora_observability/metrics#metrics'
       end
     end
 

data/lib/zuora_connect/railtie.rb

@@ -5,17 +5,6 @@ require 'middleware/bad_multipart_form_data_sanitizer'
 
 module ZuoraConnect
   class Railtie < Rails::Railtie
-    REQUEST_HEADERS_TO_IGNORE = %W(
-      RAW_POST_DATA
-      REQUEST_METHOD
-      REQUEST_URI
-      REQUEST_PATH
-      PATH_INFO
-      CONTENT_TYPE
-      ORIGINAL_FULLPATH
-      QUERY_STRING
-    )
-
     config.before_initialize do
       version = Rails.version
       if version >= "5.0.0"
@@ -43,71 +32,5 @@ module ZuoraConnect
         app.config.middleware.use Rack::Deflater, if: ->(env, *) { env['PATH_INFO'] == '/connect/internal/metrics' }
       end
     end
-
-    # hook to process_action
-    ActiveSupport::Notifications.subscribe('process_action.action_controller', ZuoraConnect::PageRequest.new)
-
-    initializer(:rails_stdout_logging, before: :initialize_logger) do
-      require 'lograge'
-      
-      Rails.configuration.logger = ZuoraConnect.custom_logger(name: "Rails") 
-      if !Rails.env.test? && !Rails.env.development?
-        Rails.configuration.lograge.enabled = true
-        Rails.configuration.colorize_logging = false
-      end
-
-      if Rails.configuration.lograge.enabled
-        if Rails.configuration.logger.class.to_s == 'Ougai::Logger'
-          Rails.configuration.lograge.formatter = Class.new do |fmt|
-            def fmt.call(data)
-              { msg: 'Rails Request', request: data }
-            end
-          end
-        end
-        #Rails.configuration.lograge.formatter = Lograge::Formatters::Json.new
-        Rails.configuration.lograge.custom_options = lambda do |event|
-          exceptions = %w(controller action format)
-          items = {
-            #time: event.time.strftime('%FT%T.%6N'),  
-            params: event.payload[:params].as_json(except: exceptions).to_json.to_s
-          }
-          items.merge!({exception_object: event.payload[:exception_object]}) if event.payload[:exception_object].present?
-          items.merge!({exception: event.payload[:exception]}) if event.payload[:exception].present?
-
-          if event.payload[:headers].present?
-            # By convertion, headers usually do not have dots. Nginx even rejects headers with dots
-            # All Rails headers are namespaced, like 'rack.input'.
-            # Thus, we can obtain the client headers by rejecting dots
-            request_headers =
-              event.payload[:headers].env.
-                reject { |key| key.to_s.include?('.') || REQUEST_HEADERS_TO_IGNORE.include?(key.to_s) }
-            begin
-              if request_headers["HTTP_AUTHORIZATION"].present?
-                if request_headers["HTTP_AUTHORIZATION"].include?("Basic")
-                  user_password = request_headers["HTTP_AUTHORIZATION"].split("Basic").last.strip
-                  user, password = Base64.decode64(user_password).split(":")
-                  request_headers["HTTP_AUTHORIZATION"] = "Basic #{user}:ValueFiltered"
-                elsif 
-                  request_headers["HTTP_AUTHORIZATION"] = "ValueFiltered"
-                end
-              end
-              request_headers["HTTP_API_TOKEN"] = "ValueFiltered" if request_headers["HTTP_API_TOKEN"].present?
-            rescue
-              request_headers.delete("HTTP_API_TOKEN")
-              request_headers.delete("HTTP_AUTHORIZATION")
-            end
-            items.merge!({ headers: request_headers.to_s })
-          end
-
-          if Thread.current[:appinstance].present? 
-            items.merge!({connect_user: Thread.current[:appinstance].connect_user, new_session: Thread.current[:appinstance].new_session_message})
-            if Thread.current[:appinstance].logitems.present? && Thread.current[:appinstance].logitems.class == Hash
-              items.merge!(Thread.current[:appinstance].logitems)
-            end
-          end
-          return items        
-        end
-      end
-    end
   end
 end