zuora_connect 1.7.03 → 1.7.04

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 043bacd1f74b2e3a3e22d8cffe8f642081b5d265
-  data.tar.gz: f5cae6cafedaa42f6ed37028d4794b17c858d1f0
+  metadata.gz: ed6c65bd36e9061203dd9ea2e55d230ce14bd5b8
+  data.tar.gz: 2b5facf174f25a137ab607526bbe5701d1d72706
 SHA512:
-  metadata.gz: 2d641103cfb8016b386f8a47e5d75740ad044967ce988264b775d74fa19cb6bf7fd1c36097713c80ab680ee09dab3e429b50cfabcc6b00302eb2cd565a4a8529
-  data.tar.gz: 0ada5cd7bff5dae2135e6d8871d34df83450e594125030e5cf3a44e3ac34662483a66f649807db57166df7bf01e9c20a29ada8e2500e85afd85863c49d674132
+  metadata.gz: e07a270696b0acd4df0bd925f948c3a166eb7aae36dc328f64847472a364030643d2e2674e36e30016f268ffd5496f56e0b1c9ca517db4fe362c2d16f0f8eb58
+  data.tar.gz: e3049b0cb2552c5768e9e114f0544d13b3bfd2d73e3bf5d938ae264f7556eb18118acb397f5a98e31995ae72461629185e38fb2c8e1a1379fa77385bd6e5e9a5

data/app/models/zuora_connect/app_instance_base.rb

@@ -155,8 +155,10 @@ module ZuoraConnect
 
     #### START Metrics Mathods ####
       def self.write_to_telegraf(*args)
-        @@telegraf_host = ZuoraConnect::Telegraf.new() if @@telegraf_host == nil
-        return @@telegraf_host.write(*args)
+        if ZuoraConnect.configuration.enable_metrics
+          @@telegraf_host = ZuoraConnect::Telegraf.new() if @@telegraf_host == nil
+          return @@telegraf_host.write(*args)
+        end
       end
 
       def self.get_metrics(type)

data/app/models/zuora_connect/telegraf.rb

@@ -2,6 +2,11 @@ module ZuoraConnect
   class Telegraf
     attr_accessor :host
 
+    OUTBOUND_METRICS = true      
+    OUTBOUND_METRICS_NAME = "request-outbound"      
+    INBOUND_METRICS = true      
+    INBOUND_METRICS_NAME = "request-inbound"      
+
     def initialize 
       self.connect
     end
@@ -19,21 +24,17 @@ module ZuoraConnect
       Rails.logger.warn(self.format_metric_log('Telegraf', ex.message))
     end
 
-    def write(direction: 'Default', tags: {}, values: {})
+    def write(direction: 'Unknown', 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
+        if Rails.env.to_sym != :test
           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})
+          tags = tags.merge({ app_name: app_name, process_type: process_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)
+          if direction == :inbound
+            self.write_udp(series: INBOUND_METRICS_NAME, tags: tags, values: values) if INBOUND_METRICS
+          elsif direction == :outbound
+            self.write_udp(series: OUTBOUND_METRICS_NAME, tags: tags, values: values) if OUTBOUND_METRICS
           else
             self.write_udp(series: direction, tags: tags, values: values)
           end
@@ -58,8 +59,12 @@ module ZuoraConnect
       Rails.logger.warn(self.format_metric_log('Telegraf', ex.message))
     end
 
+    def app_name
+      return ENV['DEIS_APP'].present? ? "#{ENV['DEIS_APP']}" : "#{Rails.application.class.parent_name}"
+    end
+
     # Returns the process type if any
-    def get_process_type
+    def process_type
       p_type = 'Unknown'
       if ENV['HOSTNAME'] && ENV['DEIS_APP']
         temp = ENV['HOSTNAME'].split(ENV['DEIS_APP'])[1]

data/lib/middleware/metrics_middleware.rb

@@ -6,30 +6,28 @@ module Middleware
 
     # This method is triggered when a non error page is loaded (not 404)
     def call(name, started, finished, unique_id, payload)
-      if ZuoraConnect.configuration.enable_inbound_metrics_flag == true
-        # If the url contains any css or JavaScript files then do not collect metrics for them
-        return nil if ["css", "assets", "jpg", "png", "jpeg", "ico"].any? { |word| payload[:path].include?(word) }
-
-        # Getting the endpoint and the content_type
-        content_hash = {:html => "text/html", :js => "application/javascript", :json => "application/json"}
-        content_type = content_hash.key?(payload[:format]) ? content_hash[payload[:format]] : payload[:format]
-
-        # 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 : ""
-        if payload[:exception].present? 
-          status_code, exception = [500, payload[:exception].first]
-        else
-          status_code, exception = [payload[:status], nil]
-        end
+      # If the url contains any css or JavaScript files then do not collect metrics for them
+      return nil if ["css", "assets", "jpg", "png", "jpeg", "ico"].any? { |word| payload[:path].include?(word) }
+
+      # Getting the endpoint and the content_type
+      content_hash = {:html => "text/html", :js => "application/javascript", :json => "application/json"}
+      content_type = content_hash.key?(payload[:format]) ? content_hash[payload[:format]] : payload[:format]
+
+      # 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 : ""
+      if payload[:exception].present? 
+        status_code, exception = [500, payload[:exception].first]
+      else
+        status_code, exception = [payload[:status], nil]
+      end
 
-        tags = {method: payload[:method], status: status_code, error_type: exception, content_type: content_type, controller: payload[:controller], action: payload[:action]}.compact
+      tags = {method: payload[:method], status: status_code, error_type: exception, content_type: content_type, controller: payload[:controller], action: payload[:action]}.compact
 
-        values = {view_time: payload[:view_runtime], db_time: payload[:db_runtime], response_time: ((finished-started)*1000)}.compact
-        values = values.map{ |k,v| [k,v.round(2)]}.to_h
+      values = {view_time: payload[:view_runtime], db_time: payload[:db_runtime], response_time: ((finished-started)*1000)}.compact
+      values = values.map{ |k,v| [k,v.round(2)]}.to_h
 
-        ZuoraConnect::AppInstanceBase.write_to_telegraf(direction: :inbound, tags: tags, values: values)
-      end
+      ZuoraConnect::AppInstanceBase.write_to_telegraf(direction: :inbound, tags: tags, values: values)
     end
   end
 
@@ -46,61 +44,59 @@ module Middleware
       start_time = Time.now
       @status, @headers, @response = @app.call(env)
 
-      if ZuoraConnect.configuration.enable_inbound_metrics_flag == true
-        # If the url contains any CSS or JavaScript files then do not collect metrics for them
-        return [@status, @headers, @response] if ["css", "assets", "jpg", "png", "jpeg", "ico"].any? { |word| env['PATH_INFO'].include?(word) }
-
-        if defined? Prometheus
-          #Prometheus Stuff
-          if env['PATH_INFO'] == '/connect/internal/metrics'
+      # If the url contains any CSS or JavaScript files then do not collect metrics for them
+      return [@status, @headers, @response] if ["css", "assets", "jpg", "png", "jpeg", "ico"].any? { |word| env['PATH_INFO'].include?(word) }
 
-            #Do something before each scrape
-            if defined? Resque.redis
+      if defined? Prometheus
+        #Prometheus Stuff
+        if env['PATH_INFO'] == '/connect/internal/metrics'
 
-              app_name = ENV['DEIS_APP'].present? ? "#{ENV['DEIS_APP']}" : "#{Rails.application.class.parent_name}"
-              begin
+          #Do something before each scrape
+          if defined? Resque.redis
 
-                Resque.redis.ping
+            app_name = ENV['DEIS_APP'].present? ? "#{ENV['DEIS_APP']}" : "#{Rails.application.class.parent_name}"
+            begin
 
-                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])
+              Resque.redis.ping
 
-              rescue Redis::CannotConnectError
-                  Prometheus::REDIS_CONNECTION.set({connection:'redis',name:app_name},0)
-              end
+              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])
 
-              if ZuoraConnect.configuration.custom_prometheus_update_block != nil
-                ZuoraConnect.configuration.custom_prometheus_update_block.call()
-              end
+            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
 
-        # 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"
-        else
-          # Writing to telegraf: Handle 404
-          if [404].include?(@status)
-            content_type = @headers['Content-Type'].split(';')[0] if @headers['Content-Type']
-
-            tags = {status: @status, content_type: content_type}
-         
-            tags = tags.merge({controller: 'ActionController', action: 'RoutingError' })
-            
-            values = {response_time: ((Time.now - start_time)*1000).round(2) }
-
-            ZuoraConnect::AppInstanceBase.write_to_telegraf(direction: :inbound, tags: tags, values: values)
-          end
+      # 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"
+      else
+        # Writing to telegraf: Handle 404
+        if [404].include?(@status)
+          content_type = @headers['Content-Type'].split(';')[0] if @headers['Content-Type']
+
+          tags = {status: @status, content_type: content_type}
+       
+          tags = tags.merge({controller: 'ActionController', action: 'RoutingError' })
+          
+          values = {response_time: ((Time.now - start_time)*1000).round(2) }
+
+          ZuoraConnect::AppInstanceBase.write_to_telegraf(direction: :inbound, tags: tags, values: values)
         end
       end
       [@status, @headers, @response]

data/lib/zuora_connect/configuration.rb

@@ -3,7 +3,7 @@ module ZuoraConnect
 
     attr_accessor :default_locale, :default_time_zone, :url, :mode, :delayed_job,:private_key, :additional_apartment_models
 
-    attr_accessor :telegraf_endpoint, :telegraf_debug, :enable_inbound_metrics_flag, :enable_outbound_metrics_flag, :custom_prometheus_update_block, :app_name, :influxdb_series_name_inbound, :influxdb_series_name_outbound
+    attr_accessor :enable_metrics, :telegraf_endpoint, :telegraf_debug, :custom_prometheus_update_block
 
     attr_accessor :oauth_client_id, :oauth_client_secret, :oauth_client_redirect_uri
 
@@ -20,14 +20,9 @@ module ZuoraConnect
       
 
       # Setting the app name for telegraf write
+      @enable_metrics = false
       @telegraf_endpoint = 'udp://telegraf-app-metrics.monitoring.svc.cluster.local:8094'
       @telegraf_debug = false
-      @enable_inbound_metrics_flag =  false
-      @enable_outbound_metrics_flag =  false
-      @influxdb_series_name_inbound = "request-inbound"
-      @influxdb_series_name_outbound = "request-outbound"
-
-      @app_name = ENV['DEIS_APP'].present? ? "#{ENV['DEIS_APP']}" : "#{Rails.application.class.parent_name}"
       
       # OAuth Settings
       @oauth_client_id = ""

data/lib/zuora_connect/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.7.03
+  version: 1.7.04
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-31 00:00:00.000000000 Z
+date: 2018-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment