zuora_connect 1.7.50 → 1.7.51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e93429f353316549ed600e4c5f014add881b09a5
-  data.tar.gz: 578e5ade007ffede35ba3ee75c07a2b9be52371a
+  metadata.gz: ad59396c82c4d286dcf2b5afda3ad40983162f76
+  data.tar.gz: 9e527b969e5e4372b319cdd68d41ab48896a2ad8
 SHA512:
-  metadata.gz: 511c0923a45f4fa760d1b50eed093f89228d47831a86fc07ac8d8521af1ef5c60b4ee41efaf34fbb6c2359ca2740d0ffde34ba3db44c21e199af10b1db6169c3
-  data.tar.gz: a25e55ca3a252f795b7f53999dbff000ea95a6b32d1c405bd241be891edc70b83c739ba4c5445ed5814997a7b3656fe1e312eac801ad36604131dae0e2a296c0
+  metadata.gz: e73d775199745a4efdd392612e7ac4ee4fc9a9629f46f950aa34347070103757cb3aad668c5cb36e8cbfcf8c6fe9d9573bf0e729c2b6cc86e07c832443311bca
+  data.tar.gz: deb7f9b329ef3b7574aba311c44880d8c48fe1ff1ef008d2c1c721897b15c08807ac3a05482e876573e4c352ca2f04d6adb1935f312d241e3f70b69f3257c270

data/app/models/zuora_connect/app_instance_base.rb

@@ -39,6 +39,7 @@ module ZuoraConnect
     def initialize_redis_placeholder
       if defined?(Redis.current)
         Redis.current.zadd("APILimits", 9999999999, "placeholder")
+        Redis.current.zadd("InstanceRefreshing", 9999999999, "placeholder")
         Resque.redis.zadd("PauseQueue", 9999999999, "placeholder")
       end
     end
@@ -414,23 +415,33 @@ module ZuoraConnect
 
     #### START AppInstance Temporary Persistance Methods ####
       def marked_for_refresh?
-        return defined?(Redis.current) ? Redis.current.get("AppInstance:#{self.id}:Refreshing").to_bool : false
+        if defined?(Redis.current)
+          Redis.current.zremrangebyscore("InstanceRefreshing", "0", "(#{Time.now.to_i}")
+          return Redis.current.zscore("InstanceRefreshing", self.id).present?
+        else
+          return false
+        end
       end
 
       def reset_mark_for_refresh
-        Redis.current.del("AppInstance:#{self.id}:Refreshing") if defined?(Redis.current)
+        Redis.current.zrem("InstanceRefreshing", self.id) if defined?(Redis.current)
       end
 
       def reset_mark_refreshed_at
-        return defined?(Redis.current) ? REFRESH_TIMEOUT.to_i - Redis.current.ttl("AppInstance:#{self.id}:Refreshing") : 0
+        return defined?(Redis.current) ? REFRESH_TIMEOUT.to_i - reset_mark_expires_at : 0
       end
 
       def reset_mark_expires_at
-        return defined?(Redis.current) ? Redis.current.ttl("AppInstance:#{self.id}:Refreshing") : 0
+        if defined?(Redis.current)
+          refresh_time = Redis.current.zscore("InstanceRefreshing", self.id)
+          return refresh_time.present? ? (refresh_time - Time.now.to_i).round(0) : 0
+        else
+          return 0
+        end
       end
 
       def mark_for_refresh
-        return defined?(Redis.current) ? Redis.current.set("AppInstance:#{self.id}:Refreshing", true, {:nx => true, :ex => REFRESH_TIMEOUT.to_i}) : true
+        return defined?(Redis.current) ? Redis.current.zadd("InstanceRefreshing", Time.now.to_i + REFRESH_TIMEOUT.to_i, self.id, {:nx => true}) : true
       end
 
       def data_lookup(session: {})
@@ -542,10 +553,8 @@ module ZuoraConnect
     ### START Resque Helping Methods ####
       def api_limit(start: true, time: API_LIMIT_TIMEOUT.to_i)
         if start
-          # Redis.current.setex("APILimits:#{self.id}", time, true)
           Redis.current.zadd("APILimits", Time.now.to_i + time, self.id)
         else
