zuora_connect 2.0.60r → 2.1.1

data/config/initializers/prometheus.rb

@@ -3,93 +3,38 @@ if defined? Prometheus
     require "zuora_connect/version"
     require "zuora_api/version"
 
-    resque_path = "#{ENV['RESQUE_EXPORTER_PATH'] || Rails.root.join('tmp/resque_exporter')}/*.prom"
-    prometheus_path = Rails.root.join("tmp/prometheus")
-
-    Dir[resque_path, "#{prometheus_path}/*.bin"].each do |file_path|
-      File.unlink(file_path)
-    end
-
-    require 'prometheus/client/data_stores/direct_file_store'
-    Prometheus::Client.config.data_store = Prometheus::Client::DataStores::DirectFileStore.new(
-      dir: prometheus_path
-    )
-
-    class ResqueExporter
-      require 'prometheus/client/formats/text'
-      require 'fileutils'
-
-      def initialize
-        @lock = Monitor.new
-        @registry = Prometheus::Client.registry
-        @path = ENV['RESQUE_EXPORTER_PATH'] || Rails.root.join('tmp/resque_exporter')
-        FileUtils.mkdir_p(@path)
-      end
-
-      def export
-        filename = File.join(@path, "resque_export_#{Process.pid}.prom")
-        @lock.synchronize do
-          File.open(filename, 'w+') do |file|
-            file.write(Prometheus::Client::Formats::Text.marshal(@registry))
-          end
-        end
-      end
-    end
-
-    most_recent_aggregation = {}
-    sum_aggregation = {}
-    if defined?(Unicorn)
-      most_recent_aggregation[:aggregation] = :most_recent
-      sum_aggregation[:aggregation] = :sum
-    end
-
     # Create a default Prometheus registry for our metrics.
     prometheus = Prometheus::Client.registry
 
     # Create your metrics.
-    ZUORA_VERSION = prometheus.gauge(:zuora_version, docstring: 'The current Zuora Gem version.', labels: %i(version name),  preset_labels: { version: ZuoraAPI::VERSION, name: ZuoraConnect::Telegraf.app_name }, store_settings: most_recent_aggregation)
-    CONNECT_VERSION = prometheus.gauge(:gem_version, docstring: 'The current Connect Gem version.', labels: %i(version name), preset_labels: { version: ZuoraConnect::VERSION, name: ZuoraConnect::Telegraf.app_name }, store_settings: most_recent_aggregation)
-    RAILS_VERSION = prometheus.gauge(:rails_version, docstring: 'The current Rails version.', labels: %i(version name), preset_labels: { version: Rails.version, name: ZuoraConnect::Telegraf.app_name }, store_settings: most_recent_aggregation)
-    RUBY_V = prometheus.gauge(:ruby_version, docstring: 'The current Ruby version.', labels: %i(version name), preset_labels: { version: RUBY_VERSION, name: ZuoraConnect::Telegraf.app_name }, store_settings: most_recent_aggregation)
+    ZUORA_VERSION = Prometheus::Client::Gauge.new(:zuora_version, 'The current Zuora Gem version.')
+    CONNECT_VERSION = Prometheus::Client::Gauge.new(:gem_version, 'The current Connect Gem version.')
+    RAILS_VERSION = Prometheus::Client::Gauge.new(:rails_version, 'The current Rails version.')
+    RUBY_V = Prometheus::Client::Gauge.new(:ruby_version, 'The current Ruby version.')
 
-    ZUORA_VERSION.set(0)
-    CONNECT_VERSION.set(0)
-    RAILS_VERSION.set(0)
-    RUBY_V.set(0)
+    # Register your metrics with the registry we previously created.
+    prometheus.register(ZUORA_VERSION);ZUORA_VERSION.set({version: ZuoraAPI::VERSION, name: ZuoraConnect::Telegraf.app_name},0)
+    prometheus.register(CONNECT_VERSION);CONNECT_VERSION.set({version: ZuoraConnect::VERSION, name: ZuoraConnect::Telegraf.app_name},0)
+    prometheus.register(RAILS_VERSION);RAILS_VERSION.set({version: Rails.version, name: ZuoraConnect::Telegraf.app_name},0)
+    prometheus.register(RUBY_V);RUBY_V.set({version: RUBY_VERSION, name: ZuoraConnect::Telegraf.app_name},0)
 
     # Do they have resque jobs?
     if defined? Resque.redis
