diff --git a/ee/backend/cmd/connector/main.go b/ee/backend/cmd/connector/main.go index 5e9f6d3de..e6924ffd2 100644 --- a/ee/backend/cmd/connector/main.go +++ b/ee/backend/cmd/connector/main.go @@ -11,6 +11,8 @@ import ( "openreplay/backend/pkg/logger" "openreplay/backend/pkg/memory" "openreplay/backend/pkg/messages" + "openreplay/backend/pkg/metrics" + "openreplay/backend/pkg/metrics/database" "openreplay/backend/pkg/objectstorage/store" "openreplay/backend/pkg/projects" "openreplay/backend/pkg/queue" @@ -22,6 +24,9 @@ func main() { ctx := context.Background() log := logger.New() cfg := config.New(log) + // Observability + dbMetrics := database.New("connector") + metrics.New(log, dbMetrics.List()) objStore, err := store.NewStore(&cfg.ObjectsConfig) if err != nil { @@ -56,7 +61,7 @@ func main() { defer db.Close() // Init postgres connection - pgConn, err := pool.New(cfg.Postgres.String()) + pgConn, err := pool.New(dbMetrics, cfg.Postgres.String()) if err != nil { log.Fatal(ctx, "can't init postgres connection: %s", err) } @@ -69,10 +74,8 @@ func main() { } defer redisClient.Close() - projManager := projects.New(log, pgConn, redisClient) - sessManager := sessions.New(log, pgConn, projManager, redisClient) - - // Saves messages to Redshift + projManager := projects.New(log, pgConn, redisClient, dbMetrics) + sessManager := sessions.New(log, pgConn, projManager, redisClient, dbMetrics) dataSaver := saver.New(log, cfg, db, sessManager, projManager) // Message filter @@ -80,8 +83,7 @@ func main() { messages.MsgNetworkRequest, messages.MsgIssueEvent, messages.MsgCustomIssue, messages.MsgSessionStart, messages.MsgSessionEnd, messages.MsgConnectionInformation, messages.MsgMetadata, messages.MsgPageEvent, messages.MsgPerformanceTrackAggr, messages.MsgUserID, - messages.MsgUserAnonymousID, messages.MsgJSException, messages.MsgJSExceptionDeprecated, - messages.MsgInputEvent, messages.MsgMouseClick, messages.MsgIssueEventDeprecated, + messages.MsgUserAnonymousID, messages.MsgJSException, messages.MsgInputEvent, messages.MsgMouseClick, // Mobile messages messages.MsgMobileSessionStart, messages.MsgMobileSessionEnd, messages.MsgMobileUserID, messages.MsgMobileUserAnonymousID, messages.MsgMobileMetadata, messages.MsgMobileEvent, messages.MsgMobileNetworkCall, diff --git a/ee/backend/pkg/connector/saver.go b/ee/backend/pkg/connector/saver.go index b8a92e431..97ef6f6bf 100644 --- a/ee/backend/pkg/connector/saver.go +++ b/ee/backend/pkg/connector/saver.go @@ -269,8 +269,7 @@ func (s *Saver) handleSession(msg messages.Message) { switch msg.(type) { case *messages.SessionStart, *messages.SessionEnd, *messages.ConnectionInformation, *messages.Metadata, *messages.PageEvent, *messages.PerformanceTrackAggr, *messages.UserID, *messages.UserAnonymousID, - *messages.JSException, *messages.JSExceptionDeprecated, *messages.InputEvent, *messages.MouseClick, - *messages.IssueEvent, *messages.IssueEventDeprecated, + *messages.JSException, *messages.InputEvent, *messages.MouseClick, *messages.IssueEvent, // Mobile messages *messages.MobileSessionStart, *messages.MobileSessionEnd, *messages.MobileUserID, *messages.MobileUserAnonymousID, *messages.MobileMetadata: @@ -369,7 +368,7 @@ func (s *Saver) handleSession(msg messages.Message) { } case *messages.UserAnonymousID: sess["user_anonymous_id"] = QUOTES(m.ID) - case *messages.JSException, *messages.JSExceptionDeprecated: + case *messages.JSException: currExceptionsCount, err := strconv.Atoi(sess["js_exceptions_count"]) if err != nil { currExceptionsCount = 0 @@ -387,7 +386,7 @@ func (s *Saver) handleSession(msg messages.Message) { currMouseClicksCount = 0 } sess["clicks_count"] = fmt.Sprintf("%d", currMouseClicksCount+1) - case *messages.IssueEvent, *messages.IssueEventDeprecated: + case *messages.IssueEvent: currIssuesCount, err := strconv.Atoi(sess["issues_count"]) if err != nil { currIssuesCount = 0