zuora_connect 1.5.40k → 1.5.40m

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ab8265f0d808ba6afe86de40005431b22c63025
-  data.tar.gz: 7ee4bdf9c8d4a4a2025abbfed0fb832dfb19507f
+  metadata.gz: f531eec6fa72b6f9651a6961a64eda3cd0ce741f
+  data.tar.gz: 0eb620aa24830ce66a9572856a01dc6fd637daf9
 SHA512:
-  metadata.gz: a5767173c008b7ccabd534dd58dec659cb54456bcc6e2c05763fa0c43e4f10cc9056b4e2fc1dd44a201d4baae89062a981accf1e365f361556a129cf4b2aa4f5
-  data.tar.gz: 47fe75a6e62d7172d2f98ffec025d089d03950f6883005e8881d3678fa54592d6c0888284b9d36754072e80d0f4377bffb4b044b1ee5e1af25ed7787e9da871f
+  metadata.gz: 8c0d4e8e12a915fc5fd5f2da1b24d1edb0cc7376422733a871072b4c4df03112b51f0bb7714cec20b61ac52b5a886de5bbd8dd5b48d3718d3e7543c06f2c1cb6
+  data.tar.gz: dbf20a23eacd142c6d91e764f7e3af84389269ee3ee3ebcc9caf2b309e9d08e3753a5893628bcb05ef59895a48c35943b6d4f6e6cc9d8220024a6d3028d01ba0

data/app/models/zuora_connect/app_instance_base.rb

@@ -39,6 +39,10 @@ module ZuoraConnect
       return p_type
     end
 
+    # 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
     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)
 

data/lib/middleware/metrics_middleware.rb

@@ -4,26 +4,30 @@ module Middleware
   # 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, 500)
+    # This method is triggered when a non error page is loaded (not 404)
     def call(name, started, finished, unique_id, payload)
 
-      if payload[:status]
+      # 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
 
-        # 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
 
-        # 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
+      status_code = payload[:status] ? payload[:status] : ""
+
+      # 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 = 500 if payload[:exception_object].present?
+
+      # 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")
 
-        # Write to telegraf
-        ZuoraConnect::AppInstanceBase.write_to_telegraf("endpoint_name": request_path, "method_name": payload[:method], "status_code": payload[:status], "response_time": response_time, "db_runtime": payload[:db_runtime].to_f, "view_runtime": payload[:view_runtime], "content_type": content_type, "direction": "inbound")
-      end
     end
   end
 
@@ -82,18 +86,21 @@ module Middleware
       end
 
       # Writing to telegraf: Handle 404 and 500 requests
-      if @status != 200
+      if @status == 404 || @status == 304
         # Getting the endpoint and content_type
-        if @status == 404
-          request_path = "ActionController#RoutingError"
-        elsif env["action_controller.instance"].present?
-          request_path = "#{env["action_controller.instance"].controller_path}##{env["action_controller.instance"].action_name}"
-        else
-          # Handling requests which do not have controllers
-          request_path = "#{env['SCRIPT_NAME'][1..-1]}#UnknownAction" if env["SCRIPT_NAME"].present?
-        end
+        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")
+        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]

data/lib/zuora_connect/railtie.rb

@@ -31,8 +31,6 @@ module ZuoraConnect
       # hook to process_action
       ActiveSupport::Notifications.subscribe('process_action.action_controller', Middleware::PageRequest.new)
 
-
-
     end
 
 

data/lib/zuora_connect/version.rb

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

metadata

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