zuora_connect 1.7.76 → 1.7.78

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dcb196772fb7bde0c6358cb553b7d36485a4000
-  data.tar.gz: e2cc46aa6cca2e37fe87de2531ca1e79f44c3791
+  metadata.gz: f2e8c98737cc539599a2c0a01dc77a9b0d302ad3
+  data.tar.gz: 69f90d04820e3f18fdaa267f3bc451fed9a6fc6d
 SHA512:
-  metadata.gz: b6038b8d97c16620c26710d83f1a6992da3b7c6e54264a4369ec9359ced028d204ec8d475a68753b9996ad0fb140ea0445da07cde3ef1187af7cf8a6482b2058
-  data.tar.gz: 41f6cc657679db8e2bbfd17256c88a564441763e3459185545379ff32d5501d391c1b77eb571dadfbb15ef91b3687efbf0b279b6f607c74a233f6e76a1daa1a9
+  metadata.gz: b1486c95ae9c730c126a1ff00d41ee51710efd84688f1b2032fcf50054cd4f1f80345eeeb0d31c3255376c20684b9afba028735880f5a80a72e842d1595712ae
+  data.tar.gz: b7dc72cf4902faa5c7e0786ce9e1042d279cd6aaa012f80e19905c87e8ce445d34862fd028b8ccc10f1f44284075c24e35c635511d9d0a9b2e724354db5789f2

data/app/models/zuora_connect/app_instance_base.rb

@@ -63,17 +63,25 @@ module ZuoraConnect
     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,21 @@
+ElasticAPM.agent.config.disable_send = true
+if ZuoraConnect.configuration.enable_apm && !defined?(Rails::Console)
+  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    

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/lib/resque/plugins/custom_logger.rb

@@ -29,10 +29,14 @@ module Resque
         
         Resque.logger = logger
         Rails.logger = logger
-        case args.class
-        when Array
-          data = {:worker_class => self.to_s, :args => args}
-        when Hash
+        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?

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

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.7.76"
+  VERSION = "1.7.78"
 end

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.7.76
+  version: 1.7.78
 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