zuora_connect 1.5.317 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a4d713eaabaed74c83de4682191b8fbc2cdc132
-  data.tar.gz: 943062d9fb7e9a2040e1e4c0b34a8d7f3883b07d
+  metadata.gz: 0f4381548b341f67bad84f5e83b16c3185113260
+  data.tar.gz: 1f8fed40fdbc6291cc89fe1bbec7f55270d4fc78
 SHA512:
-  metadata.gz: b64588369fe4c866cc8721923249a0876bee0f235ef002a7022a117d5e68c732dbb5b4e298af7a98279332c71c6853253e45b1fb69313beeb6de257c0b22190d
-  data.tar.gz: 8584068ff654fa0e5807c7be6a2f5874f9445192197f05b6d5df9d83f89d11af20ace96af1f0514917aae9d5a62242033b0eed44be98ef1bbbb295ccb17dd424
+  metadata.gz: 0e2b91b6d3f1058f99904657bf3ba433463c03aaf02a8f4064bdfd5c719c49dee2e37c74bf2c6bea000048b8f2b0a4483bf9e78fddd127523c31457d7bd90ca3
+  data.tar.gz: 36dc42c3924cb40a6c1d958d821665f1b76c2eab4ba4836150b18481008085c0e68b4dee5b94d2164b0a4fc223931f58f2e86e672f5f040d394aa941965e03fe

data/app/controllers/zuora_connect/static_controller.rb

@@ -1,7 +1,8 @@
 module ZuoraConnect
   class StaticController < ApplicationController
-    before_filter :authenticate_connect_app_request, :except => [:health, :session_error, :invalid_app_instance_error]
-    after_filter :persist_connect_app_session,  :except => [:health, :session_error, :invalid_app_instance_error]
+    before_filter :authenticate_connect_app_request, :except => [:metrics, :health, :session_error, :invalid_app_instance_error]
+    after_filter :persist_connect_app_session,  :except => [:metrics, :health, :session_error, :invalid_app_instance_error]
+
     def session_error
       respond_to do |format|
         format.html
@@ -16,6 +17,11 @@ module ZuoraConnect
       end
     end
 
+    def metrics
+      type = params[:type].present? ? params[:type] : "versions"
+      render json: ZuoraConnect::AppInstanceBase.get_metrics(type), status: 200
+    end
+
     def health
       render json: {
         message: "Alive",

data/app/models/zuora_connect/app_instance_base.rb

@@ -1,10 +1,11 @@
 module ZuoraConnect
+  require "uri"
   class AppInstanceBase < ActiveRecord::Base
     default_scope {select(ZuoraConnect::AppInstance.column_names.delete_if {|x| ["catalog_mapping", "catalog"].include?(x) }) }
     after_initialize :init
     self.table_name = "zuora_connect_app_instances"
     attr_accessor :options, :mode, :logins, :task_data, :last_refresh, :username, :password, :s3_client, :api_version
-    
+
     REFRESH_TIMEOUT = 2.minute                #Used to determine how long to wait on current refresh call before executing another
     INSTANCE_REFRESH_WINDOW = 30.minutes      #Used to set how how long till app starts attempting to refresh cached task connect data
     INSTANCE_REDIS_CACHE_PERIOD = 60.minutes  #Used to determine how long to cached task data will live for
@@ -24,8 +25,111 @@ module ZuoraConnect
       self.apartment_switch(nil, true)
     end
 
+
+    # Methods for writing Telegraf metrics
+
+    # Returns the process type if any
+    def self.get_process_type
+      p_type = nil
+      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
+        p_type = temp[1, temp.rindex("-")-1]
+      end
+      return p_type
+    end
+
+    # Write to telegraf
+    def self.write_to_telegraf(endpoint_name: nil, method_name: nil, status_code: nil, response_time: nil, db_runtime: nil, view_runtime: nil, content_type: nil, direction: nil, error_type: nil, app_instance: nil, function_name: nil)
+
+      # To avoid writing metrics from rspec tests
+      if ENV['DEIS_APP']
+        # Getting the process type
+        p_type = ZuoraConnect::AppInstanceBase.get_process_type
+
+        if direction == "inbound" && ZuoraConnect::Configuration.new.enable_inbound_metrics_flag
+          Thread.current[:appinstance].present? ? app_instance = Thread.current[:appinstance].id : app_instance = 0
+
+          # Separately handling 200 and non 200 as influx does not accept nil as a value
+          if db_runtime && view_runtime
+            # 200 requests
+            begin
+              ZuoraConnect.configuration.telegraf_client.write(ZuoraConnect.configuration.influxdb_series_name_inbound,
+                  tags: {"app_name": "#{ZuoraConnect.configuration.app_name}", "controller_action": endpoint_name, "content-type": content_type, method: method_name, status: status_code, process_type: p_type, "app_instance": app_instance},
+                  values: {response_time: response_time, db_time: db_runtime, view_time: view_runtime})
+            rescue => e
+              raise e
+            end
+          else
+            # non 200 requests
+            begin
+              ZuoraConnect.configuration.telegraf_client.write(ZuoraConnect.configuration.influxdb_series_name_inbound,
+                  tags: {"app_name": "#{ZuoraConnect.configuration.app_name}", "controller_action": endpoint_name, "content-type": content_type, method: method_name, status: status_code, process_type: p_type, "app_instance": app_instance},
+                  values: {response_time: response_time})
+            rescue=> e
+              raise e
+            end
+          end
+
+        elsif direction == "outbound" && ZuoraConnect::Configuration.new.enable_outbound_metrics_flag
+          # if there is an error
+          if error_type
+            begin
+              ZuoraConnect.configuration.telegraf_client.write(ZuoraConnect.configuration.influxdb_series_name_outbound,
+                  tags: {"app_name": "#{ZuoraConnect.configuration.app_name}", endpoint: endpoint_name, status: status_code, process_type: p_type, "app_instance": app_instance, "function_name": function_name, method: method_name, "error_type": error_type},
+                  values: {response_time: response_time})
+            rescue => e
+              raise e
+            end
+          else
+            begin
+              ZuoraConnect.configuration.telegraf_client.write(ZuoraConnect.configuration.influxdb_series_name_outbound,
+                  tags: {"app_name": "#{ZuoraConnect.configuration.app_name}", endpoint: endpoint_name, status: status_code, process_type: p_type, "app_instance": app_instance, "function_name": function_name, method: method_name},
+                  values: {response_time: response_time})
+            rescue => e
+              raise e
+            end
+          end
+        end
+      end
+    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,
+          Version_Gem: ZuoraConnect::VERSION,
+          Version_Zuora: ZuoraAPI::VERSION ,
+          Version_Ruby: RUBY_VERSION,
+          Version_Rails: Rails.version,
+          hold: 1
+        }
+      elsif type == "stats"
+        begin
+          Resque.redis.ping
+          data = {
+            app_name: namespace,
+            Resque:{
+              Jobs_Finished: Resque.info[:processed] ,
+              Jobs_Failed: Resque.info[:failed],
+              Jobs_Pending: Resque.info[:pending],
+              Workers_Active: Resque.info[:working],
+              Workers_Total: Resque.info[:workers]
+            }
+          }
+        rescue
+        end
+      end
+      return data.to_json
+    end
+
+
     def apartment_switch(method = nil, migrate = false)
