zuora_connect 1.7.23 → 1.7.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0689c0f7ddcab4b3a8372cfcbcb159f0ecb0d58
-  data.tar.gz: 2004e29ec8d530e6e5e0d8d12a716d258a518e3f
+  metadata.gz: 4d3874ddaa25d77cca54a3953967aa1ea6ec2265
+  data.tar.gz: 9314b8f38d9a6928597a2dbe305a041dc277a7ff
 SHA512:
-  metadata.gz: a9e3a19eee8faa2d33a66364b10c44d44f0af47380816fcc16eefc6327e160e9cfb1050e0c1bcef70ddc241f17ad0fdff4028486dad994651c822bac201e78a5
-  data.tar.gz: 9a371e88eed4895797aa8bfa336db5e408e5aa213ff21f627926dda7482f30e5689eade80c82b67f5f45e0fc3d265a90927be0011567e56fef8f2e2d3007145b
+  metadata.gz: 2c6eff061cacb73bf43f542a981677a25bb6d6612abbf9b104821c5d1a9bf1e952a0adbb36e5edbb687d4e90aa7d3c7c773c6f79a61ad1ab1ac135b2f2ac4b6c
+  data.tar.gz: c4822a28c7597c4f43b797bdd9fb742f7f179e0e83cabab623d05a95c74c5afc36c46b69431495c43ea6bdbd37002f71b8a5fe2ca11453493e5c3504af2d241e

data/app/models/zuora_connect/app_instance_base.rb

@@ -46,6 +46,7 @@ module ZuoraConnect
       self.last_refresh = session["#{self.id}::last_refresh"]
       self.connect_user = session["#{self.id}::user::email"] if session["#{self.id}::user::email"].present?
       PaperTrail.whodunnit = self.connect_user if defined?(PaperTrail)
+      recoverable_session = false
 
       ## DEV MODE TASK DATA MOCKUP
       if ZuoraConnect.configuration.mode != "Production"
@@ -71,43 +72,46 @@ module ZuoraConnect
 
         if session.empty?
           self.new_session_message = "REFRESHING - Session Empty"
+          Rails.logger.add(log_level, self.new_session_message)
           raise ZuoraConnect::Exceptions::HoldingPattern if holding_pattern && !self.mark_for_refresh
-          self.refresh(session)
+          self.refresh(session: session)
 
         elsif (self.id != session["appInstance"].to_i)
           self.new_session_message = "REFRESHING - AppInstance ID(#{self.id}) does not match session id(#{session["appInstance"].to_i})"
+          Rails.logger.add(log_level, self.new_session_message)
           raise ZuoraConnect::Exceptions::HoldingPattern if holding_pattern && !self.mark_for_refresh
-          self.refresh(session)
+          self.refresh(session: session)
 
         elsif session["#{self.id}::task_data"].blank?
           self.new_session_message = "REFRESHING - Task Data Blank"
+          Rails.logger.add(log_level, self.new_session_message)
           raise ZuoraConnect::Exceptions::HoldingPattern if holding_pattern && !self.mark_for_refresh
-          self.refresh(session)
+          self.refresh(session: session)
 
         elsif session["#{self.id}::last_refresh"].blank?
           self.new_session_message = "REFRESHING - No Time on Cookie"
+          recoverable_session = true
+          Rails.logger.add(log_level, self.new_session_message)
           raise ZuoraConnect::Exceptions::HoldingPattern if holding_pattern && !self.mark_for_refresh
-          self.refresh(session)
+          self.refresh(session: session)
 
         # If the cache is expired and we can aquire a refresh lock
         elsif (session["#{self.id}::last_refresh"].to_i < INSTANCE_REFRESH_WINDOW.ago.to_i) && self.mark_for_refresh
           self.new_session_message = "REFRESHING - Session Old by #{time_expire.abs} second"
-          self.refresh(session)
+          recoverable_session = true
+          Rails.logger.add(log_level, self.new_session_message)
+          self.refresh(session: session)
+
         else
           if time_expire < 0
             self.new_session_message = ["REBUILDING - Expired by #{time_expire} seconds", self.marked_for_refresh? ? " cache updating as of #{self.reset_mark_refreshed_at} seconds ago" : nil].compact.join(',')
           else
             self.new_session_message = "REBUILDING - Expires in #{time_expire} seconds"
           end
+          Rails.logger.add(log_level, self.new_session_message)
           self.build_task(task_data: session["#{self.id}::task_data"], session: session)
         end
       end
-      begin
-        I18n.locale = self.locale
-      rescue I18n::InvalidLocale => ex
-        Rails.logger.debug("Invalid Locale: #{ex.message}")
-      end
-      Time.zone = self.timezone
       return self
     rescue ZuoraConnect::Exceptions::HoldingPattern => ex
       while self.marked_for_refresh?
@@ -117,12 +121,25 @@ module ZuoraConnect
       self.reload_attributes([:refresh_token, :oauth_expires_at, :access_token])
       session = self.data_lookup(session: session)
       retry
-
+    rescue => ex 
+      if recoverable_session
+        Rails.logger.error("REBUILDING - Using backup expired cache")
+        self.build_task(task_data: session["#{self.id}::task_data"], session: session)
+        return self
+      else
+        raise
+      end
     ensure
-      Rails.logger.add(log_level, self.new_session_message)
+      begin
+        I18n.locale = self.locale
+      rescue I18n::InvalidLocale => ex
+        Rails.logger.debug("Invalid Locale: #{ex.message}")
+      end
+      Time.zone = self.timezone
+      self.update_column(:name, self.task_data.dig('name')) if self.task_data.dig('name') != self.name
     end
 
-    def refresh(session = {})
+    def refresh(session: {}, session_fallback: false)
       refresh_count ||= 0
       start = Time.now
       response = HTTParty.get(ZuoraConnect.configuration.url + "/api/#{self.api_version}/tools/tasks/#{self.id}.json",:body => {:access_token => self.access_token})
@@ -168,13 +185,11 @@ module ZuoraConnect
       end
 
       def self.get_metrics(type)
-        namespace = ENV['DEIS_APP'].present? ? "#{ENV['DEIS_APP']}" : "#{Rails.application.class.parent_name}"
-
         @data = {}
 
         if type == "versions"
           @data = {
-            app_name: namespace,
+            app_name: ZuoraConnect::Telegraf.app_name,
             url: "dummy",
             Version_Gem: ZuoraConnect::VERSION,
             Version_Zuora: ZuoraAPI::VERSION ,
@@ -186,7 +201,7 @@ module ZuoraConnect
           begin
             Resque.redis.ping
             @data = {
-              app_name: namespace,
+              app_name: ZuoraConnect::Telegraf.app_name,
               url: "dummy",
               Resque:{
                 Jobs_Finished: Resque.info[:processed] ,

data/app/models/zuora_connect/telegraf.rb

@@ -29,7 +29,7 @@ module ZuoraConnect
         # To avoid writing metrics from rspec tests
         if Rails.env.to_sym != :test
           app_instance = Thread.current[:appinstance].present? ? Thread.current[:appinstance].id : 0
-          tags = { app_name: app_name, process_type: process_type, app_instance: app_instance, pod_name: pod_name}.merge(tags)
+          tags = { app_name: self.class.app_name, process_type: self.class.process_type, app_instance: app_instance, pod_name: self.class.pod_name}.merge(tags)
 
           if direction == :inbound
             self.write_udp(series: INBOUND_METRICS_NAME, tags: tags, values: values) if INBOUND_METRICS
@@ -59,17 +59,29 @@ module ZuoraConnect
       Rails.logger.warn(self.format_metric_log('Telegraf', ex.message))
     end
 
-    def app_name
+    def format_metric_log(message, dump = nil)
+      message_color, dump_color = "1;91", "0;1"
+      log_entry = "  \e[#{message_color}m#{message}\e[0m   "
+      log_entry << "\e[#{dump_color}m%#{String === dump ? 's' : 'p'}\e[0m" % dump if dump
+      log_entry
+    end
+
+    def self.app_name
       return ENV['DEIS_APP'].present? ? ENV['DEIS_APP'] : Rails.application.class.parent_name
     end
 
-    def pod_name
-      return ENV['HOSTNAME'].present? ? ENV['HOSTNAME'] : 'Unknown'
+    def self.pod_name
+      return ENV['HOSTNAME'].present? ? ENV['HOSTNAME'] :  Socket.gethostname
+    end
+
+    def self.full_process_name(process_name: nil, function: nil)
+      keys = [self.pod_name, process_name.present? ? process_name : self.process_type, Process.pid, function]
+      return keys.compact.join('][').prepend('[').concat(']')
     end
 
     # Returns the process type if any
-    def process_type
-      p_type = 'Unknown'
+    def self.process_type(default: 'Unknown')
+      p_type = default
       if ENV['HOSTNAME'] && ENV['DEIS_APP']
         temp = ENV['HOSTNAME'].split(ENV['DEIS_APP'])[1]
         temp = temp.split(/(-[0-9a-zA-Z]{5})$/)[0] # remove the 5 char hash
@@ -77,12 +89,5 @@ module ZuoraConnect
       end
       return p_type
     end
-
-    def format_metric_log(message, dump = nil)
-      message_color, dump_color = "1;91", "0;1"
-      log_entry = "  \e[#{message_color}m#{message}\e[0m   "
-      log_entry << "\e[#{dump_color}m%#{String === dump ? 's' : 'p'}\e[0m" % dump if dump
-      log_entry
-    end
   end
 end

data/config/initializers/prometheus.rb

@@ -3,7 +3,6 @@ if defined? Prometheus
     require "zuora_connect/version"
     require "zuora_api/version"
 
-    app_name = ENV['DEIS_APP'].present? ? "#{ENV['DEIS_APP']}" : "#{Rails.application.class.parent_name}"
     # Create a default Prometheus registry for our metrics.
     prometheus = Prometheus::Client.registry
 
@@ -14,10 +13,10 @@ if defined? Prometheus
     RUBY_V = Prometheus::Client::Gauge.new(:ruby_version, 'The current Ruby version.')
 
     # Register your metrics with the registry we previously created.
-    prometheus.register(ZUORA_VERSION);ZUORA_VERSION.set({version:ZuoraAPI::VERSION,name:app_name},0)
-    prometheus.register(CONNECT_VERSION);CONNECT_VERSION.set({version:ZuoraConnect::VERSION,name:app_name},0)
-    prometheus.register(RAILS_VERSION);RAILS_VERSION.set({version:Rails.version,name:app_name},0)
-    prometheus.register(RUBY_V);RUBY_V.set({version:RUBY_VERSION,name:app_name},0)
+    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

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(: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 => 10, :reconnect_attempts => 2)
   if defined?(Resque.redis)
-    Resque.redis = resque_url != redis_url ? Redis.new(: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 => 10, :reconnect_attempts => 2) : Redis.current
   end
 end
 if defined?(RedisBrowser)

data/db/migrate/20181206162339_add_fields_to_instance.rb

@@ -0,0 +1,5 @@
+class AddFieldsToInstance < ActiveRecord::Migration
+  def change
+  	add_column :zuora_connect_app_instances, :name, :string, default: "" unless column_exists? :zuora_connect_app_instances, :name
+  end
+end

data/lib/middleware/metrics_middleware.rb

@@ -58,21 +58,19 @@ module Middleware
 
           #Do something before each scrape
           if defined? Resque.redis
-
-            app_name = ENV['DEIS_APP'].present? ? "#{ENV['DEIS_APP']}" : "#{Rails.application.class.parent_name}"
             begin
 
               Resque.redis.ping
 
-              Prometheus::REDIS_CONNECTION.set({connection:'redis',name:app_name},1)
-              Prometheus::FINISHED_JOBS.set({type:'resque',name:app_name},Resque.info[:processed])
-              Prometheus::PENDING_JOBS.set({type:'resque',name:app_name},Resque.info[:pending])
-              Prometheus::ACTIVE_WORKERS.set({type:'resque',name:app_name},Resque.info[:working])
-              Prometheus::WORKERS.set({type:'resque',name:app_name},Resque.info[:workers])
-              Prometheus::FAILED_JOBS.set({type:'resque',name:app_name},Resque.info[:failed])
+              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:app_name},0)
+                Prometheus::REDIS_CONNECTION.set({connection:'redis',name: ZuoraConnect::Telegraf.app_name},0)
             end
 
             if ZuoraConnect.configuration.custom_prometheus_update_block != nil

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.7.23"
+  VERSION = "1.7.24"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.7.23
+  version: 1.7.24
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-28 00:00:00.000000000 Z
+date: 2018-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -284,6 +284,7 @@ files:
 - db/migrate/20110503003603_add_catalog_mappings_to_app_instance.rb
 - db/migrate/20110503003604_catalog_default.rb
 - db/migrate/20180301052853_add_catalog_attempted_at.rb
+- db/migrate/20181206162339_add_fields_to_instance.rb
 - lib/metrics/influx/point_value.rb
 - lib/metrics/net.rb
 - lib/middleware/metrics_middleware.rb
@@ -366,43 +367,43 @@ specification_version: 4
 summary: Summary of Connect.
 test_files:
 - test/test_helper.rb
-- test/lib/generators/zuora_connect/datatable_generator_test.rb
-- test/zuora_connect_test.rb
 - test/models/zuora_connect/app_instance_test.rb
-- test/controllers/zuora_connect/api/v1/app_instance_controller_test.rb
+- test/zuora_connect_test.rb
 - test/integration/navigation_test.rb
+- test/lib/generators/zuora_connect/datatable_generator_test.rb
 - test/fixtures/zuora_connect/app_instances.yml
-- test/dummy/Rakefile
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/helpers/application_helper.rb
+- test/dummy/bin/setup
+- test/dummy/bin/rails
+- test/dummy/bin/rake
+- test/dummy/bin/bundle
+- test/dummy/public/500.html
+- test/dummy/public/422.html
+- test/dummy/public/404.html
+- test/dummy/public/favicon.ico
+- test/dummy/config/environment.rb
 - test/dummy/config/application.rb
-- test/dummy/config/boot.rb
+- test/dummy/config/routes.rb
 - test/dummy/config/environments/development.rb
 - test/dummy/config/environments/test.rb
 - test/dummy/config/environments/production.rb
 - test/dummy/config/database.yml
-- test/dummy/config/routes.rb
-- test/dummy/config/environment.rb
 - test/dummy/config/locales/en.yml
-- test/dummy/config/initializers/filter_parameter_logging.rb
+- test/dummy/config/boot.rb
+- test/dummy/config/secrets.yml
+- test/dummy/config/initializers/mime_types.rb
 - test/dummy/config/initializers/session_store.rb
+- test/dummy/config/initializers/cookies_serializer.rb
 - test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/mime_types.rb
 - test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/initializers/cookies_serializer.rb
 - test/dummy/config/initializers/assets.rb
 - test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/secrets.yml
-- test/dummy/config.ru
-- test/dummy/bin/setup
-- test/dummy/bin/bundle
-- test/dummy/bin/rails
-- test/dummy/bin/rake
-- test/dummy/public/500.html
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/favicon.ico
+- test/dummy/config/initializers/filter_parameter_logging.rb
 - test/dummy/README.rdoc
+- test/dummy/config.ru
+- test/dummy/Rakefile
+- test/dummy/app/views/layouts/application.html.erb
+- test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/assets/javascripts/application.js
+- test/dummy/app/controllers/application_controller.rb
+- test/controllers/zuora_connect/api/v1/app_instance_controller_test.rb