process_action.rb in skylight-6.0.0.beta

- old
+ new

@@ -16,12 +16,13 @@
         # @param payload [Hash]
         # @option payload [String] :controller Controller name
         # @option payload [String] :action Action name
         # @return [Array]
         def normalize(trace, _name, payload)
-          trace.endpoint = controller_action(payload)
-          [CAT, trace.endpoint, nil]
+          endpoint = controller_action(payload)
+          trace.endpoint = endpoint
+          [CAT, endpoint, nil]
         end
 
         def normalize_after(trace, _span, _name, payload)
           return unless config.enable_segments?
 
@@ -43,14 +44,15 @@
 
         def segment_from_payload(payload)
           # Show 'error' if there's an unhandled exception or if the status is 4xx or 5xx
           return "error" if payload[:exception] || payload[:exception_object]
 
-          segment_from_status(payload[:status]) || if payload[:sk_rendered_format]
-            # We only show the variant if we actually have a format
-            # We won't have a sk_rendered_format if it's a `head` outside of a `respond_to` block.
-            [payload[:sk_rendered_format], payload[:sk_variant]].compact.flatten.join("+")
-          end
+          segment_from_status(payload[:status]) ||
+            if payload[:sk_rendered_format]
+              # We only show the variant if we actually have a format
+              # We won't have a sk_rendered_format if it's a `head` outside of a `respond_to` block.
+              [payload[:sk_rendered_format], payload[:sk_variant]].compact.flatten.join("+")
+            end
         end
 
         def segment_from_status(status)
           case status
           when 304