-      begin 
+      begin
         Apartment::Tenant.switch!(self.id) if self.persisted?
       rescue Apartment::TenantNotFound => ex
         Apartment::Tenant.create(self.id.to_s)
@@ -70,7 +174,7 @@ module ZuoraConnect
           raise ZuoraConnect::Exceptions::HoldingPattern if holding_pattern && !self.mark_for_refresh
           self.refresh(session)
 
-        elsif (self.id != session["appInstance"].to_i) 
+        elsif (self.id != session["appInstance"].to_i)
           Rails.logger.info("[#{self.id}] REFRESHING - AppInstance ID(#{self.id}) does not match session id(#{session["appInstance"].to_i})")
           raise ZuoraConnect::Exceptions::HoldingPattern if holding_pattern && !self.mark_for_refresh
           self.refresh(session)
@@ -81,11 +185,11 @@ module ZuoraConnect
           self.refresh(session)
 
         elsif session["#{self.id}::last_refresh"].blank?
-          Rails.logger.info("[#{self.id}] REFRESHING - No Time on Cookie") 
+          Rails.logger.info("[#{self.id}] REFRESHING - No Time on Cookie")
           raise ZuoraConnect::Exceptions::HoldingPattern if holding_pattern && !self.mark_for_refresh
           self.refresh(session)
 
-        # If the cache is expired and we can aquire a refresh lock  
+        # 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
           Rails.logger.info("[#{self.id}] REFRESHING - Session Old by #{time_expire.abs} second")
           self.refresh(session)
@@ -101,7 +205,7 @@ module ZuoraConnect
       begin
         I18n.locale = self.locale
       rescue I18n::InvalidLocale => ex
-        Rails.logger.error("Invalid Locale: #{ex.message}")
+        Rails.logger.debug("Invalid Locale: #{ex.message}")
       end
       Time.zone = self.timezone
       return self
@@ -117,12 +221,12 @@ module ZuoraConnect
 
     def refresh(session = nil)
       refresh_count ||= 0
-
+      error_type = ""
       start = Time.now
       response = HTTParty.get(ZuoraConnect.configuration.url + "/api/#{self.api_version}/tools/tasks/#{self.id}.json",:body => {:access_token => self.access_token})
       response_time = Time.now - start
 
-      Rails.logger.info("[#{self.id}] REFRESH TASK - Connect Task Info Request Time #{response_time.round(2).to_s}")
+      Rails.logger.debug("[#{self.id}] REFRESH TASK - Connect Task Info Request Time #{response_time.round(2).to_s}")
       if response.code == 200
         build_task(JSON.parse(response.body), session)
         @last_refresh = Time.now.to_i
@@ -137,6 +241,7 @@ module ZuoraConnect
         Rails.logger.info("[#{self.id}] REFRESH TASK - #{ex.class} Retrying(#{refresh_count})")
         retry
       else
+        error_type = "#{ex.class}"
         Rails.logger.fatal("[#{self.id}] REFRESH TASK - #{ex.class} Failed #{refresh_count}x")
         raise
       end
@@ -148,60 +253,96 @@ module ZuoraConnect
         end
         retry
       else
+        error_type = "#{ex.class}"
         Rails.logger.fatal("[#{self.id}] REFRESH TASK - Failed #{refresh_count}x")
         raise
       end
+    ensure
+      # Writing to telegraf
+      status_code = response.code if response
+      endpoint_name = URI(ZuoraConnect.configuration.url).host
+      Thread.current[:appinstance].present? ? app_instance = Thread.current[:appinstance].id : app_instance = 0
+      ZuoraConnect::AppInstanceBase.write_to_telegraf("response_time": response_time, "status_code": status_code, "endpoint_name": endpoint_name, "direction": "outbound", "error_type": error_type, "function_name": "#{self.class}##{__method__}", "method_name": "GET", "app_instance": app_instance)
     end
 
     #### START Task Mathods ####
       def build_task(task_data, session)
-        @task_data = task_data
-        @mode = @task_data["mode"]
-        @task_data.each do |k,v|
-          if k.match(/^(.*)_login$/)
-            tmp = ZuoraConnect::Login.new(v)
-            if !session.nil? && v["tenant_type"] == "Zuora"
-              if tmp.entities.size > 0
-                tmp.entities.each do |value|
-                  entity_id = value["id"]
-                  tmp.client(entity_id).current_session = session["#{self.id}::#{k}::#{entity_id}:session"] if !session.nil? && v["tenant_type"] == "Zuora" && session["#{self.id}::#{k}::#{entity_id}:session"]
+        begin
+          @task_data = task_data
+          @mode = @task_data["mode"]
+          @task_data.each do |k,v|
+            if k.match(/^(.*)_login$/)
+              tmp = ZuoraConnect::Login.new(v)
+              if !session.nil? && v["tenant_type"] == "Zuora"
+                if tmp.entities.size > 0
+                  tmp.entities.each do |value|
+                    entity_id = value["id"]
+                    tmp.client(entity_id).current_session = session["#{self.id}::#{k}::#{entity_id}:session"] if !session.nil? && v["tenant_type"] == "Zuora" && session["#{self.id}::#{k}::#{entity_id}:session"]
+                  end
+                else
+                  tmp.client.current_session = session["#{self.id}::#{k}:session"] if !session.nil? && v["tenant_type"] == "Zuora" && session["#{self.id}::#{k}:session"]
                 end
-              else
-                tmp.client.current_session = session["#{self.id}::#{k}:session"] if !session.nil? && v["tenant_type"] == "Zuora" && session["#{self.id}::#{k}:session"]
               end
+              @logins[k] = tmp
+              self.attr_builder(k, @logins[k])
+            elsif k == "options"
+              v.each do |opt|
+                @options[opt["config_name"]] = opt
+              end
+            elsif k == "user_settings"
+              self.timezone =  v["timezone"]
+              self.locale = v["local"]
             end
-            @logins[k] = tmp
-            self.attr_builder(k, @logins[k])
-          elsif k == "options"
-            v.each do |opt|
-              @options[opt["config_name"]] = opt
-            end
-          elsif k == "user_settings"
-            self.timezone =  v["timezone"]
-            self.locale = v["local"]
           end
+        rescue => ex
+          Rails.logger.error("Task Data: #{task_data}")
+          Rails.logger.error("Task Session: #{session.to_hash}")
+          raise
         end
       end
 
       def updateOption(optionId, value)
-        return HTTParty.get(ZuoraConnect.configuration.url + "/api/#{self.api_version}/tools/application_options/#{optionId}/edit?value=#{value}",:body => {:access_token => self.username})
+        begin
+          start_time = Time.now
+          response = HTTParty.get(ZuoraConnect.configuration.url + "/api/#{self.api_version}/tools/application_options/#{optionId}/edit?value=#{value}",:body => {:access_token => self.username})
+        rescue => e
+          error_type = "#{e.class}"
+        ensure
+          end_time = Time.now
+          response_time = end_time - start_time
+          status_code = response.code if response
+          endpoint_name = URI(ZuoraConnect.configuration.url).host
+          Thread.current[:appinstance].present? ? app_instance = Thread.current[:appinstance].id : app_instance = 0
+          ZuoraConnect::AppInstanceBase.write_to_telegraf("response_time": response_time, "status_code": status_code, "endpoint_name": endpoint_name, "direction": "outbound", "error_type": error_type, "function_name": "#{self.class}##{__method__}", "method_name": "GET", "app_instance": app_instance)
+          return response
+        end
       end
 
       #This can update an existing login, add a new login, change to another existing login
       #EXAMPLE: {"name": "ftp_login_14","username": "ftplogin7","tenant_type": "Custom","password": "test2","url": "www.ftp.com","custom_data": {  "path": "/var/usr/test"}}
       def update_logins(options)
         update_login_count ||= 0