-          # Redis.current.del("APILimits:#{self.id}")
           Redis.current.zrem("APILimits", self.id)
         end
       end

data/app/models/zuora_connect/telegraf.rb

@@ -32,7 +32,12 @@ module ZuoraConnect
           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
+            if INBOUND_METRICS && !Thread.current[:inbound_metric].to_bool
+              self.write_udp(series: INBOUND_METRICS_NAME, tags: tags, values: values) 
+              Thread.current[:inbound_metric] = true
+            else
+              return
+            end
           elsif direction == :outbound
             self.write_udp(series: OUTBOUND_METRICS_NAME, tags: tags, values: values) if OUTBOUND_METRICS
           else

data/lib/middleware/metrics_middleware.rb

@@ -63,64 +63,69 @@ module Middleware
 
         #Thread.current[:appinstance] = nil
         start_time = Time.now
-        @status, @headers, @response = @app.call(env)
+        begin
+          @status, @headers, @response = @app.call(env)
+        ensure 
+          
+          # If the url contains any CSS or JavaScript files then do not collect metrics for them
+          if ["css", "assets", "jpg", "png", "jpeg", "ico"].any? { |word| env['PATH_INFO'].include?(word) } || /.*\.js$/.match(env['PATH_INFO'])
+            tags = {status: @status, controller: 'ActionController', action: 'Assets', app_instance: 0}
+            values = {response_time: ((Time.now - start_time)*1000).round(2) }
+            ZuoraConnect::AppInstanceBase.write_to_telegraf(direction: 'request-inbound-assets', tags: tags, values: values)
+          end
 
-        # If the url contains any CSS or JavaScript files then do not collect metrics for them
-        if ["css", "assets", "jpg", "png", "jpeg", "ico"].any? { |word| env['PATH_INFO'].include?(word) } || /.*\.js$/.match(env['PATH_INFO'])
-          tags = {status: @status, controller: 'ActionController', action: 'Assets', app_instance: 0}
-          values = {response_time: ((Time.now - start_time)*1000).round(2) }
-          ZuoraConnect::AppInstanceBase.write_to_telegraf(direction: 'request-inbound-assets', tags: tags, values: values)
-        end
+          if defined? Prometheus
+            #Prometheus Stuff
+            if env['PATH_INFO'] == '/connect/internal/metrics'
 
-        if defined? Prometheus
-          #Prometheus Stuff
-          if env['PATH_INFO'] == '/connect/internal/metrics'
+              #Do something before each scrape
+              if defined? Resque.redis
+                begin
 
-            #Do something before each scrape
-            if defined? Resque.redis
-              begin
+                  Resque.redis.ping
 
-                Resque.redis.ping
+                  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])
 
-                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: ZuoraConnect::Telegraf.app_name},0)
+                end
 
-              rescue Redis::CannotConnectError
-                  Prometheus::REDIS_CONNECTION.set({connection:'redis',name: ZuoraConnect::Telegraf.app_name},0)
+                if ZuoraConnect.configuration.custom_prometheus_update_block != nil
+                  ZuoraConnect.configuration.custom_prometheus_update_block.call()
+                end
               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']
-            content_type = content_type.gsub('text/javascript', 'application/javascript')
-            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)
+          # 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, 500].include?(@status)
+              content_type = @headers['Content-Type'].split(';')[0] if @headers['Content-Type']
+              content_type = content_type.gsub('text/javascript', 'application/javascript')
+              tags = {status: @status, content_type: content_type}
+           
+              tags = tags.merge({controller: 'ActionController'})
+              tags = tags.merge({action: 'RoutingError' }) if @status == 404
+              
+              values = {response_time: ((Time.now - start_time)*1000).round(2) }
+
+              ZuoraConnect::AppInstanceBase.write_to_telegraf(direction: :inbound, tags: tags, values: values)
+            end
           end
+          Thread.current[:inbound_metric] = nil
         end
         [@status, @headers, @response]
       end

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.7.50"
-end
+  VERSION = "1.7.51"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.7.50
+  version: 1.7.51
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-18 00:00:00.000000000 Z
+date: 2019-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment