From 36b6dfb5bd704aafde18db80bf4903bb2402b6f5 Mon Sep 17 00:00:00 2001
From: Alexander <zavorotynskiy@pm.me>
Date: Thu, 14 Mar 2024 17:17:50 +0100
Subject: [PATCH] feat(backend): fixed no sessID in storage service

---
 backend/cmd/storage/main.go                             | 3 ++-
 backend/pkg/messages/read-message.go                    | 2 +-
 ee/backend/pkg/failover/failover.go                     | 2 +-
 mobs/templates/backend~pkg~messages~read-message.go.erb | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/backend/cmd/storage/main.go b/backend/cmd/storage/main.go
index 2209f9058..afa5787de 100644
--- a/backend/cmd/storage/main.go
+++ b/backend/cmd/storage/main.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+	"fmt"
 	"os"
 	"os/signal"
 	"syscall"
@@ -55,7 +56,7 @@ func main() {
 					}
 					msg.Meta().SetMeta(oldMeta)
 				}
-				sessCtx := context.WithValue(context.Background(), "sessionID", msg.SessionID())
+				sessCtx := context.WithValue(context.Background(), "sessionID", fmt.Sprintf("%d", msg.SessionID()))
 				// Process session to save mob files to s3
 				sesEnd := msg.(*messages.SessionEnd)
 				if err := srv.Process(sessCtx, sesEnd); err != nil {
diff --git a/backend/pkg/messages/read-message.go b/backend/pkg/messages/read-message.go
index 05a937c1d..0b7ca5c90 100644
--- a/backend/pkg/messages/read-message.go
+++ b/backend/pkg/messages/read-message.go
@@ -2089,5 +2089,5 @@ func ReadMessage(t uint64, reader BytesReader) (Message, error) {
 	case 111:
 		return DecodeIOSIssueEvent(reader)
 	}
-	return nil, fmt.Errorf("Unknown message code: %v", t)
+	return nil, fmt.Errorf("unknown message code: %v", t)
 }
diff --git a/ee/backend/pkg/failover/failover.go b/ee/backend/pkg/failover/failover.go
index 2815bd70b..52a089917 100644
--- a/ee/backend/pkg/failover/failover.go
+++ b/ee/backend/pkg/failover/failover.go
@@ -96,7 +96,7 @@ func (s *sessionFinderImpl) worker() {
 func (s *sessionFinderImpl) findSession(sessionID, timestamp, partition uint64) {
 	sessEnd := &messages.SessionEnd{Timestamp: timestamp}
 	sessEnd.SetSessionID(sessionID)
-	ctx := context.WithValue(context.Background(), "sessionID", sessionID)
+	ctx := context.WithValue(context.Background(), "sessionID", fmt.Sprintf("%d", sessionID))
 	err := s.storage.Process(ctx, sessEnd)
 	if err == nil {
 		s.log.Info(ctx, "found session in partition: %d, original: %d",
diff --git a/mobs/templates/backend~pkg~messages~read-message.go.erb b/mobs/templates/backend~pkg~messages~read-message.go.erb
index f871f1cea..fe9777d8c 100644
--- a/mobs/templates/backend~pkg~messages~read-message.go.erb
+++ b/mobs/templates/backend~pkg~messages~read-message.go.erb
@@ -20,5 +20,5 @@ func ReadMessage(t uint64, reader BytesReader) (Message, error) {
 	case <%= msg.id %>:
 		return Decode<%= msg.name %>(reader)<% end %>
 	}
-	return nil, fmt.Errorf("Unknown message code: %v", t)
+	return nil, fmt.Errorf("unknown message code: %v", t)
 }