Remove metadata from starrocks user_events

yorkie-team · Feb 9, 2025 · 0462630 · 0462630
1 parent 8c38ed1
commit 0462630
Show file tree

Hide file tree

Showing 6 changed files with 166 additions and 180 deletions.
diff --git a/api/docs/yorkie/v1/yorkie.openapi.yaml b/api/docs/yorkie/v1/yorkie.openapi.yaml
@@ -292,11 +292,6 @@ components:
           description: ""
           title: metadata
           type: object
-        userId:
-          additionalProperties: false
-          description: ""
-          title: user_id
-          type: string
       title: ActivateClientRequest
       type: object
     yorkie.v1.ActivateClientRequest.MetadataEntry:

diff --git a/api/yorkie/v1/yorkie.pb.go b/api/yorkie/v1/yorkie.pb.go
diff --git a/api/yorkie/v1/yorkie.proto b/api/yorkie/v1/yorkie.proto
@@ -41,8 +41,7 @@ service YorkieService {
 
 message ActivateClientRequest {
   string client_key = 1;
-  string user_id = 2;
-  map<string, string> metadata = 3;
+  map<string, string> metadata = 2;
 }
 
 message ActivateClientResponse {

diff --git a/build/docker/analytics/init-user-events-db.sql b/build/docker/analytics/init-user-events-db.sql
@@ -7,8 +7,7 @@ CREATE TABLE user_events (
     timestamp DATETIME, 
     event_type VARCHAR(32),
     project_id VARCHAR(64),
-    user_agent VARCHAR(32),
-    metadata JSON
+    user_agent VARCHAR(32)
 ) ENGINE = OLAP  
 DUPLICATE KEY(user_id)  
 DISTRIBUTED BY HASH(user_id) BUCKETS 10

diff --git a/server/backend/messagebroker/messagebroker.go b/server/backend/messagebroker/messagebroker.go
@@ -39,7 +39,7 @@ type UserEventMessage struct {
 	EventType events.ClientEventType `json:"event_type"`
 	ProjectID string                 `json:"project_id"`
 	UserAgent string                 `json:"user_agent"`
-	Metadata  map[string]string      `json:"metadata"`
+	// Metadata  map[string]string      `json:"metadata"`
 }
 
 // Marshal marshals the user event message to JSON.

diff --git a/server/rpc/yorkie_server.go b/server/rpc/yorkie_server.go
@@ -64,8 +64,11 @@ func (s *yorkieServer) ActivateClient(
 		return nil, clients.ErrInvalidClientKey
 	}
 
-	if req.Msg.UserId == "" {
-		req.Msg.UserId = req.Msg.ClientKey
+	logging.DefaultLogger().Error(req.Msg.Metadata)
+
+	userId, exist := req.Msg.Metadata["userId"]
+	if !exist {
+		userId = req.Msg.ClientKey
 	}
 
 	if err := auth.VerifyAccess(ctx, s.backend, &types.AccessInfo{
@@ -75,20 +78,19 @@ func (s *yorkieServer) ActivateClient(
 	}
 
 	project := projects.From(ctx)
-	cli, err := clients.Activate(ctx, s.backend, project, req.Msg.ClientKey, req.Msg.UserId)
+	cli, err := clients.Activate(ctx, s.backend, project, req.Msg.ClientKey, userId)
 	if err != nil {
 		return nil, err
 	}
 
 	if err := s.backend.MsgBroker.Produce(
 		ctx,
 		messagebroker.UserEventMessage{
-			UserID:    req.Msg.UserId,
+			UserID:    userId,
 			Timestamp: gotime.Now(),
 			EventType: events.ClientActivatedEvent,
 			ProjectID: project.ID.String(),
 			UserAgent: req.Header().Get("x-yorkie-user-agent"),
-			Metadata:  req.Msg.Metadata,
 		},
 	); err != nil {
 		logging.From(ctx).Error(err)