zuora_connect 1.7.82 → 1.7.83

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 912e1a274c4281b87a68d1b54adc6cd7458eed4b2d22504b805946602865f820
-  data.tar.gz: 563a6fdf7d917680bed40b011aba28fa2033ad4aa6b3edbc34f40c6e0aaf0458
+  metadata.gz: a038229921d3010126de36835cb7fe3fa1eac57c5e953048fee68cb5232dfb43
+  data.tar.gz: a96e99330f622128dcd98f452d05ec6d21d847f81bfe693fe367ee6e40e94292
 SHA512:
-  metadata.gz: d11dfacabb58dda03407db8900fc1a6692d3790e40cb47edeb772df2c4b20f0033f73c11e641177ed256ee07e8b5c51cc408d2fb3038afb8490510c17918a27d
-  data.tar.gz: 495d36629ab246132b2403372d0b52753b1b9ee94065ddf5a3025ec2c10f0a9af5d63e57eb1c37be3770201462e915639efb563e0ddf7a01ec24d84b3bdc19e1
+  metadata.gz: 54fce1d9d288a4230d412c8c6d212e3ed26c51745273d909bbc7585b418cbc7f87c44ff86a36dc83ae6bdb2fffa997b7dc5eeb7712492d5b0b57cd6e7fc61466
+  data.tar.gz: 9e0f20125e971ff542c328d507900839d86a0b108c7ca682ed1c2b6872ca75418226d396777149ce213827c69394055815b9942ac6ff7e499c6aa44e925e08ac

data/app/models/zuora_connect/app_instance_base.rb

@@ -29,7 +29,7 @@ module ZuoraConnect
       PaperTrail.whodunnit = "Backend" if defined?(PaperTrail)
       if defined?(ElasticAPM) && ElasticAPM.running?
         ElasticAPM.set_user("Backend")
-        ElasticAPM.set_tag(:app_instance, self.id) 
+        ElasticAPM.set_tag(:app_instance, self.id)
       end
 
       if INSTANCE_REFRESH_WINDOW > INSTANCE_REDIS_CACHE_PERIOD
@@ -60,13 +60,13 @@ module ZuoraConnect
         Resque.redis.zrem("PauseQueue", id)
       end
       return true
-    end 
+    end
 
     def apartment_switch(method = nil, migrate = false)
       switch_count ||= 0
       if self.persisted?
         begin
-          Apartment::Tenant.switch!(self.id) 
+          Apartment::Tenant.switch!(self.id)
         rescue Apartment::TenantNotFound => ex
           sleep(2)
           begin
@@ -74,9 +74,9 @@ module ZuoraConnect
           rescue Apartment::TenantExists => ex
           end
           if (switch_count += 1) < 2
-            retry 
+            retry
           else
-            raise 
+            raise
           end
         end
         if migrate && ActiveRecord::Migrator.needs_migration?
@@ -159,7 +159,7 @@ module ZuoraConnect
           ZuoraConnect.logger.add(log_level, self.new_session_message)
           self.build_task(task_data: session["#{self.id}::task_data"], session: session)
         end
-      end      
+      end
       return self
     rescue ZuoraConnect::Exceptions::HoldingPattern => ex
       while self.marked_for_refresh?
@@ -169,7 +169,7 @@ module ZuoraConnect
       self.reload_attributes([:refresh_token, :oauth_expires_at, :access_token])
       session = self.data_lookup(session: session)
       retry
-    rescue => ex 
+    rescue => ex
       if recoverable_session
         ZuoraConnect.logger.error("REBUILDING - Using backup expired cache")
         self.build_task(task_data: session["#{self.id}::task_data"], session: session)
@@ -191,7 +191,7 @@ module ZuoraConnect
         ElasticAPM.set_tag(:organization, organizations.first) 
       end
       self.logitem(item: {tenant_ids: tenants, organization: organizations})
-      self.update_column(:name, self.task_data.dig('name')) if ZuoraConnect::AppInstance.column_names.include?('name') && self.task_data.dig('name') != self.name 
+      self.update_column(:name, self.task_data.dig('name')) if ZuoraConnect::AppInstance.column_names.include?('name') && self.task_data.dig('name') != self.name
     end
 
     def refresh(session: {}, session_fallback: false)
