zuora_connect 1.5.40j → 1.5.40k

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcf3f3b3e395fbab36024b040ed49831c2a2389a
-  data.tar.gz: aed0261f4b1f289597512b342a1b236860d894b3
+  metadata.gz: 1ab8265f0d808ba6afe86de40005431b22c63025
+  data.tar.gz: 7ee4bdf9c8d4a4a2025abbfed0fb832dfb19507f
 SHA512:
-  metadata.gz: 1aa850d37b10d9a69f713cdc3b16ccc4e221355afd7e3104a0ea7e2a2ea78dcc616fee26cc3a2ccc0e7875634b3f046f045fab8410b961a326b71a770900f05f
-  data.tar.gz: a43af30791a2a7f967ba90526f51a1fdf38d0a8774700025cbf44358b0a43e0e99fa8f0d2be7850132fb61ad10cabbfbbfe7192534e2dd6ea893f619a826b41b
+  metadata.gz: a5767173c008b7ccabd534dd58dec659cb54456bcc6e2c05763fa0c43e4f10cc9056b4e2fc1dd44a201d4baae89062a981accf1e365f361556a129cf4b2aa4f5
+  data.tar.gz: 47fe75a6e62d7172d2f98ffec025d089d03950f6883005e8881d3678fa54592d6c0888284b9d36754072e80d0f4377bffb4b044b1ee5e1af25ed7787e9da871f

data/app/models/zuora_connect/app_instance_base.rb

@@ -1,4 +1,5 @@
 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
@@ -73,8 +74,8 @@ module ZuoraConnect
         if error_type
           begin
             ZuoraConnect.configuration.telegraf_client.write(ZuoraConnect.configuration.app_name_outbound,
-                tags: {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, "error_type": error_type})
+                tags: {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
@@ -183,7 +184,7 @@ 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
@@ -203,6 +204,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
@@ -214,9 +216,16 @@ 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 ####
@@ -256,13 +265,28 @@ module ZuoraConnect
       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
@@ -277,10 +301,11 @@ module ZuoraConnect
         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
@@ -290,8 +315,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 ####
 
@@ -310,7 +343,7 @@ module ZuoraConnect
 
       def refresh_oauth
         refresh_oauth_count ||= 0
-
+        error_type = ""
         start = Time.now
         params = {
                   :grant_type => "refresh_token",
@@ -337,6 +370,7 @@ 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
@@ -351,9 +385,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 ####
 

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.5.40j"
+  VERSION = "1.5.40k"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.5.40j
+  version: 1.5.40k
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-02 00:00:00.000000000 Z
+date: 2018-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment