zuora_connect 1.7.02 → 1.7.03

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 594401d6339de6b47b3fb18df373885602d46cf2
-  data.tar.gz: 1e04f4996a73181a28cbd49a54544df4aaaab95c
+  metadata.gz: 043bacd1f74b2e3a3e22d8cffe8f642081b5d265
+  data.tar.gz: f5cae6cafedaa42f6ed37028d4794b17c858d1f0
 SHA512:
-  metadata.gz: 124d750f69180609410a6eb3e0fca28ce8faa9fbc67b93e65c79342aa70e9d1bf1746bbe3eda7874ec74efcecb25c0af47cc08d18ae9ddfa6523d01e95543b43
-  data.tar.gz: 3689ba84238f716ed5d37bdd3718439154e34081fd6acade2936333141b81f0ec70f352eec94a3ac1749812aef095bc9cf5fc8f748ab561972e80ca40567e349
+  metadata.gz: 2d641103cfb8016b386f8a47e5d75740ad044967ce988264b775d74fa19cb6bf7fd1c36097713c80ab680ee09dab3e429b50cfabcc6b00302eb2cd565a4a8529
+  data.tar.gz: 0ada5cd7bff5dae2135e6d8871d34df83450e594125030e5cf3a44e3ac34662483a66f649807db57166df7bf01e9c20a29ada8e2500e85afd85863c49d674132

data/app/models/zuora_connect/app_instance_base.rb

@@ -25,102 +25,6 @@ module ZuoraConnect
       self.apartment_switch(nil, true)
     end
 
-    def self.write_metric(series: 'Unknown', tags: {}, values: {})
-      begin
-        if @@telegraf_host.blank?
-          Rails.logger.debug('Need new connection') if ZuoraConnect.configuration.telegraf_debug
-          uri = URI.parse(ZuoraConnect.configuration.telegraf_endpoint)
-          @@telegraf_host = UDPSocket.new.tap do |socket|
-            socket.connect uri.host, uri.port
-          end
-        end
-        @@telegraf_host.write InfluxDB::PointValue.new({series: series, tags: tags, values: values}).dump 
-      rescue => ex
-        @@telegraf_host = nil
-        Rails.logger.tagged("Telegraf") do 
-          logger.warn('Failed to write')
-          logger.warn(ex.class)
-          logger.warn(ex.message)
-        end
-      end
-    end
-
-    # Methods for writing Telegraf metrics
-
-    # Returns the process type if any
-    def self.get_process_type
-      p_type = 'Unknown'
-      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(direction: nil, tags: {}, values: {})
-      time = Benchmark.measure do |bench|
-        # To avoid writing metrics from rspec tests
-        if ENV['DEIS_APP'] || true
-          # Getting the process type
-          p_type = self.get_process_type
-          app_instance = Thread.current[:appinstance].present? ? Thread.current[:appinstance].id : 0
-          tags = tags.merge({ app_name: ZuoraConnect.configuration.app_name, process_type: p_type, app_instance: app_instance})
-
-          if direction == :inbound && ZuoraConnect.configuration.enable_inbound_metrics_flag
-            series = ZuoraConnect.configuration.influxdb_series_name_inbound
-            self.write_metric(series: series, tags: tags, values: values)
-          elsif direction == :outbound && ZuoraConnect.configuration.enable_outbound_metrics_flag
-            series = ZuoraConnect.configuration.influxdb_series_name_outbound
-            self.write_metric(series: series, tags: tags, values: values)
-          end
-
-        end
-      end
-      if ZuoraConnect.configuration.telegraf_debug
-        Rails.logger.debug(tags.to_s)
-        Rails.logger.debug(values.to_s)
-        Rails.logger.debug("Writing #{direction.capitalize}: #{time.real.round(4)}")
-      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,
-          url: "dummy",
-          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,
-            url: "dummy",
-            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
-    end
-
-
     def apartment_switch(method = nil, migrate = false)
       begin
         Apartment::Tenant.switch!(self.id) if self.persisted?
