From 75ccacf576de8b87e6d2c1f0d52f4040fb0f04cf Mon Sep 17 00:00:00 2001
From: Alexander <zavorotynskiy@pm.me>
Date: Fri, 5 Apr 2024 09:42:55 +0200
Subject: [PATCH] feat(backend): added missing sessionID to log in start
 request + batch info

---
 backend/internal/http/router/handlers-web.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/backend/internal/http/router/handlers-web.go b/backend/internal/http/router/handlers-web.go
index 9e3361975..a9082ab7f 100644
--- a/backend/internal/http/router/handlers-web.go
+++ b/backend/internal/http/router/handlers-web.go
@@ -254,6 +254,8 @@ func (e *Router) startSessionHandlerWeb(w http.ResponseWriter, r *http.Request)
 				e.log.Error(r.Context(), "can't send sessionStart to queue: %s", err)
 			}
 		}
+	} else {
+		r = r.WithContext(context.WithValue(r.Context(), "sessionID", fmt.Sprintf("%d", tokenData.ID)))
 	}
 
 	// Save information about session beacon size
@@ -284,6 +286,10 @@ func (e *Router) pushMessagesHandlerWeb(w http.ResponseWriter, r *http.Request)
 	startTime := time.Now()
 	bodySize := 0
 
+	// Get debug header with batch info
+	batch := r.Header.Get("X-Openreplay-Batch")
+	r = r.WithContext(context.WithValue(r.Context(), "batch", batch))
+
 	// Check authorization
 	sessionData, err := e.services.Tokenizer.ParseFromHTTPRequest(r)
 	if sessionData != nil {