diff --git a/backend/cmd/integrations/main.go b/backend/cmd/integrations/main.go index 90137b5b8..fd06a14c3 100644 --- a/backend/cmd/integrations/main.go +++ b/backend/cmd/integrations/main.go @@ -84,8 +84,7 @@ func main() { } sessionID = sessData.ID } - // TODO: send to ready-events topic. Otherwise it have to go through the events worker. - producer.Produce(cfg.TopicRawWeb, sessionID, messages.Encode(event.IntegrationEvent)) + producer.Produce(cfg.TopicAnalytics, sessionID, messages.Encode(event.IntegrationEvent)) case err := <-manager.Errors: log.Printf("Integration error: %v\n", err) case i := <-manager.RequestDataUpdates: diff --git a/backend/internal/config/integrations/config.go b/backend/internal/config/integrations/config.go index 037b26f68..290acde1d 100644 --- a/backend/internal/config/integrations/config.go +++ b/backend/internal/config/integrations/config.go @@ -10,8 +10,8 @@ type Config struct { func New() *Config { return &Config{ - TopicRawWeb: env.String("TOPIC_RAW_WEB"), - PostgresURI: env.String("POSTGRES_STRING"), - TokenSecret: env.String("TOKEN_SECRET"), + TopicAnalytics: env.String("TOPIC_ANALYTICS"), + PostgresURI: env.String("POSTGRES_STRING"), + TokenSecret: env.String("TOKEN_SECRET"), } } diff --git a/backend/internal/db/datasaver/messages.go b/backend/internal/db/datasaver/messages.go index 43b960140..4197ffb77 100644 --- a/backend/internal/db/datasaver/messages.go +++ b/backend/internal/db/datasaver/messages.go @@ -42,6 +42,15 @@ func (mi *Saver) InsertMessage(sessionID uint64, msg Message) error { return mi.pg.InsertWebFetchEvent(sessionID, m) case *GraphQLEvent: return mi.pg.InsertWebGraphQLEvent(sessionID, m) + case *IntegrationEvent: + return mi.pg.InsertWebErrorEvent(sessionID, &ErrorEvent{ + MessageID: m.Meta().Index, + Timestamp: m.Timestamp, + Source: m.Source, + Name: m.Name, + Message: m.Message, + Payload: m.Payload, + }) // IOS case *IOSSessionStart: @@ -66,15 +75,6 @@ func (mi *Saver) InsertMessage(sessionID uint64, msg Message) error { case *IOSCrash: return mi.pg.InsertIOSCrash(sessionID, m) - case *IntegrationEvent: - return mi.pg.InsertWebErrorEvent(sessionID, &ErrorEvent{ - MessageID: m.Meta().Index, // TODO: is it possible to catch panic here??? - Timestamp: m.Timestamp, - Source: m.Source, - Name: m.Name, - Message: m.Message, - Payload: m.Payload, - }) } return nil // "Not implemented" }