@@ -158,7 +62,7 @@ module ZuoraConnect
           mock_task_data[k] = v
         end
 
-        build_task(mock_task_data, session)
+        self.build_task(task_data: mock_task_data, session: session)
       else
         time_expire = (session["#{self.id}::last_refresh"] || Time.now).to_i - INSTANCE_REFRESH_WINDOW.ago.to_i
 
@@ -192,7 +96,7 @@ module ZuoraConnect
           else
             Rails.logger.info("[#{self.id}] REBUILDING - Expires in #{time_expire} seconds")
           end
-          build_task(session["#{self.id}::task_data"], session)
+          self.build_task(task_data: session["#{self.id}::task_data"], session: session)
         end
       end
       begin
@@ -220,7 +124,7 @@ module ZuoraConnect
 
       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)
+        self.build_task(task_data: JSON.parse(response.body), session: session)
         self.last_refresh = Time.now.to_i
         self.cache_app_instance
         self.reset_mark_for_refresh
@@ -249,14 +153,56 @@ module ZuoraConnect
       end
     end
 
+    #### START Metrics Mathods ####
+      def self.write_to_telegraf(*args)
+        @@telegraf_host = ZuoraConnect::Telegraf.new() if @@telegraf_host == nil
+        return @@telegraf_host.write(*args)
+      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,
+            url: "dummy",
+            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,
+              url: "dummy",
+              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
+      end
+    #### END Task Mathods ####
+
     #### START Task Mathods ####
-      def build_task(task_data, session)
-        @task_data = task_data
-        @mode = @task_data["mode"]
-        @task_data.each do |k,v|
+      def build_task(task_data: {}, session: {})
+        self.task_data = task_data
+        self.mode = self.task_data["mode"]
+        self.task_data.each do |k,v|
           if k.match(/^(.*)_login$/)
             tmp = ZuoraConnect::Login.new(v)
-            if session.present? && v["tenant_type"] == "Zuora"
+            if v["tenant_type"] == "Zuora"
               if tmp.entities.size > 0
                 tmp.entities.each do |value|
                   entity_id = value["id"]
@@ -269,16 +215,16 @@ module ZuoraConnect
                 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) 
               end
-              @logins[k] = tmp
+              self.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
+          elsif k == "options"
+            v.each do |opt|
+              self.options[opt["config_name"]] = opt
+            end
+          elsif k == "user_settings"
+            self.timezone =  v["timezone"]
+            self.locale = v["local"]
           end
         end
       rescue => ex
@@ -299,7 +245,7 @@ module ZuoraConnect
         parsed_json =  JSON.parse(response.body)
         if response.code == 200
           if defined?(Redis.current)
-            self.build_task(parsed_json, self.data_lookup)
+            self.build_task(task_data: parsed_json, session: self.data_lookup)
             self.last_refresh = Time.now.to_i
             self.cache_app_instance
           end
@@ -499,8 +445,7 @@ module ZuoraConnect
 
       def encrypt_data(data: nil)
         return data if data.blank?
-
-        if ['development', 'test'].include?(Rails.env)
+        if Rails.env == 'development'
           return data.to_json
         else
           return encryptor.encrypt_and_sign(data.to_json)

data/app/models/zuora_connect/login.rb

@@ -5,15 +5,14 @@ module ZuoraConnect
       @clients = {}
       if fields["tenant_type"] == "Zuora"
         login_fields = fields.map{|k,v| [k.to_sym, v]}.to_h
-
-        fields["authentication_type"] = "basic" if fields["authentication_type"].nil? || fields["authentication_type"].blank?
+        login_type = fields.dig("authentication_type").blank? ? 'Basic' : fields.dig("authentication_type").capitalize
         
-        @clients["Default"] = "::ZuoraAPI::#{fields["authentication_type"].capitalize}".constantize.new(login_fields)
+        @clients["Default"] = "::ZuoraAPI::#{login_type}".constantize.new(login_fields)
         @default_entity = fields["entities"][0]["id"] if fields["entities"].size == 1 if fields["entities"] && fields["entities"].size > 0
         if fields["entities"] && fields["entities"].size > 0
           fields["entities"].each do |entity|
             params = {:entity_id => entity["id"]}.merge(login_fields)
-            @clients[entity["id"]] =  "::ZuoraAPI::#{fields["authentication_type"].capitalize}".constantize.new(params)
+            @clients[entity["id"]] =  "::ZuoraAPI::#{login_type}".constantize.new(params)
           end
         end
         self.attr_builder("available_entities", @clients.keys) 

data/app/models/zuora_connect/telegraf.rb

@@ -0,0 +1,79 @@
+module ZuoraConnect
+  class Telegraf
+    attr_accessor :host
+
+    def initialize 
+      self.connect
+    end
+
+    def connect
+      Rails.logger.debug(self.format_metric_log('Telegraf','Need new connection')) if ZuoraConnect.configuration.telegraf_debug
+      uri = URI.parse(ZuoraConnect.configuration.telegraf_endpoint)
+      self.host = UDPSocket.new.tap do |socket|
+        socket.connect uri.host, uri.port
+      end
+    rescue => ex
+      self.host = nil
+      Rails.logger.warn(self.format_metric_log('Telegraf', 'Failed to connect'))
+      Rails.logger.warn(self.format_metric_log('Telegraf', ex.class))
+      Rails.logger.warn(self.format_metric_log('Telegraf', ex.message))
+    end
+
+    def write(direction: 'Default', tags: {}, values: {})
+      time = Benchmark.measure do |bench|
+        # To avoid writing metrics from rspec tests
+        if ENV['DEIS_APP'] || true
+          # Getting the process type
+          p_type = self.get_process_type
+          app_instance = Thread.current[:appinstance].present? ? Thread.current[:appinstance].id : 0
+          tags = tags.merge({ app_name: ZuoraConnect.configuration.app_name, process_type: p_type, app_instance: app_instance})
+
+          if direction == :inbound && ZuoraConnect.configuration.enable_inbound_metrics_flag
+            series = ZuoraConnect.configuration.influxdb_series_name_inbound
+            self.write_udp(series: series, tags: tags, values: values)
+          elsif direction == :outbound && ZuoraConnect.configuration.enable_outbound_metrics_flag
+            series = ZuoraConnect.configuration.influxdb_series_name_outbound
+            self.write_udp(series: series, tags: tags, values: values)
+          else
+            self.write_udp(series: direction, tags: tags, values: values)
+          end
+        end
+      end
+      if ZuoraConnect.configuration.telegraf_debug
+        Rails.logger.debug(self.format_metric_log('Telegraf', tags.to_s))
+        Rails.logger.debug(self.format_metric_log('Telegraf', values.to_s))
+        Rails.logger.debug(self.format_metric_log('Telegraf', "Writing '#{direction.capitalize}': #{time.real.round(5)} ms"))
+      end
+    end
+
+
+    def write_udp(series: '', tags: {}, values: {})
+      return if !values.present?
+
+      self.host.write InfluxDB::PointValue.new({series: series, tags: tags, values: values}).dump 
+    rescue => ex
+      self.connect
+      Rails.logger.warn(self.format_metric_log('Telegraf','Failed to write udp'))
+      Rails.logger.warn(self.format_metric_log('Telegraf', ex.class))
+      Rails.logger.warn(self.format_metric_log('Telegraf', ex.message))
+    end
+
+    # Returns the process type if any
+    def get_process_type
+      p_type = 'Unknown'
+      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
+
+    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/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.7.02"
+  VERSION = "1.7.03"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.7.02
+  version: 1.7.03
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-30 00:00:00.000000000 Z
+date: 2018-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -260,6 +260,7 @@ files:
 - app/models/zuora_connect/app_instance.rb
 - app/models/zuora_connect/app_instance_base.rb
 - app/models/zuora_connect/login.rb
+- app/models/zuora_connect/telegraf.rb
 - app/views/layouts/zuora_connect/application.html.erb
 - app/views/sql/refresh_aggregate_table.txt
 - app/views/zuora_connect/static/invalid_app_instance_error.html.erb