-
+        start_time = Time.now
+        error_type = ""
         response = HTTParty.post(ZuoraConnect.configuration.url + "/api/#{self.api_version}/tools/tasks/#{self.id}/logins",:body => {:access_token => self.username}.merge(options))
+        parsed_json =  JSON.parse(response.body)
         if response.code == 200
-          return JSON.parse(response.body)
+          if defined?(Redis.current)
+            self.build_task(parsed_json, self.data_lookup)
+            self.last_refresh = Time.now.to_i
+            self.cache_app_instance
+          end
+          return parsed_json
+        elsif response.code == 400
+          raise ZuoraConnect::Exceptions::APIError.new(message: parsed_json['errors'].join(' '), response: response.body, code: response.code)
         else
           raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Communicating with Connect", response.body, response.code)
         end
-      rescue Net::ReadTimeout, Net::OpenTimeout, Errno::EPIPE, Errno::ECONNRESET, Errno::ECONNREFUSED, SocketError
+      rescue Net::ReadTimeout, Net::OpenTimeout, Errno::EPIPE, Errno::ECONNRESET, Errno::ECONNREFUSED, SocketError => ex
         if (update_login_count += 1) < 3
           retry
         else
+          error_type = "#{ex.class}"
           raise
         end
       rescue ZuoraConnect::Exceptions::ConnectCommunicationError => ex
@@ -211,8 +352,16 @@ module ZuoraConnect
           end
           retry
         else
+          error_type = "#{ex.class}"
           raise
         end
+      ensure
+        end_time = Time.now
+        response_time = end_time - start_time
+        status_code = response.code if response
+        endpoint_name = URI(ZuoraConnect.configuration.url).host
+        Thread.current[:appinstance].present? ? app_instance = Thread.current[:appinstance].id : app_instance = 0
+        ZuoraConnect::AppInstanceBase.write_to_telegraf("response_time": response_time, "status_code": status_code, "endpoint_name": endpoint_name, "direction": "outbound", "error_type": error_type, "function_name": "#{self.class}##{__method__}", "method_name": "POST", "app_instance": app_instance)
       end
     #### END Task Mathods ####
 
@@ -226,12 +375,12 @@ module ZuoraConnect
       end
 
       def oauth_expired?
-        (self.oauth_expires_at < Time.now)
+        return self.oauth_expires_at.present? ? (self.oauth_expires_at < Time.now) : true
       end
 
       def refresh_oauth
         refresh_oauth_count ||= 0