-      REDIS_CONNECTION = prometheus.gauge(:redis_connection, docstring: 'The status of the redis connection, 0 or 1', labels: %i(connection name), preset_labels: {connection:'redis', name: ZuoraConnect::Telegraf.app_name}, store_settings: most_recent_aggregation)
-      JOBS_FINISHED = prometheus.gauge(:jobs_finished, docstring: 'Done resque jobs', labels: %i(type name), preset_labels: {type:'resque', name: ZuoraConnect::Telegraf.app_name}, store_settings: most_recent_aggregation)
-      WORKERS_TOTAL = prometheus.gauge(:workers_total, docstring: 'Total resque workers', labels: %i(type name), preset_labels: {type:'resque', name: ZuoraConnect::Telegraf.app_name}, store_settings: most_recent_aggregation)
-      WORKERS_ACTIVE = prometheus.gauge(:workers_active, docstring: 'Active resque workers', labels: %i(type name), preset_labels: {type:'resque', name: ZuoraConnect::Telegraf.app_name}, store_settings: most_recent_aggregation)
-      JOBS_FAILED = prometheus.gauge(:jobs_failed, docstring: 'Failed resque jobs', labels: %i(type name), preset_labels: {type:'resque', name: ZuoraConnect::Telegraf.app_name}, store_settings: most_recent_aggregation)
-      JOBS_PENDING = prometheus.gauge(:jobs_pending, docstring: 'Pending resque jobs', labels: %i(type name), preset_labels: {type:'resque', name: ZuoraConnect::Telegraf.app_name}, store_settings: most_recent_aggregation)
-    end
-
-    if defined?(Unicorn) && Unicorn.respond_to?(:listener_names)
-      UNICORN_KILLS = prometheus.gauge(
-        :unicorn_kills,
-        docstring: 'Unicorn Kills',
-        labels: %i(type name),
-        preset_labels: {type:'Unicorn-Killer', name: ZuoraConnect::Telegraf.app_name},
-        store_settings: sum_aggregation
-      )
+      REDIS_CONNECTION = Prometheus::Client::Gauge.new(:redis_connection, 'The status of the redis connection, 0 or 1')
+      FINISHED_JOBS = Prometheus::Client::Gauge.new(:finished_jobs, 'Done resque jobs')
+      WORKERS = Prometheus::Client::Gauge.new(:workers, 'Total resque workers')
+      ACTIVE_WORKERS = Prometheus::Client::Gauge.new(:active_workers, 'Active resque workers')
+      FAILED_JOBS = Prometheus::Client::Gauge.new(:failed_jobs, 'Failed resque jobs')
+      PENDING_JOBS = Prometheus::Client::Gauge.new(:pending_jobs, 'Pending resque jobs')
+
+      prometheus.register(REDIS_CONNECTION)
+      prometheus.register(FINISHED_JOBS)
+      prometheus.register(ACTIVE_WORKERS)
+      prometheus.register(WORKERS)
+      prometheus.register(FAILED_JOBS)
+      prometheus.register(PENDING_JOBS)
 
-      ZuoraConnect::AppInstanceBase.unicorn_listener_stats.each do |key, _|
-        gauge_name = "unicorn_#{key}".gsub(/[^a-zA-Z0-9_]/, '_')
-        gauge = prometheus.gauge(
-          gauge_name.to_sym,
-          docstring: 'Unicorn Stats',
-          labels: %i(type name),
-          preset_labels: { type: 'unicorn', name: ZuoraConnect::Telegraf.app_name },
-          store_settings: most_recent_aggregation
-        )
-        Prometheus.const_set(
-          gauge_name.upcase,
-          gauge
-        )
-      end
     end
+
   end
 end

data/config/initializers/resque.rb

@@ -5,20 +5,6 @@ if defined?(Resque::Worker)
   Resque::Job.send(:include, Resque::SelfLookup)
 end
 
-if defined?(Resque::Job) && defined?(Prometheus)
-  module ResquePrometheusExtensions
-    EXPORTER = Prometheus::ResqueExporter.new
-    def perform
-      super
-      EXPORTER.export
-    end
-  end
-
-  class Resque::Job
-    prepend ResquePrometheusExtensions
-  end
-end
-
 Resque.module_eval do
   # Returns a hash, mapping queue names to queue sizes
   def queue_sizes

data/config/initializers/unicorn.rb

@@ -3,35 +3,7 @@ if defined?(Unicorn::WorkerKiller)
     self.singleton_class.send(:alias_method, :kill_self_old, :kill_self)
     def self.kill_self(logger, start_time)
       self.kill_self_old(logger, start_time)
-      if defined?(Prometheus)
-        Prometheus::UNICORN_KILLS.set(1)
-      else
-        ZuoraConnect::AppInstance.write_to_telegraf(direction: 'Unicorn-Killer', tags: {app_instance: 0}, values: {kill: 1})
-      end
+      ZuoraConnect::AppInstance.write_to_telegraf(direction: 'Unicorn-Killer', tags: {app_instance: 0}, values: {kill: 1})
     end
   end
-end
-
-if defined?(Unicorn::HttpServer) && defined?(Prometheus)
-  module HttpServerExtensions
-    def kill_worker(signal, wpid)
-      Prometheus::UNICORN_KILLS.increment
-      super
-    end
-  end
-
-  module WorkerExtensions
-    def soft_kill(sig)
-      Prometheus::UNICORN_KILLS.increment
-      super
-    end
-  end
-
-  class Unicorn::HttpServer
-    prepend HttpServerExtensions
-  end
-
-  class Unicorn::Worker
-    prepend WorkerExtensions
-  end
 end

data/config/routes.rb

@@ -3,11 +3,6 @@ ZuoraConnect::Engine.routes.draw do
   get '/internal/data' => 'static#metrics'
   post '/initialize_app' => 'static#initialize_app'
 
-  if ENV['PROVISION_USER'].present? && ENV['PROVISION_SECRET'].present?
-    post '/provision' => 'static#provision'
-    get '/instance/:id/user' => 'static#instance_user'
-  end
-
   namespace :api do
     namespace :v1 do
       resources :app_instance, :only => [:index], defaults: {format: :json} do

data/lib/middleware/json_parse_errors.rb

@@ -7,7 +7,7 @@ module ZuoraConnect
     def call(env)
       begin
         @app.call(env)
