From 592cbd5fd5210d154771d19013284d36f07c8045 Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Fri, 17 Jun 2022 16:54:39 +0200 Subject: [PATCH] feat(api): errors search ignore `Script error` on query level --- api/chalicelib/core/errors.py | 2 ++ ee/api/chalicelib/core/errors.py | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/api/chalicelib/core/errors.py b/api/chalicelib/core/errors.py index 2026f9232..bbdea726b 100644 --- a/api/chalicelib/core/errors.py +++ b/api/chalicelib/core/errors.py @@ -436,6 +436,8 @@ def search(data: schemas.SearchErrorsSchema, project_id, user_id, flows=False): pg_sub_query = __get_basic_constraints(platform, project_key="sessions.project_id") pg_sub_query += ["sessions.start_ts>=%(startDate)s", "sessions.start_ts<%(endDate)s", "source ='js_exception'", "pe.project_id=%(project_id)s"] + # To ignore Script error + pg_sub_query.append("pe.message!='Script error.'") pg_sub_query_chart = __get_basic_constraints(platform, time_constraint=False, chart=True, project_key=None) # pg_sub_query_chart.append("source ='js_exception'") pg_sub_query_chart.append("errors.error_id =details.error_id") diff --git a/ee/api/chalicelib/core/errors.py b/ee/api/chalicelib/core/errors.py index 9477f8ec7..07a5e10ba 100644 --- a/ee/api/chalicelib/core/errors.py +++ b/ee/api/chalicelib/core/errors.py @@ -477,6 +477,8 @@ def search(data: schemas.SearchErrorsSchema, project_id, user_id, flows=False): pg_sub_query = __get_basic_constraints_pg(platform, project_key="sessions.project_id") pg_sub_query += ["sessions.start_ts>=%(startDate)s", "sessions.start_ts<%(endDate)s", "source ='js_exception'", "pe.project_id=%(project_id)s"] + # To ignore Script error + pg_sub_query.append("pe.message!='Script error.'") pg_sub_query_chart = __get_basic_constraints_pg(platform, time_constraint=False, chart=True, project_key=None) # pg_sub_query_chart.append("source ='js_exception'") pg_sub_query_chart.append("errors.error_id =details.error_id") @@ -649,6 +651,8 @@ def search_deprecated(data: schemas.SearchErrorsSchema, project_id, user_id, flo platform = f.value[0] ch_sub_query = __get_basic_constraints(platform) ch_sub_query.append("source ='js_exception'") + # To ignore Script error + ch_sub_query.append("message!='Script error.'") statuses = [] error_ids = None # Clickhouse keeps data for the past month only, so no need to search beyond that