-
+        error_type = ""
         start = Time.now
         params = {
                   :grant_type => "refresh_token",
@@ -258,13 +407,14 @@ module ZuoraConnect
           Rails.logger.info("[#{self.id}] REFRESH OAUTH - #{ex.class} Retrying(#{refresh_oauth_count})")
           retry
         else
+          error_type = "#{ex.class}"
           Rails.logger.fatal("[#{self.id}] REFRESH OAUTH - #{ex.class} Failed #{refresh_oauth_count}x")
           raise
         end
       rescue ZuoraConnect::Exceptions::ConnectCommunicationError => ex
         sleep(5)
         self.reload_attributes([:refresh_token, :oauth_expires_at, :access_token]) #Reload only the refresh token for retry
-          
+
         #After reload, if nolonger expired return
         return if !self.oauth_expired?
 
@@ -272,9 +422,15 @@ module ZuoraConnect
           Rails.logger.info("[#{self.id}] REFRESH OAUTH - Failed Retrying(#{refresh_oauth_count})")
           retry
         else
+          error_type = "#{ex.class}"
           Rails.logger.fatal("[#{self.id}] REFRESH OAUTH - Failed #{refresh_oauth_count}x")
           raise
         end
+      ensure
+        status_code = response.code if response
+        endpoint_name = URI(ZuoraConnect.configuration.url).host
+        Thread.current[:appinstance].present? ? app_instance = Thread.current[:appinstance].id : app_instance = 0
+        ZuoraConnect::AppInstanceBase.write_to_telegraf("response_time": response_time, "status_code": status_code, "endpoint_name": endpoint_name, "direction": "outbound", "error_type": error_type, "function_name": "#{self.class}##{__method__}", "method_name": "POST", "app_instance": app_instance)
       end
     #### END Connect OAUTH methods ####
 
@@ -297,7 +453,7 @@ module ZuoraConnect
 
       def mark_for_refresh
         return defined?(Redis.current) ? Redis.current.set("AppInstance:#{self.id}:Refreshing", true, {:nx => true, :ex => REFRESH_TIMEOUT.to_i}) : true
-      end 
+      end
 
       def data_lookup(session: {})
         if defined?(PaperTrail)
@@ -340,7 +496,17 @@ module ZuoraConnect
             end
           end
         end
+
         session["#{self.id}::task_data"] = self.task_data
+
+        #Redis is not defined strip out old data
+        if !defined?(Redis.current)
+          session["#{self.id}::task_data"].delete('applications')
+          session["#{self.id}::task_data"].select {|k,v| k.include?('login') && v['tenant_type'] == 'Zuora'}.each do |login_key, login_data|
+            session["#{self.id}::task_data"][login_key]['entities'] = (login_data.dig('entities') || []).map {|entity| entity.slice('id', 'tenantId')}
+          end
+        end
+
         session["#{self.id}::last_refresh"] = self.last_refresh
         session["appInstance"] = self.id
         return session
@@ -420,8 +586,8 @@ module ZuoraConnect
         self.update_column(:catalog_update_attempt_at, Time.now.utc)
 
         entity_reference = entity_id.blank? ? 'Default' : entity_id
-        Rails.logger.info("Fetch Catalog")
-        Rails.logger.info("Zuora Entity: #{entity_id.blank? ? 'default' : entity_id}")
+        Rails.logger.debug("Fetch Catalog")
+        Rails.logger.debug("Zuora Entity: #{entity_id.blank? ? 'default' : entity_id}")
 
         login = zuora_login.client(entity_reference)
 
@@ -654,7 +820,7 @@ module ZuoraConnect
     ### END S3 Helping Methods #####
 
     ### START Aggregate Grouping Helping Methods ####
-      def self.refresh_aggregate_table(aggregate_name: 'all_tasks_processing', table_name: 'tasks', where_clause: "where status in ('Processing', 'Queued')", index_table: true) 
+      def self.refresh_aggregate_table(aggregate_name: 'all_tasks_processing', table_name: 'tasks', where_clause: "where status in ('Processing', 'Queued')", index_table: true)
         self.update_functions
         #Broke function into two parts to ensure transaction size was small enough
         ActiveRecord::Base.connection.execute('SELECT "shared_extensions".refresh_aggregate_table(\'%s\', \'%s\', %s, \'Table\');' % [aggregate_name, table_name, ActiveRecord::Base.connection.quote(where_clause)])
@@ -666,13 +832,13 @@ module ZuoraConnect
       end
     ### END Aggregate Grouping Helping Methods #####
 
-    # Overide this method to avoid the new session call for api requests that use the before filter authenticate_app_api_request. 
+    # Overide this method to avoid the new session call for api requests that use the before filter authenticate_app_api_request.
     # This can be usefull for apps that dont need connect metadata call, or credentials, to operate for api requests
     def new_session_for_api_requests(params: {})
       return true
     end
 
-    # Overide this method to avoid the new session call for ui requests that use the before filter authenticate_connect_app_request. 
+    # Overide this method to avoid the new session call for ui requests that use the before filter authenticate_connect_app_request.
     # This can be usefull for apps that dont need connect metadata call, or credentials, to operate for ui requests
     def new_session_for_ui_requests(params: {})
       return true

data/config/initializers/prometheus.rb

@@ -0,0 +1,41 @@
+if defined? Prometheus
+  module 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
+
+    # Create your metrics.
+    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.')
+
+    # 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)
+
+    # Do they have resque jobs?
+    if defined? Resque.redis
+      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)
+
+    end
+
+  end
+end

data/config/routes.rb

@@ -1,5 +1,6 @@
 ZuoraConnect::Engine.routes.draw do
   get '/health' => 'static#health'
+  get '/internal/data' => 'static#metrics'
   get '/invalid_session' => 'static#session_error', :as => :invalid_session
   get '/invalid_instance' => "static#invalid_app_instance_error", :as => :invalid_instance
   namespace :api do

data/lib/middleware/metrics_middleware.rb

