From b792028ab9e3a1b64de62846357a6be5db8892d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Meny?= Date: Fri, 20 May 2022 09:50:12 +0100 Subject: [PATCH] Try different Sentry custom instrumentation --- app/models/case_log.rb | 8 +++++++- app/models/form/page.rb | 7 ++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/app/models/case_log.rb b/app/models/case_log.rb index a03f377fd..2ee662026 100644 --- a/app/models/case_log.rb +++ b/app/models/case_log.rb @@ -66,10 +66,16 @@ class CaseLog < ApplicationRecord end def collection_start_year + transaction = Sentry.get_current_scope&.get_transaction + span = transaction&.start_child(op: :routed_to?) + return unless startdate window_end_date = Time.zone.local(startdate.year, 4, 1) - startdate < window_end_date ? startdate.year - 1 : startdate.year + start_year = startdate < window_end_date ? startdate.year - 1 : startdate.year + + span&.finish + start_year end def form_name diff --git a/app/models/form/page.rb b/app/models/form/page.rb index 7822c2b68..0a16f4fb2 100644 --- a/app/models/form/page.rb +++ b/app/models/form/page.rb @@ -18,9 +18,14 @@ class Form::Page delegate :form, to: :subsection def routed_to?(case_log) + transaction = Sentry.get_current_scope&.get_transaction + span = transaction&.start_child(op: :routed_to?) + return true unless depends_on || subsection.depends_on + routed_to = subsection.enabled?(case_log) && form.depends_on_met(depends_on, case_log) - subsection.enabled?(case_log) && form.depends_on_met(depends_on, case_log) + span&.finish + routed_to end def non_conditional_questions