@@ -243,10 +243,44 @@ module ZuoraConnect
       def self.write_to_telegraf(*args)
         if ZuoraConnect.configuration.enable_metrics
           @@telegraf_host = ZuoraConnect::Telegraf.new() if @@telegraf_host == nil
+          unicorn_stats = self.unicorn_listener_stats() if defined?(Unicorn) && Unicorn.respond_to?(:listener_names)
+          @@telegraf_host.write(direction: 'Raindrops', tags: {}, values: unicorn_stats)  unless unicorn_stats.blank?
           return @@telegraf_host.write(*args)
         end
       end
 
+      def self.unicorn_listener_stats ()
+        stats_hash = {}
+        stats_hash["total_active"] = 0
+        stats_hash["total_queued"] = 0
+
+        begin 
+          tmp = Unicorn.listener_names
+          unix = tmp.grep(%r{\A/})
+          tcp = tmp.grep(/\A.+:\d+\z/)
+          tcp = nil if tcp.empty?
+          unix = nil if unix.empty?
+
+
+          Raindrops::Linux.tcp_listener_stats(tcp).each do |addr,stats|
+            stats_hash["active_#{addr}"] = stats.active
+            stats_hash["queued_#{addr}"] = stats.queued
+            stats_hash["total_active"] = stats.active + stats_hash["total_active"]
+            stats_hash["total_queued"] = stats.queued + stats_hash["total_queued"]
+          end if tcp
+
+          Raindrops::Linux.unix_listener_stats(unix).each do |addr,stats|
+            stats_hash["active_#{addr}"] = stats.active
+            stats_hash["queued_#{addr}"] = stats.queued
+            stats_hash["total_active"] = stats.active + stats_hash["total_active"]
+            stats_hash["total_queued"] = stats.queued + stats_hash["total_queued"]
+          end if unix
+        rescue => ex
+          ZuoraConnect.logger.error(ex)
+        end
+        return stats_hash
+      end
+
       def self.get_metrics(type)
         @data = {}
 
@@ -301,7 +335,7 @@ module ZuoraConnect
               else
                 tmp.client.current_session                       = session["#{self.id}::#{k}:current_session"]                             if session["#{self.id}::#{k}:current_session"]
                 tmp.client.bearer_token                          = session["#{self.id}::#{k}:bearer_token"]                                if session["#{self.id}::#{k}:bearer_token"] && tmp.client.respond_to?(:bearer_token) ## need incase session id goes from basic to aouth in same redis store
-                tmp.client.oauth_session_expires_at              = session["#{self.id}::#{k}:oauth_session_expires_at"]                    if session["#{self.id}::#{k}:oauth_session_expires_at"]  && tmp.client.respond_to?(:oauth_session_expires_at) 
+                tmp.client.oauth_session_expires_at              = session["#{self.id}::#{k}:oauth_session_expires_at"]                    if session["#{self.id}::#{k}:oauth_session_expires_at"]  && tmp.client.respond_to?(:oauth_session_expires_at)
               end
             end
             self.logins[k] = tmp
@@ -561,13 +595,13 @@ module ZuoraConnect
       def decrypt_data(data: nil, rescue_return: nil, log_fatal: true)
         return data if data.blank?
         if Rails.env == 'development'
-          begin 
+          begin
             return JSON.parse(data)
           rescue JSON::ParserError => ex
             return data
           end
         else
-          begin 
+          begin
             return JSON.parse(encryptor.decrypt_and_verify(CGI::unescape(data)))
           rescue ActiveSupport::MessageVerifier::InvalidSignature => ex
             ZuoraConnect.logger.add(Logger::FATAL, 'Error Decrypting') if log_fatal
@@ -622,7 +656,7 @@ module ZuoraConnect
         if paused_user == current_user || paused_user.blank?
           Resque.redis.zrem("PauseQueue", "#{self.id}__#{paused_user}")
         else
-          raise "Can only unpause for user #{paused_user}." 
+          raise "Can only unpause for user #{paused_user}."
         end
       end
     ### END Resque Helping Methods ####
