fixes after review

Author: callmedenchick

internal/analytics/collector.go

@@ -57,6 +57,15 @@ func (c *Collector) Run(ctx context.Context) {
 	for {
 		select {
 		case <-ctx.Done():
+			logrus.WithField("prefix", "analytics").Debug("analytics collector stopping, performing final flush")
+			events := c.collector.PopAll()
+			if len(events) > 0 {
+				logrus.WithField("prefix", "analytics").Debugf("final flush: sending %d events from collector", len(events))
+				// Use background context for final flush since original context is done
+				if err := c.sender.SendBatch(context.Background(), events); err != nil {
+					logrus.WithError(err).Warnf("analytics: failed to send final batch of %d events", len(events))
+				}
+			}
 			logrus.WithField("prefix", "analytics").Debug("analytics collector stopped")
 			return
 		case <-c.collector.Notify():

internal/analytics/event.go

@@ -104,10 +104,10 @@ func (a *AnalyticEventBuilder) NewBridgeMessageSentEvent(clientID, traceID strin
 	}
 }
 
-// NewBridgeMessageReceivedEvent builds a bridge message received event (wallet-connect-request-received).
+// NewBridgeMessageReceivedEvent builds a bridge message received event.
 func (a *AnalyticEventBuilder) NewBridgeMessageReceivedEvent(clientID, traceID, requestType string, messageID int64, messageHash string) tonmetrics.BridgeMessageReceivedEvent {
 	timestamp := int(time.Now().Unix())
-	eventName := tonmetrics.BridgeMessageReceivedEventEventNameWalletConnectRequestReceived
+	eventName := tonmetrics.BridgeMessageReceivedEventEventNameBridgeMessageReceived
 	environment := tonmetrics.BridgeMessageReceivedEventClientEnvironment(a.environment)
 	subsystem := tonmetrics.BridgeMessageReceivedEventSubsystem(a.subsystem)
 	messageIDStr := fmt.Sprintf("%d", messageID)

internal/v1/handler/handler.go

@@ -207,8 +207,12 @@ func (h *handler) EventRegistrationHandler(c echo.Context) error {
 
 		// Parse the message, add BridgeConnectSource, keep it for later logging
 		var bridgeMsg models.BridgeMessage
+		fromID := "unknown"
+		traceID := ""
 		messageToSend := msg.Message
 		if err := json.Unmarshal(msg.Message, &bridgeMsg); err == nil {
+			fromID = bridgeMsg.From
+			traceID = bridgeMsg.TraceId
 			bridgeMsg.BridgeConnectSource = models.BridgeConnectSource{
 				IP: connectIP,
 			}
@@ -236,16 +240,16 @@ func (h *handler) EventRegistrationHandler(c echo.Context) error {
 
 			logrus.WithFields(logrus.Fields{
 				"hash":     messageHash,
-				"from":     bridgeMsg.From,
+				"from":     fromID,
 				"to":       msg.To,
 				"event_id": msg.EventId,
-				"trace_id": bridgeMsg.TraceId,
+				"trace_id": traceID,
 			}).Debug("message sent")
 
 			if h.eventCollector != nil {
 				_ = h.eventCollector.TryAdd(h.eventBuilder.NewBridgeMessageSentEvent(
 					msg.To,
-					bridgeMsg.TraceId,
+					traceID,
 					msg.EventId,
 					messageHash,
 				))
@@ -448,7 +452,7 @@ func (h *handler) SendMessageHandler(c echo.Context) error {
 		"from":     fromId,
 		"to":       toId[0],
 		"event_id": sseMessage.EventId,
-		"trace_id": bridgeMsg.TraceId,
+		"trace_id": traceId,
 	}).Debug("message received")
 
 	if h.eventCollector != nil {

internal/v3/handler/handler.go

@@ -210,13 +210,15 @@ loop:
 
 			fromId := "unknown"
 			toId := msg.To
+			traceID := ""
 
 			hash := sha256.Sum256(msg.Message)
 			messageHash := hex.EncodeToString(hash[:])
 
 			var bridgeMsg models.BridgeMessage
 			if err := json.Unmarshal(msg.Message, &bridgeMsg); err == nil {
 				fromId = bridgeMsg.From
+				traceID = bridgeMsg.TraceId
 				contentHash := sha256.Sum256([]byte(bridgeMsg.Message))
 				messageHash = hex.EncodeToString(contentHash[:])
 			}
@@ -226,13 +228,13 @@ loop:
 				"from":     fromId,
 				"to":       toId,
 				"event_id": msg.EventId,
-				"trace_id": bridgeMsg.TraceId,
+				"trace_id": traceID,
 			}).Debug("message sent")
 
 			if h.eventCollector != nil {
 				_ = h.eventCollector.TryAdd(h.eventBuilder.NewBridgeMessageSentEvent(
 					msg.To,
-					bridgeMsg.TraceId,
+					traceID,
 					msg.EventId,
 					messageHash,
 				))
@@ -389,7 +391,7 @@ func (h *handler) SendMessageHandler(c echo.Context) error {
 		"from":     fromId,
 		"to":       toId[0],
 		"event_id": sseMessage.EventId,
-		"trace_id": bridgeMsg.TraceId,
+		"trace_id": traceId,
 	}).Debug("message received")
 
 	if h.eventCollector != nil {

tonmetrics/bridge_events.gen.go

@@ -667,6 +667,12 @@
             "type": "integer",
             "example": 0
           },
+          "encrypted_message_hash": {
+            "description": "Bridge encrypted message hash.",
+            "type": "string",
+            "format": "base64",
+            "example": "ZXhhbXBsZQ=="
+          },
           "event_id": {
             "description": "Unique random event UUID generated by the sender. Used for deduplication on the backend side.",
             "type": "string",
@@ -676,7 +682,7 @@
             "type": "string",
             "enum": [
               "",
-              "wallet-connect-request-received"
+              "bridge-message-received"
             ]
           },
           "message_id": {

tonmetrics/swagger-tonconnect-bridge.json

@@ -1905,6 +1905,12 @@
                     "type": "integer",
                     "example": 0
                 },
+                "encrypted_message_hash": {
+                    "description": "Bridge encrypted message hash.",
+                    "type": "string",
+                    "format": "base64",
+                    "example": "ZXhhbXBsZQ=="
+                },
                 "event_id": {
                     "description": "Unique random event UUID generated by the sender. Used for deduplication on the backend side.",
                     "type": "string",
@@ -1914,7 +1920,7 @@
                     "type": "string",
                     "enum": [
                         "",
-                        "wallet-connect-request-received"
+                        "bridge-message-received"
                     ]
                 },
                 "message_id": {