-      rescue DynamicRailsError => error
+      rescue ActionDispatch::ParamsParser::ParseError => error
         if env['HTTP_ACCEPT'] =~ /application\/json/ || env['CONTENT_TYPE'] =~ /application\/json/
           return [
             400, { "Content-Type" => "application/json" },
@@ -18,16 +18,5 @@ module ZuoraConnect
         end
       end
     end
-
-    # Note(hartley): remove once the minimum supported version of Rails is 5.2
-    class DynamicRailsError < StandardError
-      def self.===(exception)
-        if Rails.version >= "5.2"
-          exception.is_a?(ActionDispatch::Http::Parameters::ParseError)
-        else
-          exception.is_a?(ActionDispatch::ParamsParser::ParseError)
-        end
-      end
-    end
   end
-end
+end

data/lib/middleware/metrics_middleware.rb

@@ -64,22 +64,6 @@ module ZuoraConnect
         #Remove bad headers
         @bad_headers.each { |header| env.delete(header) }
 
-        if defined?(Prometheus) && env['PATH_INFO'] == '/connect/internal/metrics'
-          # Prometheus Stuff
-          metrics = ZuoraConnect::AppInstance.get_metrics('stats')
-          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|
-              gauge = Prometheus.const_get("unicorn_#{key}".gsub(/[^a-zA-Z0-9_]/, '_').upcase)
-              gauge.set(value) if gauge.present?
-            end
-          end
-        end
-
         #Thread.current[:appinstance] = nil
         start_time = Time.now
         begin
@@ -93,6 +77,35 @@ module ZuoraConnect
             ZuoraConnect::AppInstanceBase.write_to_telegraf(direction: 'request-inbound-assets', tags: tags, values: values)
           end
 
+          if defined? Prometheus
+            #Prometheus Stuff
+            if env['PATH_INFO'] == '/connect/internal/metrics'
+
+              #Do something before each scrape
+              if defined? Resque.redis
+                begin
+
+                  Resque.redis.ping
+
+                  Prometheus::REDIS_CONNECTION.set({connection:'redis',name: ZuoraConnect::Telegraf.app_name},1)
+                  Prometheus::FINISHED_JOBS.set({type:'resque',name: ZuoraConnect::Telegraf.app_name},Resque.info[:processed])
+                  Prometheus::PENDING_JOBS.set({type:'resque',name: ZuoraConnect::Telegraf.app_name},Resque.info[:pending])
+                  Prometheus::ACTIVE_WORKERS.set({type:'resque',name: ZuoraConnect::Telegraf.app_name},Resque.info[:working])
+                  Prometheus::WORKERS.set({type:'resque',name: ZuoraConnect::Telegraf.app_name},Resque.info[:workers])
+                  Prometheus::FAILED_JOBS.set({type:'resque',name: ZuoraConnect::Telegraf.app_name},Resque.info[:failed])
+
+                rescue Redis::CannotConnectError
+                    Prometheus::REDIS_CONNECTION.set({connection:'redis',name: ZuoraConnect::Telegraf.app_name},0)
+                end
+
+                if ZuoraConnect.configuration.custom_prometheus_update_block != nil
+                  ZuoraConnect.configuration.custom_prometheus_update_block.call()
+                end
+              end
+
+            end
+          end
+
           # Uncomment following block of code for handling engine requests/requests without controller
           # else
           #   # Handling requests which do not have controllers (engines)
@@ -106,10 +119,10 @@ module ZuoraConnect
               content_type = @headers['Content-Type'].split(';')[0] if @headers['Content-Type']
               content_type = content_type.gsub('text/javascript', 'application/javascript')
               tags = {status: @status, content_type: content_type}
-
+           
               tags = tags.merge({controller: 'ActionController'})
               tags = tags.merge({action: 'RoutingError' }) if @status == 404
-
+              
               values = {response_time: ((Time.now - start_time)*1000).round(2) }
 
               ZuoraConnect::AppInstanceBase.write_to_telegraf(direction: :inbound, tags: tags, values: values)
@@ -120,32 +133,5 @@ module ZuoraConnect
         [@status, @headers, @response]
       end
     end
-
-    def process_prometheus_metric(type: 'none', metrics: {})
-      return if metrics.blank?
-
-      prometheus = Prometheus::Client.registry
-      most_recent_aggregation = {}
-      if Prometheus::Client.config.data_store.is_a?(Prometheus::Client::DataStores::DirectFileStore)
-        most_recent_aggregation[:aggregation] = :most_recent
-      end
-      metrics.each do |key, value|
-        next if %w[app_name url].include?(key.to_s)
-
-        if value.is_a?(Hash)
-          process_prometheus_metric(type: key.to_s, metrics: value)
-        else
-          gauge_name = key.to_s.downcase.gsub(/[^a-z0-9_]/, '_')
-          gauge = prometheus.get(gauge_name.to_sym) || prometheus.gauge(
-            gauge_name.to_sym,
-            docstring: "#{key} metric",
-            labels: %i(type name),
-            preset_labels: { type: type, name: ZuoraConnect::Telegraf.app_name },
-            store_settings: most_recent_aggregation
-          )
-          gauge.set(value)
-        end
-      end
-    end
   end
 end

data/lib/resque/dynamic_queues.rb

@@ -92,7 +92,7 @@ module Resque
         log_with_severity :error, "Error reserving job: #{ex.inspect}"
         log_with_severity :error, ex.backtrace.join("\n")
       end
-      raise ex
+      raise e
     end
 
     def create_job(queue, payload)

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.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/zuora_connect.rb

@@ -13,9 +13,6 @@ require 'logging/connect_formatter'
 require 'metrics/influx/point_value'
 require 'metrics/net'
 require 'mono_logger'
-require 'zuora_connect/zuora_audit'
-require 'active_record'
-::ActiveRecord::Base.send :include, ZuoraConnect::ZuoraAudit
 
 module ZuoraConnect
   class << self

data/lib/zuora_connect/controllers/helpers.rb

@@ -124,24 +124,14 @@ module ZuoraConnect
             ElasticAPM.set_user(session["#{@appinstance.id}::user::email"])  if defined?(ElasticAPM) && ElasticAPM.running?
             PaperTrail.whodunnit =  session["#{@appinstance.id}::user::email"] if defined?(PaperTrail)
           end
-
-          locale = (session["#{@appinstance.id}::user::locale"] || "").gsub("_", "-") 
           begin
+            locale = session["#{@appinstance.id}::user::locale"]
             I18n.locale = locale.present? ? locale : @appinstance.locale
           rescue I18n::InvalidLocale => ex
-            if locale.include?("-")
-              locale = locale.split("-").first
-              retry
-            elsif locale != session["#{@appinstance.id}::user::language"]
-              locale = session["#{@appinstance.id}::user::language"]
-              retry
-            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
+            Time.zone = session["#{@appinstance.id}::user::timezone"] ? session["#{@appinstance.id}::user::timezone"] : @appinstance.timezone
           rescue
             ZuoraConnect.logger.error(ex)
           end
@@ -229,80 +219,6 @@ module ZuoraConnect
         return (request.headers['ZuoraCurrentEntity'].present? || cookies['ZuoraCurrentEntity'].present?)
       end
 
-      def create_new_instance
-        ZuoraConnect::AppInstance.read_master_db do
-          Thread.current[:appinstance] = nil
-          ZuoraConnect.logger.with_fields = {} if ZuoraConnect.logger.is_a?(Ougai::Logger)
-          Rails.logger.with_fields = {} if Rails.logger.is_a?(Ougai::Logger)
-
-          if defined?(ElasticAPM) && ElasticAPM.running? && ElasticAPM.respond_to?(:set_label)
-            ElasticAPM.set_label(:trace_id, request.uuid)
-          end
-
-          zuora_host = request.headers['zuora-host']
-          zuora_entity_id = (request.headers['zuora-entity-ids'] || '').gsub(
-            '-',
-            ''
-          ).split(',').first
-
-          # Validate host present
-          if zuora_host.blank?
-            render json: {
-              status: 401,
-              message: 'zuora-host header was not supplied.'
-            }, status: :unauthorized
-            return
-          end
-
-          # Validate entity-ids present
-          if zuora_entity_id.blank?
-            render json: {
-              status: 401,
-              message: 'zuora-entity-ids header was not supplied.'
-            }, status: :unauthorized
-            return
-          end
-
-          rest_domain = ZuoraAPI::Login.new(url: "https://#{zuora_host}").rest_domain
-          app_instance_id = ZuoraConnect::AppInstance.where(
-            'zuora_entity_ids ?& array[:entities] AND zuora_domain = :host',
-            entities: [zuora_entity_id],
-            host: rest_domain
-          ).pluck(:id).first
-
-          if app_instance_id.present?
-            render json: {
-              status: 409,
-              message: 'Instance already exists.',
-              app_instance_id: app_instance_id
-            }, status: 409
-          else
-            Apartment::Tenant.switch!("public")
-            retry_count = 3
-            begin
-              @appinstance = new_instance(
-                next_instance_id,
-                zuora_entity_id,
-                rest_domain,
-                retry_count: retry_count
-              )
-            rescue ActiveRecord::RecordNotUnique
-              retry if (retry_count -= 1).positive?
-              return
-            end
-
-            app_instance_id = @appinstance.id
-          end
-
-          begin
-            Apartment::Tenant.switch!('public')
-            Apartment::Tenant.create(app_instance_id.to_s)
-          rescue Apartment::TenantExists
-            ZuoraConnect.logger.debug('Tenant Already Exists')
-          end
-        end
-      end
-
     private
       def setup_instance_via_prod_mode
         zuora_entity_id = request.headers['ZuoraCurrentEntity'] || cookies['ZuoraCurrentEntity']
@@ -310,7 +226,7 @@ module ZuoraConnect
         if zuora_entity_id.present?
           zuora_tenant_id = cookies['Zuora-Tenant-Id']
           zuora_user_id = cookies['Zuora-User-Id']
-          zuora_host = request.headers['HTTP_X_FORWARDED_HOST'] || request.headers['Zuora-Host'] || 'apisandbox.zuora.com'
+          zuora_host = request.headers["HTTP_X_FORWARDED_HOST"] || "apisandbox.zuora.com"
 
           zuora_details = {'host' => zuora_host, 'user_id' => zuora_user_id, 'tenant_id' => zuora_tenant_id, 'entity_id' => zuora_entity_id}
           auth_headers = {}
@@ -412,16 +328,13 @@ module ZuoraConnect
 
             zuora_user_id = cookies['Zuora-User-Id'] || session["ZuoraCurrentIdentity"]['userId']
 
+            #One deployed instance
             if appinstances.size == 1
               ZuoraConnect.logger.debug("Instance is #{appinstances.to_h.keys.first}")
               @appinstance = ZuoraConnect::AppInstance.find(appinstances.to_h.keys.first)
-            end
 
-            # One deployed instance with credentials
-            if defined?(@appinstance) && !@appinstance['zuora_logins'].nil?
               #Add user/update
               begin
-                ZuoraConnect::ZuoraUser.reset_table_name
                 @zuora_user = ZuoraConnect::ZuoraUser.where(:zuora_user_id => zuora_user_id).first
               rescue ActiveRecord::StatementInvalid => ex
                 if ex.message.include?("PG::UndefinedTable") && ex.message.include?("zuora_users")
@@ -442,12 +355,10 @@ module ZuoraConnect
                 @zuora_user = ZuoraConnect::ZuoraUser.create!(:zuora_user_id => zuora_user_id, :zuora_identity_response => {zuora_entity_id => session["ZuoraCurrentIdentity"]})
               end
               @zuora_user.session = session
-              ZuoraConnect::ZuoraUser.current_user_id = zuora_user_id
               session["#{@appinstance.id}::user::localUserId"] = @zuora_user.id
               session["#{@appinstance.id}::user::email"] = session['ZuoraCurrentIdentity']["username"]
               session["#{@appinstance.id}::user::timezone"] = session['ZuoraCurrentIdentity']["timeZone"]
-              session["#{@appinstance.id}::user::language"] = session['ZuoraCurrentIdentity']["language"]
-              session["#{@appinstance.id}::user::locale"] = session['ZuoraCurrentIdentity']["locale"]
+              session["#{@appinstance.id}::user::locale"] = session['ZuoraCurrentIdentity']["language"]
               session["appInstance"] = @appinstance.id
 
             #We have multiple, user must pick
@@ -469,85 +380,79 @@ module ZuoraConnect
                 return
               end
               Apartment::Tenant.switch!("public")
-              retry_count = 3
-              task_data = {}
-              begin
-                ActiveRecord::Base.transaction do
-                  ActiveRecord::Base.connection.execute('LOCK public.zuora_users IN ACCESS EXCLUSIVE MODE')
+              ActiveRecord::Base.transaction do
+                ActiveRecord::Base.connection.execute('LOCK public.zuora_users IN ACCESS EXCLUSIVE MODE')
+                appinstances = ZuoraConnect::AppInstance.where("zuora_entity_ids ?& array[:entities] = true AND zuora_domain = :host", entities: [zuora_entity_id], host: zuora_client.rest_domain).pluck(:id, :name)
 
-                  unless defined?(@appinstance)
-                    appinstances = ZuoraConnect::AppInstance.where("zuora_entity_ids ?& array[:entities] = true AND zuora_domain = :host", entities: [zuora_entity_id], host: zuora_client.rest_domain).pluck(:id, :name)
-
-                    if appinstances.size > 0
-                      redirect_to "https://#{zuora_host}/apps/newlogin.do?retURL=#{request.fullpath}"
-                      return
-                    end
-                  end
+                if appinstances.size > 0
+                  redirect_to "https://#{zuora_host}/apps/newlogin.do?retURL=#{request.fullpath}"
+                  return
+                end
 
-                  next_id = defined?(@appinstance) ? @appinstance.id : next_instance_id
-                  if task_data.blank?
-                    user = (ENV['DEIS_APP'] || "Application").split('-').map(&:capitalize).join(' ')
-                    body = {
-                      'userId' => zuora_user_id,
-                      'entityIds' => [zuora_entity_id.unpack("a8a4a4a4a12").join('-')],
-                      'customAuthorities' => [],
-                      'additionalInformation' => {
-                        'description' => "This user is for #{user} application.",
-                        'name' => "#{user} API User #{next_id}"
-                      }
-                    }
-
-                    oauth_response, response = zuora_client.rest_call(
-                      method: :post,
-                      body: body.to_json,
-                      url: zuora_client.rest_endpoint("genesis/clients").gsub('v1/', ''),
-                      session_type: zuora_client.class == ZuoraAPI::Oauth ? :bearer : :basic,
-                      headers: auth_headers
-                    )
-
-                    new_zuora_client = ZuoraAPI::Oauth.new(url: "https://#{zuora_host}", oauth_client_id: oauth_response["clientId"], oauth_secret: oauth_response["clientSecret"] )
-                    if session["ZuoraCurrentUserInfo"].blank?
-                      client_describe, response = new_zuora_client.rest_call(url: zuora_client.rest_endpoint("genesis/user/info").gsub('v1/', ''), session_type: :bearer)
-                    else
-                      client_describe = session["ZuoraCurrentUserInfo"]
-                    end
+                next_id = (ZuoraConnect::AppInstance.all.where('id > 24999999').order(id: :desc).limit(1).pluck(:id).first || 24999999) + 1
+                user = (ENV['DEIS_APP'] || "Application").split('-').map(&:capitalize).join(' ')
+                body = {
+                  'userId' => zuora_user_id,
+                  'entityIds' => [zuora_entity_id.unpack("a8a4a4a4a12").join('-')],
+                  'customAuthorities' => [],
+                  'additionalInformation' => {
+                    'description' => "This user is for #{user} application.",
+                    'name' => "#{user} API User #{next_id}"
+                  }
+                }
+
+                oauth_response, response = zuora_client.rest_call(
+                  method: :post,
+                  body: body.to_json,
+                  url: zuora_client.rest_endpoint("genesis/clients").gsub('v1/', ''),
+                  session_type: zuora_client.class == ZuoraAPI::Oauth ? :bearer : :basic,
+                  headers: auth_headers
+                )
 
-                    available_entities = client_describe["accessibleEntities"].select {|entity| entity['id'] == zuora_entity_id}
-                    task_data = {
-                      "id": next_id,
-                      "name": client_describe["tenantName"],
-                      "mode": "Collections",
-                      "status": "Running",
-                      ZuoraConnect::AppInstance::LOGIN_TENANT_DESTINATION => {
-                        "tenant_type": "Zuora",
-                        "username": session["ZuoraCurrentIdentity"]["username"],
-                        "url": new_zuora_client.url,
-                        "status": "Active",
-                        "oauth_client_id": oauth_response['clientId'],
-                        "oauth_secret": oauth_response['clientSecret'],
-                        "authentication_type": "OAUTH",
-                        "entities": available_entities.map {|e| e.merge({'displayName' => client_describe["tenantName"]})}
-                      },
-                      "tenant_ids": available_entities.map{|e| e['entityId']}.uniq,
-                    }
-                  end
+                new_zuora_client = ZuoraAPI::Oauth.new(url: "https://#{zuora_host}", oauth_client_id: oauth_response["clientId"], oauth_secret: oauth_response["clientSecret"] )
+                if session["ZuoraCurrentUserInfo"].blank?
+                  client_describe, response = new_zuora_client.rest_call(url: zuora_client.rest_endpoint("genesis/user/info").gsub('v1/', ''), session_type: :bearer)
+                else
+                  client_describe = session["ZuoraCurrentUserInfo"]
+                end
 
-                  if defined?(@appinstance)
-                    @appinstance.zuora_logins = task_data
-                    @appinstance.save(:validate => false)
+                available_entities = client_describe["accessibleEntities"].select {|entity| entity['id'] == zuora_entity_id}
+                task_data = {
+                  "id": next_id,
+                  "name": client_describe["tenantName"],
+                  "mode": "Collections",
+                  "status": "Running",
+                  ZuoraConnect::AppInstance::LOGIN_TENANT_DESTINATION => {
+                    "tenant_type": "Zuora",
+                    "username": session["ZuoraCurrentIdentity"]["username"],
+                    "url": new_zuora_client.url,
+                    "status": "Active",
+                    "oauth_client_id": oauth_response['clientId'],
+                    "oauth_secret": oauth_response['clientSecret'],
+                    "authentication_type": "OAUTH",
+                    "entities": available_entities.map {|e| e.merge({'displayName' => client_describe["tenantName"]})}
+                  },
+                  "tenant_ids": available_entities.map{|e| e['entityId']}.uniq,
+                }
+                mapped_values = {:id => next_id, :api_token => rand(36**64).to_s(36), :token => rand(36**64).to_s(36), :zuora_logins => task_data, :oauth_expires_at => Time.now + 1000.years, :zuora_domain => zuora_client.rest_domain, :zuora_entity_ids => [zuora_entity_id]}
+                @appinstance = ZuoraConnect::AppInstance.new(mapped_values)
+                retry_count = 0
+                begin
+                  @appinstance.save(:validate => false)
+                rescue ActiveRecord::RecordNotUnique => ex
+                  if (retry_count += 1) < 3
+                    @appinstance.assign_attributes({:api_token => rand(36**64).to_s(36), :token => rand(36**64).to_s(36)})
+                    retry
                   else
-                    @appinstance = new_instance(
-                      next_id,
-                      zuora_entity_id,
-                      zuora_client.rest_domain,
-                      task_data: task_data,
-                      retry_count: retry_count
-                    )
+                    Thread.current[:appinstance] = nil
+                    session["appInstance"] = nil
+                    render "zuora_connect/static/error_handled", :locals => {
+                      :title => "Application could not create unique tokens.",
+                      :message => "Please contact support or retry launching application."
+                    }, :layout => false
+                    return
                   end
                 end
-              rescue ActiveRecord::RecordNotUnique
-                retry if (retry_count -= 1).positive?
-                return
               end
 
               Apartment::Tenant.switch!("public")
@@ -578,8 +483,8 @@ module ZuoraConnect
 
           rescue ZuoraAPI::Exceptions::ZuoraAPIError, Exception => ex
             if ex.message.include?("Referenced User resource(s) not found") && ex.class == ZuoraAPI::Exceptions::ZuoraAPIError
-              locals = {title: "Provisioning Error", message: "New tenants need to be provisioned by API Gateway('#{ex.message}'). Please contact support."}
-              render "zuora_connect/static/error_handled", locals: locals, status: 200, layout: false
+              locals = {title: "Provisioning Error", message: "New tenats need to be provisioned by API Gateway('#{ex.message}'). Please contact support."}
+              render "zuora_connect/static/error_handled", locals: locals, status: 400, layout: false
             else
               session.clear
               if defined?(ex.response) && ex.response.present? && defined?(ex.response.body)
@@ -635,57 +540,12 @@ module ZuoraConnect
         end
       end
 
-      def next_instance_id
-        min_instance_id = 24_999_999
-        (ZuoraConnect::AppInstance.all.where("id > #{min_instance_id}").order(id: :desc).limit(1).pluck(:id).first || min_instance_id) + 1
-      end
-
-      def new_instance(id, zuora_entity_id, rest_domain, task_data: nil, retry_count: 0)
-        app_instance = ZuoraConnect::AppInstance.new(
-          :id => id,
-          :api_token => generate_token,
-          :token => generate_token,
-          :oauth_expires_at => Time.now + 1000.years,
-          :zuora_domain => rest_domain,
-          :zuora_entity_ids => [zuora_entity_id]
-        )
-
-        if task_data.nil?
-          # no encryption
-          app_instance['zuora_logins'] = task_data
-        else
-          # kms encrypt
-          app_instance.zuora_logins = task_data
-        end
-
-        begin
-          app_instance.save(:validate => false)
-        rescue ActiveRecord::RecordNotUnique
-          raise if retry_count > 1
-
-          Thread.current[:appinstance] = nil
-          session['appInstance'] = nil
-          render 'zuora_connect/static/error_handled', :locals => {
-            :title => 'Application could not create unique tokens.',
-            :message => 'Please contact support or retry launching application.'
-          }, :layout => false
-          return
-        end
-
-        app_instance
-      end
-
-      def generate_token
-        rand(36**64).to_s(36)
-      end
-
       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)
-        ZuoraConnect::ZuoraUser.current_user_id = 0
         if @appinstance.blank?
           Apartment::Tenant.switch!("public")
           begin