From 6c891cb131eff388c21362d400088a9aecdefa35 Mon Sep 17 00:00:00 2001 From: Alexander Date: Thu, 13 Mar 2025 17:25:53 +0100 Subject: [PATCH] feat(db): removed js exception tags in CH --- backend/pkg/db/clickhouse/connector.go | 15 ++++----------- backend/pkg/db/postgres/events.go | 5 ----- backend/pkg/db/types/error-event.go | 4 +--- 3 files changed, 5 insertions(+), 19 deletions(-) diff --git a/backend/pkg/db/clickhouse/connector.go b/backend/pkg/db/clickhouse/connector.go index d9087b1c2..5b11c254a 100644 --- a/backend/pkg/db/clickhouse/connector.go +++ b/backend/pkg/db/clickhouse/connector.go @@ -501,11 +501,6 @@ func (c *connectorImpl) InsertWebClickEvent(session *sessions.Session, msg *mess } func (c *connectorImpl) InsertWebErrorEvent(session *sessions.Session, msg *types.ErrorEvent) error { - keys, values := make([]string, 0, len(msg.Tags)), make([]*string, 0, len(msg.Tags)) - for k, v := range msg.Tags { - keys = append(keys, k) - values = append(values, v) - } // Check error source before insert to avoid panic from clickhouse lib switch msg.Source { case "js_exception", "bugsnag", "cloudwatch", "datadog", "elasticsearch", "newrelic", "rollbar", "sentry", "stackdriver", "sumologic": @@ -514,12 +509,10 @@ func (c *connectorImpl) InsertWebErrorEvent(session *sessions.Session, msg *type } msgID, _ := msg.ID(session.ProjectID) jsonString, err := json.Marshal(map[string]interface{}{ - "source": msg.Source, - "name": nullableString(msg.Name), - "message": msg.Message, - "error_id": msgID, - "error_tags_keys": keys, - "error_tags_values": values, + "source": msg.Source, + "name": nullableString(msg.Name), + "message": msg.Message, + "error_id": msgID, }) if err != nil { return fmt.Errorf("can't marshal error event: %s", err) diff --git a/backend/pkg/db/postgres/events.go b/backend/pkg/db/postgres/events.go index cad2b1ebd..8a61e8140 100644 --- a/backend/pkg/db/postgres/events.go +++ b/backend/pkg/db/postgres/events.go @@ -181,11 +181,6 @@ func (conn *Conn) InsertWebErrorEvent(sess *sessions.Session, e *types.ErrorEven if err := conn.bulks.Get("webErrorEvents").Append(sess.SessionID, truncSqIdx(e.MessageID), e.Timestamp, errorID); err != nil { conn.log.Error(sessCtx, "insert web error event err: %s", err) } - for key, value := range e.Tags { - if err := conn.bulks.Get("webErrorTags").Append(sess.SessionID, truncSqIdx(e.MessageID), errorID, key, value); err != nil { - conn.log.Error(sessCtx, "insert web error token err: %s", err) - } - } return nil } diff --git a/backend/pkg/db/types/error-event.go b/backend/pkg/db/types/error-event.go index 5fdb4e9ff..df137347a 100644 --- a/backend/pkg/db/types/error-event.go +++ b/backend/pkg/db/types/error-event.go @@ -61,7 +61,6 @@ func parseTags(tagsJSON string) (tags map[string]*string, err error) { } func WrapJSException(m *JSException) (*ErrorEvent, error) { - meta, err := parseTags(m.Metadata) return &ErrorEvent{ MessageID: m.Meta().Index, Timestamp: m.Meta().Timestamp, @@ -69,9 +68,8 @@ func WrapJSException(m *JSException) (*ErrorEvent, error) { Name: m.Name, Message: m.Message, Payload: m.Payload, - Tags: meta, OriginType: m.TypeID(), - }, err + }, nil } func WrapIntegrationEvent(m *IntegrationEvent) *ErrorEvent {