From 108023efd2335444cd351b9c0a0ab92ef23504de Mon Sep 17 00:00:00 2001
From: Georgi Matev <gmatev@alcion.ai>
Date: Wed, 23 Nov 2022 09:01:39 -0800
Subject: [PATCH] Improve Rudderstack event logging (#1593)

## Description

* Fire of Identify event on RepoInit to identify user for analytics tools
* Flatten Payload structure for better mapping to analytics tools
* Snake case convention for event properties

## Type of change

<!--- Please check the type of change your PR introduces: --->
- [x] :sunflower: Feature
- [ ] :bug: Bugfix
- [ ] :world_map: Documentation
- [ ] :robot: Test
- [ ] :computer: CI/Deployment
- [ ] :hamster: Trivial/Minor

## Issue(s)

<!-- Can reference multiple issues. Use one of the following "magic words" - "closes, fixes" to auto-close the Github issue. -->

## Test Plan

<!-- How will this be tested prior to merging.-->
- [x] :muscle: Manual
- [ ] :zap: Unit test
- [ ] :green_heart: E2E
---
 src/internal/events/events.go | 49 +++++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 19 deletions(-)

diff --git a/src/internal/events/events.go b/src/internal/events/events.go
index 600db9001..dd1015666 100644
--- a/src/internal/events/events.go
+++ b/src/internal/events/events.go
@@ -17,30 +17,29 @@ import (
 
 // keys for ease of use
 const (
-	corsoVersion = "corso-version"
-	repoID       = "repo-id"
-	payload      = "payload"
+	corsoVersion = "corso_version"
+	repoID       = "repo_id"
 
 	// Event Keys
-	RepoInit     = "repo-init"
-	BackupStart  = "backup-start"
-	BackupEnd    = "backup-end"
-	RestoreStart = "restore-start"
-	RestoreEnd   = "restore-end"
+	RepoInit     = "repo_init"
+	BackupStart  = "backup_start"
+	BackupEnd    = "backup_end"
+	RestoreStart = "restore_start"
+	RestoreEnd   = "restore_end"
 
 	// Event Data Keys
-	BackupCreateTime = "backup-creation-time"
-	BackupID         = "backup-id"
-	DataRetrieved    = "data-retrieved"
-	DataStored       = "data-stored"
+	BackupCreateTime = "backup_creation_time"
+	BackupID         = "backup_id"
+	DataRetrieved    = "data_retrieved"
+	DataStored       = "data_stored"
 	Duration         = "duration"
-	EndTime          = "end-time"
-	ItemsRead        = "items-read"
-	ItemsWritten     = "items-written"
+	EndTime          = "end_time"
+	ItemsRead        = "items_read"
+	ItemsWritten     = "items_written"
 	Resources        = "resources"
-	RestoreID        = "restore-id"
+	RestoreID        = "restore_id"
 	Service          = "service"
-	StartTime        = "start-time"
+	StartTime        = "start_time"
 	Status           = "status"
 )
 
@@ -120,8 +119,20 @@ func (b Bus) Event(ctx context.Context, key string, data map[string]any) {
 		Set(repoID, b.repoID).
 		Set(corsoVersion, b.version)
 
-	if len(data) > 0 {
-		props.Set(payload, data)
+	for k, v := range data {
+		props.Set(k, v)
+	}
+
+	// need to setup identity when initializing a new repo
+	if key == RepoInit {
+		err := b.client.Enqueue(analytics.Identify{
+			UserId: b.repoID,
+			Traits: analytics.NewTraits().
+				SetName(b.repoID),
+		})
+		if err != nil {
+			logger.Ctx(ctx).Debugw("analytics event failure", "err", err)
+		}
 	}
 
 	err := b.client.Enqueue(analytics.Track{