@@ -0,0 +1,111 @@
+module Middleware
+  require 'uri'
+
+  # Object of this class is passed to the ActiveSupport::Notification hook
+  class PageRequest
+
+    # This method is triggered when a non error page is loaded (not 404)
+    def call(name, started, finished, unique_id, payload)
+
+      # If the url contains any css or JavaScript files then do not collect metrics for them
+      block_words = ["css", "assets", "jpg", "png", "jpeg", "ico"]
+      if block_words.any? { |word| payload[:path].include?(word) }
+        return nil
+      end
+
+      # Getting the endpoint and the content_type
+      content_hash = {:html => "text/html", :js => "application/javascript", :json => "application/json"}
+      content_hash.key?(payload[:format]) ? content_type = content_hash[payload[:format]] : content_type = payload[:format]
+      request_path = "#{payload[:controller]}##{payload[:action]}"
+      response_time = finished-started
+
+      # payloads with 500 requests do not have status as it is not set by the controller
+      # https://github.com/rails/rails/issues/33335
+      status_code = payload[:status] ? payload[:status] : payload[:exception_object].present? ? 500 : ""
+
+      # Write to telegraf
+      ZuoraConnect::AppInstanceBase.write_to_telegraf("endpoint_name": request_path, "method_name": payload[:method], "status_code": status_code, "response_time": response_time, "db_runtime": payload[:db_runtime].to_f, "view_runtime": payload[:view_runtime], "content_type": content_type, "direction": "inbound")
+
+    end
+  end
+
+
+  class MetricsMiddleware
+
+    require "zuora_connect/version"
+    require "zuora_api/version"
+    require "telegraf"
+
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      start_time = Time.now
+      @status, @headers, @response = @app.call(env)
+      end_time = Time.now
+
+      # If the url contains any CSS or JavaScript files then do not collect metrics for them
+      block_words = ["css", "assets", "jpg", "png", "jpeg", "ico"]
+      if block_words.any? { |word| env['PATH_INFO'].include?(word) }
+        return [@status, @headers, @response]
+      end
+
+
+      response_time = end_time - start_time
+
+      if defined? Prometheus
+        #Prometheus Stuff
+        if env['PATH_INFO'] == '/connect/internal/metrics'
+
+          #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])
+
+            rescue Redis::CannotConnectError
+                Prometheus::REDIS_CONNECTION.set({connection:'redis',name:app_name},0)
+            end
+
+            if ZuoraConnect.configuration.custom_prometheus_update_block != nil
+              ZuoraConnect.configuration.custom_prometheus_update_block.call()
+            end
+          end
+
+        end
+      end
+      # Writing to telegraf: Handle 404 and 500 requests
+      if @status == 404 || @status == 304
+        # Getting the endpoint and content_type
+        request_path = @status == 404 ? "ActionController#RoutingError" : env["action_controller.instance"].present? ? "#{env["action_controller.instance"].class}##{env["action_controller.instance"].action_name}" : ""
+
+        # Uncomment following block of code for handling engine requests/requests without controller
+        # else
+        #   # Handling requests which do not have controllers (engines)
+        #   if env["SCRIPT_NAME"].present?
+        #     controller_path = "#{env['SCRIPT_NAME'][1..-1]}"
+        #     controller_path = controller_path.sub("/", "::")
+        #     request_path = "#{controller_path}#UnknownAction"
+        #   end
+
+        content_type = @headers['Content-Type'].split(';')[0] if @headers['Content-Type']
+        ZuoraConnect::AppInstanceBase.write_to_telegraf("endpoint_name": request_path, "method_name": env['REQUEST_METHOD'], "status_code": @status, "response_time": response_time,  "content_type": content_type, "direction": "inbound") if request_path.present?
+      end
+
+      [@status, @headers, @response]
+
+    end
+
+  end
+
+end

data/lib/resque/dynamic_queues.rb

@@ -38,18 +38,29 @@ module Resque
     end
 
     def reserve_with_round_robin
-      qs = rotated_queues
-      qs.each do |queue|
-        log! "Checking #{queue}"
-        if should_work_on_queue?(queue) && @job_in_progress = Resque::Job.reserve(queue)
-          log! "Found job on #{queue}"
-          return @job_in_progress
-        end
-        # Start the next search at the queue after the one from which we pick a job.
+      grouped_queues = queues.sort.group_by{|u| /(\d{1,20})_.*/.match(u) ? /(\d{1,20})_.*/.match(u).captures.first : nil}
+
+      #Instance queue grouping
+      if !grouped_queues.keys.include?(nil) && grouped_queues.keys.size > 0
+        @n ||= 0
         @n += 1
+        @n = @n % grouped_queues.keys.size
+
+        grouped_queues.keys.rotate(@n).each do |key|
+          grouped_queues[key].each do |queue|
+            log! "Checking #{queue}"
+            if should_work_on_queue?(queue) && @job_in_progress = Resque::Job.reserve(queue)
+              log! "Found job on #{queue}"
+              return @job_in_progress
+            end
+          end
+          @n += 1 # Start the next search at the queue after the one from which we pick a job.
+        end
+        nil
+      else 
+        return reserve_without_round_robin
       end
-
-      nil
+      
     rescue Exception => e
       log "Error reserving job: #{e.inspect}"
       log e.backtrace.join("\n")
@@ -79,7 +90,7 @@ module Resque
 
       #Remove Queues under Api Limits
       api_limit_instances = Redis.current.keys('APILimits:*').map {|key| key.split('APILimits:').last.to_i}
-      real_queues = real_queues.select {|key| key if !api_limit_instances.include?((key.match(/^(\d*)_.*/) || [])[1].to_i)}
+      real_queues = real_queues.select {|key| key if !api_limit_instances.include?((key.match(/^(\d*)_.*/) || [])[1].to_i)} ## 2
       
       #Queue Pausing 
       paused_instances = Redis.current.keys('resque:PauseQueue:*').map {|key| key.split('resque:PauseQueue:').last.to_i}

data/lib/zuora_connect.rb

@@ -4,10 +4,11 @@ require 'zuora_connect/exceptions'
 require 'zuora_connect/controllers/helpers'
 require 'zuora_connect/views/helpers'
 require 'zuora_connect/railtie'
-require 'resque/additions' 
+require 'resque/additions'
 require 'resque/dynamic_queues'
 require 'resque/self_lookup'
 
+
 module ZuoraConnect
   class << self
     attr_accessor :configuration

data/lib/zuora_connect/configuration.rb

@@ -1,6 +1,6 @@
 module ZuoraConnect
   class Configuration
-    attr_accessor :oauth_client_id, :oauth_client_secret, :oauth_client_redirect_uri,:use_s3, :default_locale,:dev_mode_appinstance ,:dev_mode_admin, :dev_mode_user, :dev_mode_pass, :default_time_zone,:delayed_job,:url, :private_key, :dev_mode_logins,:dev_mode_mode, :dev_mode_options, :mode, :timeout,:dev_mode_secret_access_key,:dev_mode_access_key_id,:aws_region, :s3_bucket_name, :s3_folder_name, :additional_apartment_models
+    attr_accessor :oauth_client_id, :oauth_client_secret, :oauth_client_redirect_uri,:use_s3, :default_locale,:dev_mode_appinstance ,:dev_mode_admin, :dev_mode_user, :dev_mode_pass, :default_time_zone,:delayed_job,:url, :private_key, :dev_mode_logins,:dev_mode_mode, :dev_mode_options, :mode, :timeout,:dev_mode_secret_access_key,:dev_mode_access_key_id,:aws_region, :s3_bucket_name, :s3_folder_name, :additional_apartment_models, :telegraf_endpoint, :enable_inbound_metrics_flag, :enable_outbound_metrics_flag, :telegraf_client, :custom_prometheus_update_block, :app_name, :influxdb_series_name_inbound, :influxdb_series_name_outbound
 
     def initialize
       @default_locale = :en
@@ -11,6 +11,15 @@ module ZuoraConnect
       @use_s3 = false
       @private_key = ENV["CONNECT_KEY"]
       @additional_apartment_models = []
+      @telegraf_endpoint = 'udp://telegraf-app-metrics.monitoring.svc.cluster.local:8094'
+      @enable_inbound_metrics_flag =  false
+      @enable_outbound_metrics_flag =  false
+      @telegraf_client = Telegraf::Agent.new @telegraf_endpoint
+
+      # Setting the app name for telegraf write
+      @app_name = ENV['DEIS_APP'].present? ? "#{ENV['DEIS_APP']}" : "#{Rails.application.class.parent_name}"
+      @influxdb_series_name_inbound = "request-inbound"
+      @influxdb_series_name_outbound = "request-outbound"
 
       # OAuth Settings
       @oauth_client_id = ""

data/lib/zuora_connect/controllers/helpers.rb

@@ -6,6 +6,7 @@ module ZuoraConnect
 
       def authenticate_app_api_request
         #Skip session for api requests
+        Thread.current[:appinstance] = nil
         request.session_options[:skip] = true
         start_time = Time.now
         if request.headers["API-Token"].present?
@@ -24,8 +25,8 @@ module ZuoraConnect
       end
 
       def authenticate_connect_app_request
+        Thread.current[:appinstance] = nil
         start_time = Time.now
-
         if ZuoraConnect.configuration.mode == "Production"
           if request["data"]
             setup_instance_via_data

data/lib/zuora_connect/exceptions.rb

@@ -34,6 +34,23 @@ module ZuoraConnect
       end
     end
 
+    class APIError < Error
+      attr_reader :code, :response
+      attr_writer :default_message
+
+      def initialize(message: nil,response: nil, code: nil)
+        @code = code
+        @message = message
+        @response = response
+        @default_message = "Connect update error."
+      end
+
+      def to_s
+        @message || @default_message
+      end
+
+    end
+
     class AccessDenied < Error
       attr_writer :default_message
 

data/lib/zuora_connect/railtie.rb

@@ -1,5 +1,9 @@
+require 'middleware/metrics_middleware'
+
 module ZuoraConnect
   class Railtie < Rails::Railtie
+
+
     config.before_initialize do
       version = Rails.version
       if version >= "5.0.0"
@@ -12,6 +16,24 @@ module ZuoraConnect
       ::Rails.configuration.action_dispatch.x_sendfile_header = nil
     end
 
+    # Base object not being loaded at this point for some reason
+    if ZuoraConnect::Configuration.new.enable_inbound_metrics_flag == true
+
+      if defined? Prometheus
+        initializer "prometheus.configure_rails_initialization" do |app|
+          app.middleware.use Prometheus::Middleware::Exporter,(options ={:path => '/connect/internal/metrics'})
+        end
+      end
+      initializer "zuora_connect.configure_rails_initialization" do |app|
+        app.middleware.insert_after Rack::Sendfile, Middleware::MetricsMiddleware
+      end
+
+      # hook to process_action
+      ActiveSupport::Notifications.subscribe('process_action.action_controller', Middleware::PageRequest.new)
+
+    end
+
+
     initializer(:rails_stdout_logging, before: :initialize_logger) do
       if Rails.env != 'development' && !ENV['DEIS_APP'].blank?
         require 'lograge'
@@ -23,7 +45,7 @@ module ZuoraConnect
         Rails.configuration.lograge.custom_options = lambda do |event|
           exceptions = %w(controller action format id)
           {
-            appinstance_id: Thread.current[:appinstance].present? ? Thread.current[:appinstance].id : "Unknown",
+            appinstance_id: Thread.current[:appinstance].present? ? Thread.current[:appinstance].id : 0,
             params: event.payload[:params].except(*exceptions),
             exception: event.payload[:exception],
             exception_object: event.payload[:exception_object]

data/lib/zuora_connect/version.rb

@@ -1,4 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.5.317"
+    VERSION = "1.6.0"
 end
- 

metadata

@@ -1,20 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.5.317
+  version: 1.6.0
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-25 00:00:00.000000000 Z
+date: 2018-08-14 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
   type: :runtime
@@ -22,6 +25,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
@@ -29,6 +35,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
   type: :runtime
@@ -36,6 +45,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
 - !ruby/object:Gem::Dependency
@@ -94,6 +106,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: telegraf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -226,6 +252,7 @@ files:
 - app/views/zuora_connect/static/session_error.html.erb
 - config/initializers/apartment.rb
 - config/initializers/object_method_hooks.rb
+- config/initializers/prometheus.rb
 - config/initializers/redis.rb
 - config/initializers/resque.rb
 - config/initializers/to_bool.rb
@@ -240,6 +267,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
+- lib/middleware/metrics_middleware.rb
 - lib/resque/additions.rb
 - lib/resque/dynamic_queues.rb
 - lib/resque/self_lookup.rb
@@ -317,44 +345,44 @@ signing_key:
 specification_version: 4
 summary: Summary of Connect.
 test_files:
-- test/models/zuora_connect/app_instance_test.rb
-- test/test_helper.rb
 - test/controllers/zuora_connect/api/v1/app_instance_controller_test.rb
+- test/dummy/bin/rake
+- test/dummy/bin/bundle
+- test/dummy/bin/setup
+- test/dummy/bin/rails
+- test/dummy/Rakefile
+- test/dummy/public/favicon.ico
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/dummy/Rakefile
-- test/dummy/README.rdoc
 - test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/assets/javascripts/application.js
+- test/dummy/app/assets/stylesheets/application.css
+- test/dummy/README.rdoc
+- test/dummy/config.ru
+- test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
+- test/dummy/config/environment.rb
+- test/dummy/config/database.yml
+- test/dummy/config/secrets.yml
 - test/dummy/config/boot.rb
-- test/dummy/config/initializers/assets.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/initializers/session_store.rb
+- test/dummy/config/environments/production.rb
+- test/dummy/config/environments/development.rb
+- test/dummy/config/environments/test.rb
+- test/dummy/config/initializers/backtrace_silencers.rb
 - test/dummy/config/initializers/filter_parameter_logging.rb
+- test/dummy/config/initializers/assets.rb
 - test/dummy/config/initializers/inflections.rb
+- test/dummy/config/initializers/session_store.rb
+- test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
 - test/dummy/config/initializers/cookies_serializer.rb
-- test/dummy/config/environment.rb
 - test/dummy/config/application.rb
-- test/dummy/config/database.yml
-- test/dummy/config/secrets.yml
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/bin/rails
-- test/dummy/bin/rake
-- test/dummy/bin/setup
-- test/dummy/bin/bundle
-- test/dummy/config.ru
+- test/lib/generators/zuora_connect/datatable_generator_test.rb
+- test/test_helper.rb
+- test/fixtures/zuora_connect/app_instances.yml
 - test/integration/navigation_test.rb
+- test/models/zuora_connect/app_instance_test.rb
 - test/zuora_connect_test.rb
-- test/fixtures/zuora_connect/app_instances.yml
-- test/lib/generators/zuora_connect/datatable_generator_test.rb