zuora_connect 3.0.0.pre.b → 3.0.0.pre.g

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7d9c3445983c015ce0615581bee9d36802b113c220caf4404f4bed697fc67ac
-  data.tar.gz: 29428d8aec94b04f215ac3faa5faba871cf1c21f60eb804abe6f501adafdb0ca
+  metadata.gz: 7443cb29882ccc12bc04d9e58f21fe54dbae32e6b4e7ffe12b699b63854cce55
+  data.tar.gz: 9b87ed757abeca777bff58cf469f6e7d918aeacf304ec98bcd6bb02458195754
 SHA512:
-  metadata.gz: cb4cee9b6e964dbd417e758bf03e1a7cf1461d600e327110ad0155c5fd710e7083fb2d476697a24fe5d327a22eea4585982dbe1133b32b7c849a921a1004fe07
-  data.tar.gz: 7bd1393e58a2b341a2c64d8b8d870bbc13e906fa99ba22dd201a2afd250642505b1480469cfa5788dfd45215fe726b3af5a117d6eb80e623cc55e8d37bbd65cc
+  metadata.gz: 9ddc22c116f93881f4f7c0901ee9e220087e038392238fd4681c899725fcf72836203eafe88a59b2a5f025bc36f3594e743b298a47b5aa1d1ae2ed21ffb1de57
+  data.tar.gz: a9d5f1aaeddd76c772eacfbcdbaa6404a6edeeef8194a7626252f2df55afc7c08b6c962c64be01139c5c4f1f0609a17a4cd101fca16bff2011ab657b23a52cc8

data/app/models/zuora_connect/app_instance_base.rb

@@ -152,7 +152,8 @@ module ZuoraConnect
       if ZuoraConnect.configuration.mode != "Production"
         mock_task_data = {
           "id" => ZuoraConnect.configuration.dev_mode_appinstance,
-          "mode" => ZuoraConnect.configuration.dev_mode_mode
+          "mode" => ZuoraConnect.configuration.dev_mode_mode,
+          "name" => "Developer Instance"
         }
 
         case ZuoraConnect.configuration.dev_mode_options.class
@@ -168,7 +169,7 @@ module ZuoraConnect
         end
 
         self.build_task(task_data: mock_task_data, session: session)
-        self.set_backup_creds
+        self.set_backup_creds if !self['zuora_logins'].present?
         self.last_refresh = Time.now.to_i
       else
         time_expire = (session["#{self.id}::last_refresh"] || Time.now).to_i - INSTANCE_REFRESH_WINDOW.ago.to_i

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 = ZuoraObservability::Logger.custom_logger(name: "Resque", type: 'Monologger', level: MonoLogger::INFO)
-  Resque::Scheduler.logger = ZuoraObservability::Logger.custom_logger(name: "ResqueScheduler") if defined?(Resque::Scheduler)
-end
-if defined?(Delayed::Worker.logger)
-  Delayed::Worker.logger = ZuoraObservability::Logger.custom_logger(name: "DelayedJob", type: 'Monologger', level: MonoLogger::INFO)
-end
-
-Makara::Logging::Logger.logger = ZuoraObservability::Logger.custom_logger(name: "Makara") if defined?(Makara)
-ElasticAPM.agent.config.logger = ZuoraObservability::Logger.custom_logger(name: "ElasticAPM", level: MonoLogger::WARN) if defined?(ElasticAPM) && ElasticAPM.running?
-ActionMailer::Base.logger = ZuoraObservability::Logger.custom_logger(name: "ActionMailer", type: 'Monologger') if defined?(ActionMailer)

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
-
-      ZuoraObservability::Metrics.write_to_telegraf(direction: :inbound, tags: tags, values: values)
-    end
-  end
-
   class MetricsMiddleware
 
     require "zuora_connect/version"

data/lib/resque/plugins/app_instance_job.rb

@@ -12,7 +12,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/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/controllers/helpers.rb

@@ -680,7 +680,7 @@ module ZuoraConnect
         session["#{ZuoraConnect.configuration.dev_mode_appinstance}::admin"] =  ZuoraConnect.configuration.dev_mode_admin
  
         values = {
-          id: ZuoraConnect.configuration.dev_mode_appinstance, 
+          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, 
@@ -692,9 +692,9 @@ module ZuoraConnect
         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()

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,8 +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)
   end
 end

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "3.0.0-b"
+  VERSION = "3.0.0-g"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.b
+  version: 3.0.0.pre.g
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-03 00:00:00.000000000 Z
+date: 2020-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -186,16 +186,16 @@ dependencies:
   name: zuora_observability
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0.pre.b
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0.pre.b
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement