From 89e2b7e1293e4032f6ca4457326f926e44ec523c Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Tue, 15 Nov 2022 16:30:14 +0100 Subject: [PATCH 1/6] feat(chalice): changed logs --- ee/api/chalicelib/core/sessions_exp.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ee/api/chalicelib/core/sessions_exp.py b/ee/api/chalicelib/core/sessions_exp.py index 075304ab7..0b77563f9 100644 --- a/ee/api/chalicelib/core/sessions_exp.py +++ b/ee/api/chalicelib/core/sessions_exp.py @@ -294,6 +294,7 @@ def search_sessions(data: schemas.SessionsSearchPayloadSchema, project_id, user_ sessions = cur.execute(main_query) except Exception as err: print("--------- SESSIONS-CH SEARCH QUERY EXCEPTION -----------") + print(main_query) print("--------- PAYLOAD -----------") print(data.json()) print("--------------------") From b9a0fe1d948c393878818c9c464353d40b2d3db5 Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Tue, 15 Nov 2022 18:35:01 +0100 Subject: [PATCH 2/6] chore(alerts): changed log message --- api/chalicelib/core/alerts_processor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/chalicelib/core/alerts_processor.py b/api/chalicelib/core/alerts_processor.py index f9604658b..2ed9105b2 100644 --- a/api/chalicelib/core/alerts_processor.py +++ b/api/chalicelib/core/alerts_processor.py @@ -196,7 +196,7 @@ def process(): cur.execute(query) result = cur.fetchone() if result["valid"]: - logging.info("Valid alert, notifying users, alertId:{alert['alertId']} name: {alert['name']}") + logging.info(f"Valid alert, notifying users, alertId:{alert['alertId']} name: {alert['name']}") notifications.append(generate_notification(alert, result)) except Exception as e: logging.error(f"!!!Error while running alert query for alertId:{alert['alertId']} name: {alert['name']}") From 5b663febfeef88af5dc0af0fec781a68a65b1add Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Tue, 15 Nov 2022 18:35:20 +0100 Subject: [PATCH 3/6] chore(alerts): changed log message --- ee/api/chalicelib/core/alerts_processor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ee/api/chalicelib/core/alerts_processor.py b/ee/api/chalicelib/core/alerts_processor.py index d45d3c464..087f23a05 100644 --- a/ee/api/chalicelib/core/alerts_processor.py +++ b/ee/api/chalicelib/core/alerts_processor.py @@ -201,7 +201,7 @@ def process(): cur.execute(query) result = cur.fetchone() if result["valid"]: - logging.info("Valid alert, notifying users, alertId:{alert['alertId']} name: {alert['name']}") + logging.info(f"Valid alert, notifying users, alertId:{alert['alertId']} name: {alert['name']}") notifications.append(generate_notification(alert, result)) except Exception as e: logging.error(f"!!!Error while running alert query for alertId:{alert['alertId']} name: {alert['name']}") From 00a9cf03678c2de4d342bc2d16e332a1b4f8cd25 Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Tue, 15 Nov 2022 18:36:45 +0100 Subject: [PATCH 4/6] chore(alerts): changed batch slack notify --- api/chalicelib/core/collaboration_slack.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/api/chalicelib/core/collaboration_slack.py b/api/chalicelib/core/collaboration_slack.py index 15f090f5d..5e7797430 100644 --- a/api/chalicelib/core/collaboration_slack.py +++ b/api/chalicelib/core/collaboration_slack.py @@ -99,7 +99,8 @@ class Slack: url=integration["endpoint"], json={"attachments": attachments[i:i + 100]}) if r.status_code != 200: - print("!!!! something went wrong") + print("!!!! something went wrong while sending to:") + print(integration) print(r) print(r.text) From 4e662aafd650f645ca5cd2e376e610b5e1eabdea Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Wed, 16 Nov 2022 13:05:45 +0100 Subject: [PATCH 5/6] feat(DB): remove unused request's indexes --- .../schema/db/init_dbs/postgresql/1.9.0/1.9.0.sql | 4 ++++ .../schema/db/init_dbs/postgresql/init_schema.sql | 12 +----------- .../schema/db/init_dbs/postgresql/1.9.0/1.9.0.sql | 4 ++++ .../schema/db/init_dbs/postgresql/init_schema.sql | 10 +--------- 4 files changed, 10 insertions(+), 20 deletions(-) diff --git a/ee/scripts/schema/db/init_dbs/postgresql/1.9.0/1.9.0.sql b/ee/scripts/schema/db/init_dbs/postgresql/1.9.0/1.9.0.sql index 65db23b07..3315df03f 100644 --- a/ee/scripts/schema/db/init_dbs/postgresql/1.9.0/1.9.0.sql +++ b/ee/scripts/schema/db/init_dbs/postgresql/1.9.0/1.9.0.sql @@ -70,4 +70,8 @@ WHERE deleted_at IS NOT NULL; UPDATE roles SET permissions=array_remove(permissions, 'ERRORS'); +DROP INDEX IF EXISTS events_common.requests_url_idx; +DROP INDEX IF EXISTS events_common.requests_url_gin_idx; +DROP INDEX IF EXISTS events_common.requests_url_gin_idx2; + COMMIT; \ No newline at end of file diff --git a/ee/scripts/schema/db/init_dbs/postgresql/init_schema.sql b/ee/scripts/schema/db/init_dbs/postgresql/init_schema.sql index f486c731e..78026e245 100644 --- a/ee/scripts/schema/db/init_dbs/postgresql/init_schema.sql +++ b/ee/scripts/schema/db/init_dbs/postgresql/init_schema.sql @@ -1221,19 +1221,9 @@ $$ query text NULL, PRIMARY KEY (session_id, timestamp, seq_index) ); - CREATE INDEX IF NOT EXISTS requests_url_idx ON events_common.requests (url); + CREATE INDEX IF NOT EXISTS requests_duration_idx ON events_common.requests (duration); - CREATE INDEX IF NOT EXISTS requests_url_gin_idx ON events_common.requests USING GIN (url gin_trgm_ops); CREATE INDEX IF NOT EXISTS requests_timestamp_idx ON events_common.requests (timestamp); - CREATE INDEX IF NOT EXISTS requests_url_gin_idx2 ON events_common.requests USING GIN (RIGHT(url, - length(url) - - (CASE - WHEN url LIKE 'http://%' - THEN 7 - WHEN url LIKE 'https://%' - THEN 8 - ELSE 0 END)) - gin_trgm_ops); CREATE INDEX IF NOT EXISTS requests_timestamp_session_id_failed_idx ON events_common.requests (timestamp, session_id) WHERE success = FALSE; CREATE INDEX IF NOT EXISTS requests_request_body_nn_gin_idx ON events_common.requests USING GIN (request_body gin_trgm_ops) WHERE request_body IS NOT NULL; CREATE INDEX IF NOT EXISTS requests_response_body_nn_gin_idx ON events_common.requests USING GIN (response_body gin_trgm_ops) WHERE response_body IS NOT NULL; diff --git a/scripts/schema/db/init_dbs/postgresql/1.9.0/1.9.0.sql b/scripts/schema/db/init_dbs/postgresql/1.9.0/1.9.0.sql index 638d0774b..a9ef541a5 100644 --- a/scripts/schema/db/init_dbs/postgresql/1.9.0/1.9.0.sql +++ b/scripts/schema/db/init_dbs/postgresql/1.9.0/1.9.0.sql @@ -60,4 +60,8 @@ BEGIN END; $$ LANGUAGE plpgsql; +DROP INDEX IF EXISTS events_common.requests_url_idx; +DROP INDEX IF EXISTS events_common.requests_url_gin_idx; +DROP INDEX IF EXISTS events_common.requests_url_gin_idx2; + COMMIT; \ No newline at end of file diff --git a/scripts/schema/db/init_dbs/postgresql/init_schema.sql b/scripts/schema/db/init_dbs/postgresql/init_schema.sql index c58e65d4c..a57978965 100644 --- a/scripts/schema/db/init_dbs/postgresql/init_schema.sql +++ b/scripts/schema/db/init_dbs/postgresql/init_schema.sql @@ -596,17 +596,9 @@ $$ query text NULL, PRIMARY KEY (session_id, timestamp, seq_index) ); - CREATE INDEX requests_url_idx ON events_common.requests (url); + CREATE INDEX requests_duration_idx ON events_common.requests (duration); - CREATE INDEX requests_url_gin_idx ON events_common.requests USING GIN (url gin_trgm_ops); CREATE INDEX requests_timestamp_idx ON events_common.requests (timestamp); - CREATE INDEX requests_url_gin_idx2 ON events_common.requests USING GIN (RIGHT(url, length(url) - (CASE - WHEN url LIKE 'http://%' - THEN 7 - WHEN url LIKE 'https://%' - THEN 8 - ELSE 0 END)) - gin_trgm_ops); CREATE INDEX requests_timestamp_session_id_failed_idx ON events_common.requests (timestamp, session_id) WHERE success = FALSE; CREATE INDEX requests_request_body_nn_gin_idx ON events_common.requests USING GIN (request_body gin_trgm_ops) WHERE request_body IS NOT NULL; CREATE INDEX requests_response_body_nn_gin_idx ON events_common.requests USING GIN (response_body gin_trgm_ops) WHERE response_body IS NOT NULL; From 0660e29a12d1e8120cd89347296795acbfefc025 Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Wed, 16 Nov 2022 16:25:46 +0100 Subject: [PATCH 6/6] feat(chalice): changed EFS file patterns --- api/env.default | 4 ++-- ee/api/env.default | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/env.default b/api/env.default index 82419328c..55aefdc35 100644 --- a/api/env.default +++ b/api/env.default @@ -42,8 +42,8 @@ sourcemaps_reader=http://sourcemaps-reader-openreplay.app.svc.cluster.local:9000 STAGE=default-foss version_number=1.4.0 FS_DIR=/mnt/efs -EFS_SESSION_MOB_PATTERN=%(sessionId)s/dom.mob -EFS_DEVTOOLS_MOB_PATTERN=%(sessionId)s/devtools.mob +EFS_SESSION_MOB_PATTERN=%(sessionId)s +EFS_DEVTOOLS_MOB_PATTERN=%(sessionId)sdevtools SESSION_MOB_PATTERN_S=%(sessionId)s/dom.mobs SESSION_MOB_PATTERN_E=%(sessionId)s/dom.mobe DEVTOOLS_MOB_PATTERN=%(sessionId)s/devtools.mobs diff --git a/ee/api/env.default b/ee/api/env.default index e707bec57..7fd61f4a0 100644 --- a/ee/api/env.default +++ b/ee/api/env.default @@ -61,8 +61,8 @@ EXP_ALERTS=false EXP_FUNNELS=false EXP_RESOURCES=true TRACE_PERIOD=300 -EFS_SESSION_MOB_PATTERN=%(sessionId)s/dom.mob -EFS_DEVTOOLS_MOB_PATTERN=%(sessionId)s/devtools.mob +EFS_SESSION_MOB_PATTERN=%(sessionId)s +EFS_DEVTOOLS_MOB_PATTERN=%(sessionId)sdevtools SESSION_MOB_PATTERN_S=%(sessionId)s/dom.mobs SESSION_MOB_PATTERN_E=%(sessionId)s/dom.mobe DEVTOOLS_MOB_PATTERN=%(sessionId)s/devtools.mobs