@@ -836,7 +870,7 @@ module ZuoraConnect
           if cache
             Redis.current.sadd("Catalog:#{self.id}:Keys", ["Catalog:#{self.id}:#{object_id}:Hierarchy", "Catalog:#{self.id}:#{object_id}:Children:#{child_objects}"])
             Redis.current.set("Catalog:#{self.id}:#{object_id}:Hierarchy", encrypt_data(data: object_hierarchy))
-            Redis.current.set("Catalog:#{self.id}:#{object_id}:Children:#{child_objects}", encrypt_data(data: stub_catalog)) 
+            Redis.current.set("Catalog:#{self.id}:#{object_id}:Children:#{child_objects}", encrypt_data(data: stub_catalog))
           else
             Redis.current.sadd("Catalog:#{self.id}:Keys", ["Catalog:#{self.id}:#{object_id}:Hierarchy"])
             Redis.current.set("Catalog:#{self.id}:#{object_id}:Hierarchy", encrypt_data(data: object_hierarchy))
@@ -875,7 +909,7 @@ module ZuoraConnect
         self.update_functions
         if index_table
           ActiveRecord::Base.connection.execute('SELECT "shared_extensions".refresh_aggregate_table(\'%s\', \'%s\', %s, \'Index\');' % [aggregate_name, table_name, ActiveRecord::Base.connection.quote(where_clause)])
-        else 
+        else
           ActiveRecord::Base.connection.execute('SELECT "shared_extensions".refresh_aggregate_table(\'%s\', \'%s\', %s, \'NO\');' % [aggregate_name, table_name, ActiveRecord::Base.connection.quote(where_clause)])
         end
       end
@@ -949,4 +983,4 @@ module ZuoraConnect
     method_hook :refresh, :updateOption, :update_logins, :before => :check_oauth_state
     method_hook :new_session, :refresh, :build_task, :after => :apartment_switch
   end
-end
+end

data/config/initializers/unicorn.rb

@@ -2,7 +2,7 @@ if defined?(Unicorn::WorkerKiller)
   Unicorn::WorkerKiller.module_eval do
     self.singleton_class.send(:alias_method, :kill_self_old, :kill_self)
     def self.kill_self(logger, start_time)
-      self.kill_self_old(@unicorn_logger, start_time)
+      self.kill_self_old(logger, start_time)
       ZuoraConnect::AppInstance.write_to_telegraf(direction: 'Unicorn-Killer', tags: {app_instance: 0}, values: {kill: 1})
     end
   end

data/lib/middleware/metrics_middleware.rb

@@ -53,7 +53,10 @@ module ZuoraConnect
           env['REQUEST_PATH'] = env['REQUEST_PATH'].gsub(Thread.current[:isHallway], '')
 
           #We need the forwarded host header to identify location of tenant
-          @bad_headers.delete('HTTP_X_FORWARDED_HOST')
+          whitelist = Regexp.new(".*[\.]zuora[\.]com$|^zuora[\.]com$")
+          if whitelist.match(env['HTTP_X_FORWARDED_HOST']).present?
+            @bad_headers.delete('HTTP_X_FORWARDED_HOST')
+          end
         else
           Thread.current[:isHallway] = nil
         end

data/lib/middleware/request_id_middleware.rb

@@ -1,6 +1,7 @@
 module ZuoraConnect
   class RequestIdMiddleware
     mattr_accessor :request_id
+    mattr_accessor :zuora_request_id
 
     def initialize(app)
       @app = app
@@ -8,6 +9,7 @@ module ZuoraConnect
 
     def call(env)
       self.request_id = env['action_dispatch.request_id']
+      self.zuora_request_id = env["HTTP_ZUORA_REQUEST_ID"]
       @app.call(env)
     end
   end

data/lib/zuora_connect.rb

@@ -37,6 +37,8 @@ module ZuoraConnect
         logger.level = level
         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]}
           if !['ElasticAPM', 'ResqueScheduler', 'ResquePool', 'Resque', 'Makara'].include?(name) 
             if Thread.current[:appinstance].present?
               data[:app_instance_id] = Thread.current[:appinstance].id

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.7.82"
+  VERSION = "1.7.83"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.7.82
+  version: 1.7.83
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-30 00:00:00.000000000 Z
+date: 2019-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -154,6 +154,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.1'
+- !ruby/object:Gem::Dependency
+  name: raindrops
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement