zuora_connect 1.7.711 → 1.7.791

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a1133f6da135108cf5eb1d4794c7d16637c71e2
-  data.tar.gz: e559213443b6098369b2585c2ee1131fe95632cf
+  metadata.gz: 753cf6136eba70f94335ed9c9cf6f80475208594
+  data.tar.gz: 1e26f0d293399f118f12c85b8dd3120d2ce478d8
 SHA512:
-  metadata.gz: 47f5968069e7fb52a50bfcf0c580208ea4683db2645afdd406ebd22eee42a1b7e9c64c38295e337a0e8abb0d68185a08999a4565ea2890875d985f16a2a50127
-  data.tar.gz: 7a1052be676f123fd7a8c909cff03599b81c24527aff5412e7080ca6bdfe768173b577e5662d2e273fc02e35ddf88e2c08266c56b35c028a8c63ca9cdce8eb06
+  metadata.gz: 61bd48c5799396cedbf7ca97566efbef0ef1ad3830b57a0cf84a2e1622d3aa9dbf5fbf6cee2ab304dc8c6a1bc56c7a82ff992178666826bf30ea6c98b9a9c781
+  data.tar.gz: 72a60a7926f075aac8163a822fdb771a01132bf527dbb7a1f93985fa96b2aced41eb56fce81e02f0b988e8b89b811bdb4f167cf8aca744c88da76a20bbe0bdd0

data/app/controllers/zuora_connect/static_controller.rb

@@ -1,10 +1,10 @@
 module ZuoraConnect
   class StaticController < ApplicationController
-    before_filter :authenticate_connect_app_request, :except => [:metrics, :health, :session_error, :invalid_app_instance_error, :initialize_app]
-    before_filter :clear_connect_app_session,        :only =>   [:metrics, :health, :session_error, :invalid_app_instance_error, :initialize_app]
-    after_filter :persist_connect_app_session,       :except => [:metrics, :health, :session_error, :invalid_app_instance_error, :initialize_app]
+    before_action :authenticate_connect_app_request, :except => [:metrics, :health, :session_error, :invalid_app_instance_error, :initialize_app]
+    before_action :clear_connect_app_session,        :only =>   [:metrics, :health, :session_error, :invalid_app_instance_error, :initialize_app]
+    after_action :persist_connect_app_session,       :except => [:metrics, :health, :session_error, :invalid_app_instance_error, :initialize_app]
     
-    skip_before_filter :verify_authenticity_token, :only => [:initialize_app]
+    skip_before_action :verify_authenticity_token, :only => [:initialize_app]
 
     def session_error
       respond_to do |format|

data/app/models/zuora_connect/app_instance_base.rb

@@ -4,6 +4,7 @@ module ZuoraConnect
     default_scope {select(ZuoraConnect::AppInstance.column_names.delete_if {|x| ["catalog_mapping", "catalog"].include?(x) }) }
     after_initialize :init
     after_create :initialize_redis_placeholder
+    before_destroy :prune_data
 
     self.table_name = "zuora_connect_app_instances"
     attr_accessor :options, :mode, :logins, :task_data, :last_refresh, :username, :password, :s3_client, :api_version, :drop_message, :new_session_message, :connect_user, :logitems
@@ -39,6 +40,7 @@ module ZuoraConnect
 
     def initialize_redis_placeholder
       if defined?(Redis.current)
+        Redis.current.zrem("AppInstance:Deleted", id)
         Redis.current.zadd("APILimits", 9999999999, "placeholder")
         Redis.current.zadd("InstanceRefreshing", 9999999999, "placeholder")
       end
@@ -47,18 +49,39 @@ module ZuoraConnect
       end
     end
 
+    def prune_data(id: self.id)
+      if defined?(Redis.current)
+        Redis.current.zadd("AppInstance:Deleted", Time.now.to_i, id)
+        Redis.current.del("AppInstance:#{id}")
+        Redis.current.zrem("APILimits", id)
+        Redis.current.zrem("InstanceRefreshing", id)
+      end
+      if defined?(Resque.redis)
+        Resque.redis.zrem("PauseQueue", id)
+      end
+      return true
+    end 
+
     def apartment_switch(method = nil, migrate = false)
-      begin
-        Apartment::Tenant.switch!(self.id) if self.persisted?
-      rescue Apartment::TenantNotFound => ex
+      switch_count ||= 0
+      if self.persisted?
         begin
-          Apartment::Tenant.create(self.id.to_s)
-        rescue Apartment::TenantExists => ex
+          Apartment::Tenant.switch!(self.id) 
+        rescue Apartment::TenantNotFound => ex
+          sleep(2)
+          begin
+            Apartment::Tenant.create(self.id.to_s)
+          rescue Apartment::TenantExists => ex
+          end
+          if (switch_count += 1) < 2
+            retry 
+          else
+            raise 
+          end
+        end
+        if migrate && ActiveRecord::Migrator.needs_migration?
+          Apartment::Migrator.migrate(self.id)
         end
-        retry
-      end
-      if migrate && ActiveRecord::Migrator.needs_migration?
-        Apartment::Migrator.migrate(self.id)
       end
       Thread.current[:appinstance] = self
     end

data/config/initializers/elastic_apm.rb

@@ -0,0 +1,24 @@
+if defined?(ElasticAPM)
+  ElasticAPM.agent.config.disable_send = true
+  if ZuoraConnect.configuration.enable_apm && !defined?(Rails::Console)
+    #require 'elastic_apm'
+    case Rails.env.to_s
+    when 'production'
+      ElasticAPM.agent.config.server_url = "http://apm-server.logging:8200"
+      ElasticAPM.agent.config.transaction_sample_rate = 0.20
+      ElasticAPM.agent.config.capture_body = false
+    when 'staging'
+      ElasticAPM.agent.config.server_url = "http://apm-server.logging:8200"
+      ElasticAPM.agent.config.transaction_sample_rate = 1.0
+    when 'development'
+      ElasticAPM.agent.config.server_url = "http://logging.0.ecc.auw2.zuora:8200"
+      ElasticAPM.agent.config.transaction_sample_rate = 1.0
+    end
+    ElasticAPM.agent.config.pool_size = 1
+    ElasticAPM.agent.config.transaction_max_spans = 500
+    ElasticAPM.agent.config.ignore_url_patterns = ['^\/admin\/resque.*', '^\/admin\/redis.*', '^\/admin\/peek.*', '^\/peek.*']
+    ElasticAPM.agent.config.verify_server_cert = false
+    ElasticAPM.agent.config.log_level = Logger::INFO
+    ElasticAPM.agent.config.disable_send = false
+  end    
+end

data/config/initializers/redis.rb

@@ -1,9 +1,9 @@
 redis_url = ENV["REDIS_URL"].present? ?  ENV["REDIS_URL"] : defined?(Rails.application.secrets.redis) ? Rails.application.secrets.redis : 'redis://localhost:6379/1'
 resque_url = ENV["RESQUE_URL"].present? ?  ENV["RESQUE_URL"] : defined?(Rails.application.secrets.resque) ? Rails.application.secrets.resque : 'redis://localhost:6379/1'
 if defined?(Redis.current)
-  Redis.current = Redis.new(:id => "#{ZuoraConnect::Telegraf.full_process_name(process_name: 'Redis')}", :url => redis_url, :timeout => 10, :reconnect_attempts => 2)
+  Redis.current = Redis.new(:id => "#{ZuoraConnect::Telegraf.full_process_name(process_name: 'Redis')}", :url => redis_url, :timeout => 6, :reconnect_attempts => 2)
   if defined?(Resque.redis)
-    Resque.redis = resque_url != redis_url ? Redis.new(:id => "#{ZuoraConnect::Telegraf.full_process_name(process_name: 'Resque')}", :url => resque_url, :timeout => 10, :reconnect_attempts => 2) : Redis.current
+    Resque.redis = resque_url != redis_url ? Redis.new(:id => "#{ZuoraConnect::Telegraf.full_process_name(process_name: 'Resque')}", :url => resque_url, :timeout => 6, :reconnect_attempts => 2) : Redis.current
   end
 end
 if defined?(RedisBrowser)

data/db/migrate/20100718151733_create_connect_app_instances.rb

@@ -1,4 +1,4 @@
-class CreateConnectAppInstances < ActiveRecord::Migration[4.2]
+class CreateConnectAppInstances < ActiveRecord::Migration
   def change
     if !ActiveRecord::Base.connection.table_exists?('zuora_connect_app_instances')
       create_table :zuora_connect_app_instances do |t|

data/db/migrate/20101024162319_add_tokens_to_app_instance.rb

@@ -1,4 +1,4 @@
-class AddTokensToAppInstance < ActiveRecord::Migration[4.2]
+class AddTokensToAppInstance < ActiveRecord::Migration
   def change
     add_column :zuora_connect_app_instances, :access_token, :string unless column_exists? :zuora_connect_app_instances, :access_token
     add_column :zuora_connect_app_instances, :refresh_token, :string unless column_exists? :zuora_connect_app_instances, :refresh_token

data/db/migrate/20101024220705_add_token_to_app_instance.rb

@@ -1,4 +1,4 @@
-class AddTokenToAppInstance < ActiveRecord::Migration[4.2]
+class AddTokenToAppInstance < ActiveRecord::Migration
   def change
     add_column :zuora_connect_app_instances, :token, :string  unless column_exists? :zuora_connect_app_instances, :token
   end

data/db/migrate/20110131211919_add_sessions_table.rb

@@ -1,4 +1,4 @@
-class AddSessionsTable < ActiveRecord::Migration[4.2]
+class AddSessionsTable < ActiveRecord::Migration
   def change
     if !ActiveRecord::Base.connection.table_exists?('sessions')
       create_table :sessions do |t|

data/db/migrate/20110411200303_add_expiration_to_app_instance.rb

@@ -1,4 +1,4 @@
-class AddExpirationToAppInstance < ActiveRecord::Migration[4.2]
+class AddExpirationToAppInstance < ActiveRecord::Migration
   def change
     add_column :zuora_connect_app_instances, :oauth_expires_at, :datetime  unless column_exists? :zuora_connect_app_instances, :oauth_expires_at
   end

data/db/migrate/20110413191512_add_new_api_token.rb

@@ -1,4 +1,4 @@
-class AddNewApiToken < ActiveRecord::Migration[4.2]
+class AddNewApiToken < ActiveRecord::Migration
   def change
     add_column :zuora_connect_app_instances, :api_token, :string  unless column_exists? :zuora_connect_app_instances, :api_token
   end

data/db/migrate/20110503003602_add_catalog_data_to_app_instance.rb

@@ -1,4 +1,4 @@
-class AddCatalogDataToAppInstance < ActiveRecord::Migration[4.2]
+class AddCatalogDataToAppInstance < ActiveRecord::Migration
   def change
     add_column :zuora_connect_app_instances, :catalog_updated_at, :datetime  unless column_exists? :zuora_connect_app_instances, :catalog_updated_at
     add_column :zuora_connect_app_instances, :catalog, :jsonb, default: {}  unless column_exists? :zuora_connect_app_instances, :catalog

data/db/migrate/20110503003603_add_catalog_mappings_to_app_instance.rb

@@ -1,4 +1,4 @@
-class AddCatalogMappingsToAppInstance < ActiveRecord::Migration[4.2]
+class AddCatalogMappingsToAppInstance < ActiveRecord::Migration
   def change
     add_column :zuora_connect_app_instances, :catalog_mapping, :jsonb, default: {} unless column_exists? :zuora_connect_app_instances, :catalog_mapping
   end

data/db/migrate/20110503003604_catalog_default.rb

@@ -1,4 +1,4 @@
-class CatalogDefault < ActiveRecord::Migration[4.2]
+class CatalogDefault < ActiveRecord::Migration
   def change
     change_column :zuora_connect_app_instances, :catalog, :jsonb, default: {}
   end

data/db/migrate/20180301052853_add_catalog_attempted_at.rb

@@ -1,4 +1,4 @@
-class AddCatalogAttemptedAt < ActiveRecord::Migration[4.2]
+class AddCatalogAttemptedAt < ActiveRecord::Migration
   def change
     add_column :zuora_connect_app_instances, :catalog_update_attempt_at, :datetime  unless column_exists? :zuora_connect_app_instances, :catalog_update_attempt_at
   end

data/db/migrate/20181206162339_add_fields_to_instance.rb

@@ -1,4 +1,4 @@
-class AddFieldsToInstance < ActiveRecord::Migration[4.2]
+class AddFieldsToInstance < ActiveRecord::Migration
   def change
   	add_column :zuora_connect_app_instances, :name, :string, default: "" unless column_exists? :zuora_connect_app_instances, :name
   end

data/lib/resque/plugins/custom_logger.rb

@@ -3,13 +3,6 @@
 # 
 # Monologger supports printing logs in trap block.
 # 
-# Usage: 
-#    require 'resque/plugins/custom_logger'
-#    class ExecuteWorkflowJob
-#      extend Resque::Plugins::CustomLogger
-#      ...
-#    end
-
 module Resque
   module Plugins
     module CustomLogger
@@ -36,8 +29,17 @@ module Resque
         
         Resque.logger = logger
         Rails.logger = logger
-        
-        Rails.logger.info(args.to_json) if args.present?
+        case args.class.to_s
+        when "Array"
+          if args.first.class == Hash
+            data = args.first.merge({:worker_class => self.to_s})
+          else
+            data = {:worker_class => self.to_s, :args => args}
+          end
+        when "Hash"
+          data = args.merge({:worker_class => self.to_s})
+        end
+        Rails.logger.info(data.to_json) if data.present?
       end
     end
   end

data/lib/zuora_connect/configuration.rb

@@ -3,7 +3,7 @@ module ZuoraConnect
 
     attr_accessor :default_locale, :default_time_zone, :url, :mode, :delayed_job,:private_key, :additional_apartment_models
 
-    attr_accessor :enable_metrics, :telegraf_endpoint, :telegraf_debug, :custom_prometheus_update_block, :silencer_resque_finish, :blpop_queue
+    attr_accessor :enable_metrics, :enable_apm, :telegraf_endpoint, :telegraf_debug, :custom_prometheus_update_block, :silencer_resque_finish, :blpop_queue
 
     attr_accessor :oauth_client_id, :oauth_client_secret, :oauth_client_redirect_uri
 
@@ -24,7 +24,7 @@ module ZuoraConnect
       @enable_metrics = false
       @telegraf_endpoint = 'udp://telegraf-app-metrics.monitoring.svc.cluster.local:8094'
       @telegraf_debug = false
-      
+      @enable_apm = false
       # OAuth Settings
       @oauth_client_id = ""
       @oauth_client_secret = ""

data/lib/zuora_connect/engine.rb

@@ -15,7 +15,7 @@ module ZuoraConnect
       end
     end
 
-   initializer :append_migrations do |app|
+    initializer :append_migrations do |app|
       unless app.root.to_s.match root.to_s
         config.paths["db/migrate"].expanded.each do |expanded_path|
           app.config.paths["db/migrate"] << expanded_path
@@ -28,10 +28,5 @@ module ZuoraConnect
         include ZuoraConnect::Controllers::Helpers
       end
     end
-
-    initializer :append_migrations do |app|
-      next if app.root.to_s.start_with?(root.to_s) # only run when called from other apps
-      app.config.paths['db/migrate'].concat(config.paths['db/migrate'].expanded)
-    end
   end
 end

data/lib/zuora_connect/railtie.rb

@@ -29,7 +29,7 @@ module ZuoraConnect
     ActiveSupport::Notifications.subscribe('process_action.action_controller', Middleware::PageRequest.new)
 
     initializer(:rails_stdout_logging, before: :initialize_logger) do
-      if true || Rails.env != 'development' && !ENV['DEIS_APP'].blank?
+      if Rails.env != 'development' && !ENV['DEIS_APP'].blank?
         require 'lograge'
         logger           = ActiveSupport::Logger.new(STDOUT)
         logger.formatter = ::Logger::Formatter.new

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.7.711"
+  VERSION = "1.7.791"
 end

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.7.711
+  version: 1.7.791
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-01 00:00:00.000000000 Z
+date: 2019-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: zuora_api
   requirement: !ruby/object:Gem::Requirement
@@ -56,14 +50,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.16.4
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.16.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.16.4
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.16.4
+- !ruby/object:Gem::Dependency
+  name: elastic-apm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.5.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.5.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -285,6 +305,7 @@ files:
 - app/views/zuora_connect/static/session_error.html.erb
 - config/initializers/apartment.rb
 - config/initializers/aws.rb
+- config/initializers/elastic_apm.rb
 - config/initializers/object_method_hooks.rb
 - config/initializers/postgresql_adapter.rb
 - config/initializers/prometheus.rb