diff options
Diffstat (limited to 'app/services/error_tracking')
4 files changed, 116 insertions, 6 deletions
diff --git a/app/services/error_tracking/issue_details_service.rb b/app/services/error_tracking/issue_details_service.rb index 0068a9e9b6d..1614c597a8e 100644 --- a/app/services/error_tracking/issue_details_service.rb +++ b/app/services/error_tracking/issue_details_service.rb @@ -8,7 +8,7 @@ module ErrorTracking private def perform - response = project_error_tracking_setting.issue_details(issue_id: params[:issue_id]) + response = find_issue_details(params[:issue_id]) compose_response(response) do # The gitlab_issue attribute can contain an absolute GitLab url from the Sentry Client @@ -36,5 +36,29 @@ module ErrorTracking def parse_response(response) { issue: response[:issue] } end + + def find_issue_details(issue_id) + # There are 2 types of the data source for the error tracking feature: + # + # * When integrated error tracking is enabled, we use the application database + # to read and save error tracking data. + # + # * When integrated error tracking is disabled we call + # project_error_tracking_setting method which works with Sentry API. + # + # Issue https://gitlab.com/gitlab-org/gitlab/-/issues/329596 + # + if project_error_tracking_setting.integrated_client? + error = project.error_tracking_errors.find(issue_id) + + # We use the same response format as project_error_tracking_setting + # method below for compatibility with existing code. + { + issue: error.to_sentry_detailed_error + } + else + project_error_tracking_setting.issue_details(issue_id: issue_id) + end + end end end diff --git a/app/services/error_tracking/issue_latest_event_service.rb b/app/services/error_tracking/issue_latest_event_service.rb index a39f1cde1b2..1bf86c658fc 100644 --- a/app/services/error_tracking/issue_latest_event_service.rb +++ b/app/services/error_tracking/issue_latest_event_service.rb @@ -5,7 +5,7 @@ module ErrorTracking private def perform - response = project_error_tracking_setting.issue_latest_event(issue_id: params[:issue_id]) + response = find_issue_latest_event(params[:issue_id]) compose_response(response) end @@ -13,5 +13,30 @@ module ErrorTracking def parse_response(response) { latest_event: response[:latest_event] } end + + def find_issue_latest_event(issue_id) + # There are 2 types of the data source for the error tracking feature: + # + # * When integrated error tracking is enabled, we use the application database + # to read and save error tracking data. + # + # * When integrated error tracking is disabled we call + # project_error_tracking_setting method which works with Sentry API. + # + # Issue https://gitlab.com/gitlab-org/gitlab/-/issues/329596 + # + if project_error_tracking_setting.integrated_client? + error = project.error_tracking_errors.find(issue_id) + event = error.events.last + + # We use the same response format as project_error_tracking_setting + # method below for compatibility with existing code. + { + latest_event: event.to_sentry_error_event + } + else + project_error_tracking_setting.issue_latest_event(issue_id: issue_id) + end + end end end diff --git a/app/services/error_tracking/issue_update_service.rb b/app/services/error_tracking/issue_update_service.rb index 2f8bbfddef0..624e5f94dde 100644 --- a/app/services/error_tracking/issue_update_service.rb +++ b/app/services/error_tracking/issue_update_service.rb @@ -5,10 +5,12 @@ module ErrorTracking private def perform - response = project_error_tracking_setting.update_issue( + update_opts = { issue_id: params[:issue_id], params: update_params - ) + } + + response = update_issue(update_opts) compose_response(response) do project_error_tracking_setting.expire_issues_cache @@ -69,5 +71,31 @@ module ErrorTracking return error('Error Tracking is not enabled') unless enabled? return error('Access denied', :unauthorized) unless can_update? end + + def update_issue(opts) + # There are 2 types of the data source for the error tracking feature: + # + # * When integrated error tracking is enabled, we use the application database + # to read and save error tracking data. + # + # * When integrated error tracking is disabled we call + # project_error_tracking_setting method which works with Sentry API. + # + # Issue https://gitlab.com/gitlab-org/gitlab/-/issues/329596 + # + if project_error_tracking_setting.integrated_client? + error = project.error_tracking_errors.find(opts[:issue_id]) + error.status = opts[:params][:status] + error.save! + + # We use the same response format as project_error_tracking_setting + # method below for compatibility with existing code. + { + updated: true + } + else + project_error_tracking_setting.update_issue(**opts) + end + end end end diff --git a/app/services/error_tracking/list_issues_service.rb b/app/services/error_tracking/list_issues_service.rb index 7087e3825d6..5ddba748fd4 100644 --- a/app/services/error_tracking/list_issues_service.rb +++ b/app/services/error_tracking/list_issues_service.rb @@ -22,13 +22,15 @@ module ErrorTracking def perform return invalid_status_error unless valid_status? - response = project_error_tracking_setting.list_sentry_issues( + sentry_opts = { issue_status: issue_status, limit: limit, search_term: params[:search_term].presence, sort: sort, cursor: params[:cursor].presence - ) + } + + response = list_issues(sentry_opts) compose_response(response) end @@ -56,5 +58,36 @@ module ErrorTracking def sort params[:sort] || DEFAULT_SORT end + + def list_issues(opts) + # There are 2 types of the data source for the error tracking feature: + # + # * When integrated error tracking is enabled, we use the application database + # to read and save error tracking data. + # + # * When integrated error tracking is disabled we call + # project_error_tracking_setting method which works with Sentry API. + # + # Issue https://gitlab.com/gitlab-org/gitlab/-/issues/329596 + # + if project_error_tracking_setting.integrated_client? + # We are going to support more options in the future. + # For now we implement the bare minimum for rendering the list in UI. + filter_opts = { + status: opts[:issue_status] + } + + errors = ErrorTracking::ErrorsFinder.new(current_user, project, filter_opts).execute + + # We use the same response format as project_error_tracking_setting + # method below for compatibility with existing code. + { + issues: errors.map(&:to_sentry_error), + pagination: {} + } + else + project_error_tracking_setting.list_sentry_issues(**opts) + end + end end end |