From e20a9483d214f358bf69b677168c1b39ef3347f9 Mon Sep 17 00:00:00 2001
From: Jacek Migdal <jacek@quesma.com>
Date: Thu, 2 May 2024 14:40:43 +0200
Subject: [PATCH 1/6] Fix going back to live tail

---
 quesma/quesma/ui/html_pages.go | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/quesma/quesma/ui/html_pages.go b/quesma/quesma/ui/html_pages.go
index 111a5055e..f0fda392a 100644
--- a/quesma/quesma/ui/html_pages.go
+++ b/quesma/quesma/ui/html_pages.go
@@ -441,7 +441,7 @@ func (qmc *QuesmaManagementConsole) generateDatasources() []byte {
 	buffer.Html(`<div class="menu">`)
 	buffer.Html("\n<h2>Menu</h2>")
 
-	buffer.Html(`<form action="/">&nbsp;<input class="btn" type="submit" value="Back to live tail" /></form>`)
+	buffer.Html(`<form action="/live">&nbsp;<input class="btn" type="submit" value="Back to live tail" /></form>`)
 
 	buffer.Html("\n</div>")
 
@@ -461,7 +461,7 @@ func (qmc *QuesmaManagementConsole) generateRouterStatisticsLiveTail() []byte {
 	buffer.Html(`<div class="menu">`)
 	buffer.Html("\n<h2>Menu</h2>")
 
-	buffer.Html(`<form action="/">&nbsp;<input class="btn" type="submit" value="Back to live tail" /></form>`)
+	buffer.Html(`<form action="/">&nbsp;<input class="btn" type="submit" value="Back to dashboard" /></form>`)
 
 	buffer.Html("\n</div>")
 
@@ -481,7 +481,7 @@ func (qmc *QuesmaManagementConsole) generateStatisticsLiveTail() []byte {
 	buffer.Html(`<div class="menu">`)
 	buffer.Html("\n<h2>Menu</h2>")
 
-	buffer.Html(`<form action="/">&nbsp;<input class="btn" type="submit" value="Back to live tail" /></form>`)
+	buffer.Html(`<form action="/">&nbsp;<input class="btn" type="submit" value="Back to dashboard" /></form>`)
 
 	buffer.Html("\n</div>")
 
@@ -632,7 +632,6 @@ func (qmc *QuesmaManagementConsole) generateDashboard() []byte {
 	buffer.Html(`<li><a href="http://localhost:5601/app/observability-log-explorer/">Kibana Log Explorer</a></li>`)
 	buffer.Html(`<li><a href="http://localhost:8081">mitmproxy</a></li>`)
 	buffer.Html(`<li><a href="http://localhost:8123/play">Clickhouse</a></li>`)
-	buffer.Html(`<li><a href="/ingest-statistics">Ingest statistics</a></li>`)
 	buffer.Html(`</ul>`)
 
 	buffer.Html("\n</div>")
@@ -668,7 +667,7 @@ func (qmc *QuesmaManagementConsole) generateReportForRequestId(requestId string)
 	buffer.Html(`<div class="menu">`)
 	buffer.Html("\n<h2>Menu</h2>")
 
-	buffer.Html(`<form action="/">&nbsp;<input class="btn" type="submit" value="Back to live tail" /></form>`)
+	buffer.Html(`<form action="/live">&nbsp;<input class="btn" type="submit" value="Back to live tail" /></form>`)
 	if requestFound {
 		buffer.Html(`<ul>`)
 		if request.errorLogCount > 0 {
@@ -723,9 +722,9 @@ func (qmc *QuesmaManagementConsole) generateLogForRequestId(requestId string) []
 	buffer.Html(`<div class="menu">`)
 	buffer.Html("\n<h2>Menu</h2>")
 
-	buffer.Html(`<form action="/">&nbsp;<input class="btn" type="submit" value="Back to live tail" /></form>`)
+	buffer.Html(`<form action="/live">&nbsp;<input class="btn" type="submit" value="Back to live tail" /></form>`)
 	buffer.Html(`<br>`)
-	buffer.Html(`<form action="/request-Id/`).Text(requestId).Html(`">&nbsp;<input class="btn" type="submit" value="Back to request info" /></form>`)
+	buffer.Html(`<form action="/request-id/`).Text(requestId).Html(`">&nbsp;<input class="btn" type="submit" value="Back to request info" /></form>`)
 
 	buffer.Html("\n</div>")
 	buffer.Html("\n</body>")
@@ -876,7 +875,7 @@ func (qmc *QuesmaManagementConsole) generateReportForRequests(title string, requ
 	buffer.Html(`<div class="menu">`)
 	buffer.Html("\n<h2>Menu</h2>")
 
-	buffer.Html(`<form action="/">&nbsp;<input class="btn" type="submit" value="Back to live tail" /></form>`)
+	buffer.Html(`<form action="/live">&nbsp;<input class="btn" type="submit" value="Back to live tail" /></form>`)
 
 	buffer.Html("\n</div>")
 	buffer.Html("\n</body>")
@@ -903,7 +902,7 @@ func (qmc *QuesmaManagementConsole) generateErrorForReason(reason string) []byte
 	buffer.Html(`<div class="menu">`)
 	buffer.Html("\n<h2>Menu</h2>")
 
-	buffer.Html(`<form action="/dashboard">&nbsp;<input class="btn" type="submit" value="Back to dashboard" /></form>`)
+	buffer.Html(`<form action="/">&nbsp;<input class="btn" type="submit" value="Back to dashboard" /></form>`)
 	// TODO: implement
 	// buffer.Html(`<form action="/dashboard">&nbsp;<input class="btn" type="submit" value="See requests with errors" /></form>`)
 	buffer.Html("\n</div>")

From d10a22556f5cb76de53a580388f1edb65f5354bd Mon Sep 17 00:00:00 2001
From: Jacek Migdal <jacek@quesma.com>
Date: Thu, 2 May 2024 14:47:42 +0200
Subject: [PATCH 2/6] Add colors to log tab

---
 quesma/quesma/ui/html_pages.go | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/quesma/quesma/ui/html_pages.go b/quesma/quesma/ui/html_pages.go
index f0fda392a..f4c67d52c 100644
--- a/quesma/quesma/ui/html_pages.go
+++ b/quesma/quesma/ui/html_pages.go
@@ -780,7 +780,14 @@ func generateLogMessages(logMessages []string) ([]byte, *string) {
 		// level
 		buffer.Html(`<td class="level">`)
 		if level, ok := fields["level"].(string); ok {
-			buffer.Text(level).Html("</td>")
+			if level == "error" {
+				buffer.Html(`<span class="debug-error-log">`)
+			} else if level == "warn" {
+				buffer.Html(`<span class="debug-warn-log">`)
+			} else {
+				buffer.Html(`<span>`)
+			}
+			buffer.Text(level).Html("</span></td>")
 			delete(fields, "level")
 		} else {
 			buffer.Html("missing level</td>")

From 2849bd6837d28febdfa02dd0a36319f0bd93d65c Mon Sep 17 00:00:00 2001
From: Jacek Migdal <jacek@quesma.com>
Date: Thu, 2 May 2024 14:50:53 +0200
Subject: [PATCH 3/6] Fix result reporting

---
 quesma/quesma/search.go | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/quesma/quesma/search.go b/quesma/quesma/search.go
index 655babaee..5ced17fa4 100644
--- a/quesma/quesma/search.go
+++ b/quesma/quesma/search.go
@@ -314,13 +314,6 @@ func (q *QueryRunner) handleSearchCommon(ctx context.Context, cfg config.QuesmaC
 func (q *QueryRunner) storeAsyncSearch(qmc *ui.QuesmaManagementConsole, id, asyncRequestIdStr string,
 	startTime time.Time, body []byte, result AsyncSearchWithError, keep bool) (responseBody []byte, err error) {
 	took := time.Since(startTime)
-	defer qmc.PushSecondaryInfo(&ui.QueryDebugSecondarySource{
-		Id:                     id,
-		IncomingQueryBody:      body,
-		QueryBodyTranslated:    result.translatedQueryBody,
-		QueryTranslatedResults: responseBody,
-		SecondaryTook:          took,
-	})
 	if result.err != nil {
 		if keep {
 			q.AsyncRequestStorage.Store(asyncRequestIdStr, AsyncRequestResult{err: result.err, added: time.Now(),
@@ -328,10 +321,24 @@ func (q *QueryRunner) storeAsyncSearch(qmc *ui.QuesmaManagementConsole, id, asyn
 		}
 		responseBody, _ = queryparser.EmptyAsyncSearchResponse(asyncRequestIdStr, false, 503)
 		err = result.err
+		qmc.PushSecondaryInfo(&ui.QueryDebugSecondarySource{
+			Id:                     id,
+			IncomingQueryBody:      body,
+			QueryBodyTranslated:    result.translatedQueryBody,
+			QueryTranslatedResults: responseBody,
+			SecondaryTook:          took,
+		})
 		return
 	}
 	asyncResponse := queryparser.SearchToAsyncSearchResponse(result.response, asyncRequestIdStr, false, 200)
 	responseBody, err = asyncResponse.Marshal()
+	qmc.PushSecondaryInfo(&ui.QueryDebugSecondarySource{
+		Id:                     id,
+		IncomingQueryBody:      body,
+		QueryBodyTranslated:    result.translatedQueryBody,
+		QueryTranslatedResults: responseBody,
+		SecondaryTook:          took,
+	})
 	if keep {
 		compressedBody := responseBody
 		isCompressed := false

From c522b621c5aa06c51d2dbebcf76aac16dafb7567 Mon Sep 17 00:00:00 2001
From: Jacek Migdal <jacek@quesma.com>
Date: Thu, 2 May 2024 15:13:58 +0200
Subject: [PATCH 4/6] Add URI

---
 quesma/quesma/search.go                | 10 +++++++---
 quesma/quesma/termsenum/terms_enum.go  |  1 +
 quesma/quesma/ui/html_pages_test.go    |  1 +
 quesma/quesma/ui/html_panels.go        |  2 +-
 quesma/quesma/ui/management_console.go |  2 ++
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/quesma/quesma/search.go b/quesma/quesma/search.go
index 5ced17fa4..a22483646 100644
--- a/quesma/quesma/search.go
+++ b/quesma/quesma/search.go
@@ -141,9 +141,11 @@ func (q *QueryRunner) handleSearchCommon(ctx context.Context, cfg config.QuesmaC
 
 	startTime := time.Now()
 	id := ctx.Value(tracing.RequestIdCtxKey).(string)
+	uri := ctx.Value(tracing.RequestPath).(string)
 	pushSecondaryInfoToManagementConsole := func() {
 		qmc.PushSecondaryInfo(&ui.QueryDebugSecondarySource{
 			Id:                     id,
+			Uri:                    ctx.Value(tracing.RequestPath).(string),
 			IncomingQueryBody:      body,
 			QueryBodyTranslated:    translatedQueryBody,
 			QueryTranslatedResults: responseBody,
@@ -299,11 +301,11 @@ func (q *QueryRunner) handleSearchCommon(ctx context.Context, cfg config.QuesmaC
 			go func() { // Async search takes longer. Return partial results and wait for
 				recovery.LogPanicWithCtx(ctx)
 				res := <-optAsync.doneCh
-				q.storeAsyncSearch(qmc, id, optAsync.asyncRequestIdStr, optAsync.startTime, body, res, true)
+				q.storeAsyncSearch(qmc, id, optAsync.asyncRequestIdStr, optAsync.startTime, uri, body, res, true)
 			}()
 			return q.handlePartialAsyncSearch(ctx, optAsync.asyncRequestIdStr)
 		case res := <-optAsync.doneCh:
-			responseBody, err = q.storeAsyncSearch(qmc, id, optAsync.asyncRequestIdStr, optAsync.startTime, body, res,
+			responseBody, err = q.storeAsyncSearch(qmc, id, optAsync.asyncRequestIdStr, optAsync.startTime, uri, body, res,
 				optAsync.keepOnCompletion)
 
 			return responseBody, err
@@ -312,7 +314,7 @@ func (q *QueryRunner) handleSearchCommon(ctx context.Context, cfg config.QuesmaC
 }
 
 func (q *QueryRunner) storeAsyncSearch(qmc *ui.QuesmaManagementConsole, id, asyncRequestIdStr string,
-	startTime time.Time, body []byte, result AsyncSearchWithError, keep bool) (responseBody []byte, err error) {
+	startTime time.Time, uri string, body []byte, result AsyncSearchWithError, keep bool) (responseBody []byte, err error) {
 	took := time.Since(startTime)
 	if result.err != nil {
 		if keep {
@@ -323,6 +325,7 @@ func (q *QueryRunner) storeAsyncSearch(qmc *ui.QuesmaManagementConsole, id, asyn
 		err = result.err
 		qmc.PushSecondaryInfo(&ui.QueryDebugSecondarySource{
 			Id:                     id,
+			Uri:                    uri,
 			IncomingQueryBody:      body,
 			QueryBodyTranslated:    result.translatedQueryBody,
 			QueryTranslatedResults: responseBody,
@@ -334,6 +337,7 @@ func (q *QueryRunner) storeAsyncSearch(qmc *ui.QuesmaManagementConsole, id, asyn
 	responseBody, err = asyncResponse.Marshal()
 	qmc.PushSecondaryInfo(&ui.QueryDebugSecondarySource{
 		Id:                     id,
+		Uri:                    uri,
 		IncomingQueryBody:      body,
 		QueryBodyTranslated:    result.translatedQueryBody,
 		QueryTranslatedResults: responseBody,
diff --git a/quesma/quesma/termsenum/terms_enum.go b/quesma/quesma/termsenum/terms_enum.go
index fd82836c5..eb868fc3a 100644
--- a/quesma/quesma/termsenum/terms_enum.go
+++ b/quesma/quesma/termsenum/terms_enum.go
@@ -46,6 +46,7 @@ func handleTermsEnumRequest(ctx context.Context, table string, reqBody []byte, q
 
 	qmc.PushSecondaryInfo(&ui.QueryDebugSecondarySource{
 		Id:                     ctx.Value(tracing.RequestIdCtxKey).(string),
+		Uri:                    ctx.Value(tracing.RequestPath).(string),
 		IncomingQueryBody:      reqBody,
 		QueryBodyTranslated:    []byte(selectQuery.String()),
 		QueryTranslatedResults: result,
diff --git a/quesma/quesma/ui/html_pages_test.go b/quesma/quesma/ui/html_pages_test.go
index d1e1359f4..ccc5a3657 100644
--- a/quesma/quesma/ui/html_pages_test.go
+++ b/quesma/quesma/ui/html_pages_test.go
@@ -21,6 +21,7 @@ func TestHtmlPages(t *testing.T) {
 	qmc := NewQuesmaManagementConsole(config.QuesmaConfiguration{}, nil, nil, logChan, telemetry.NewPhoneHomeEmptyAgent())
 	qmc.PushPrimaryInfo(&QueryDebugPrimarySource{Id: id, QueryResp: xssBytes})
 	qmc.PushSecondaryInfo(&QueryDebugSecondarySource{Id: id,
+		Uri:                    xss,
 		IncomingQueryBody:      xssBytes,
 		QueryBodyTranslated:    xssBytes,
 		QueryTranslatedResults: xssBytes,
diff --git a/quesma/quesma/ui/html_panels.go b/quesma/quesma/ui/html_panels.go
index 074588392..5c482dfb8 100644
--- a/quesma/quesma/ui/html_panels.go
+++ b/quesma/quesma/ui/html_panels.go
@@ -27,7 +27,7 @@ func generateQueries(debugKeyValueSlice []DebugKeyValue, withLinks bool) []byte
 		if withLinks {
 			buffer.Html(`<a href="/request-Id/`).Text(v.Key).Html(`">`)
 		}
-		buffer.Html("<p>RequestID:").Text(v.Key).Html("</p>\n")
+		buffer.Html("<p>RequestID:").Text(v.Key).Html(" URI: ").Text(v.Value.Uri).Html("</p>\n")
 		buffer.Html(`<pre Id="query`).Text(v.Key).Html(`">`)
 		buffer.Text(string(v.Value.IncomingQueryBody))
 		buffer.Html("\n</pre>")
diff --git a/quesma/quesma/ui/management_console.go b/quesma/quesma/ui/management_console.go
index 7e0655c55..70afe7c2b 100644
--- a/quesma/quesma/ui/management_console.go
+++ b/quesma/quesma/ui/management_console.go
@@ -47,6 +47,7 @@ type QueryDebugPrimarySource struct {
 type QueryDebugSecondarySource struct {
 	Id string
 
+	Uri               string
 	IncomingQueryBody []byte
 
 	QueryBodyTranslated    []byte
@@ -240,6 +241,7 @@ func (qmc *QuesmaManagementConsole) processChannelMessage() {
 		logger.Debug().Msg("Received debug info from secondary source: " + msg.Id)
 		secondaryDebugInfo := QueryDebugSecondarySource{
 			msg.Id,
+			msg.Uri,
 			msg.IncomingQueryBody,
 			msg.QueryBodyTranslated,
 			msg.QueryTranslatedResults,

From d99321419ff2466f06fb542b5ad8786727a89fc7 Mon Sep 17 00:00:00 2001
From: Jacek Migdal <jacek@quesma.com>
Date: Thu, 2 May 2024 15:18:46 +0200
Subject: [PATCH 5/6] Improve performance of debug

---
 quesma/quesma/ui/management_console.go | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/quesma/quesma/ui/management_console.go b/quesma/quesma/ui/management_console.go
index 70afe7c2b..df186e9a7 100644
--- a/quesma/quesma/ui/management_console.go
+++ b/quesma/quesma/ui/management_console.go
@@ -91,8 +91,8 @@ type QuesmaManagementConsole struct {
 
 func NewQuesmaManagementConsole(config config.QuesmaConfiguration, logManager *clickhouse.LogManager, indexManager elasticsearch.IndexManagement, logChan <-chan tracing.LogWithLevel, phoneHomeAgent telemetry.PhoneHomeAgent) *QuesmaManagementConsole {
 	return &QuesmaManagementConsole{
-		queryDebugPrimarySource:   make(chan *QueryDebugPrimarySource, 5),
-		queryDebugSecondarySource: make(chan *QueryDebugSecondarySource, 5),
+		queryDebugPrimarySource:   make(chan *QueryDebugPrimarySource, 10),
+		queryDebugSecondarySource: make(chan *QueryDebugSecondarySource, 10),
 		queryDebugLogs:            logChan,
 		debugInfoMessages:         make(map[string]QueryDebugInfo),
 		debugLastMessages:         make([]string, 0),
@@ -110,13 +110,10 @@ func NewQuesmaManagementConsole(config config.QuesmaConfiguration, logManager *c
 }
 
 func (qmc *QuesmaManagementConsole) PushPrimaryInfo(qdebugInfo *QueryDebugPrimarySource) {
-	qdebugInfo.QueryResp = []byte(util.JsonPrettify(string(qdebugInfo.QueryResp), true))
 	qmc.queryDebugPrimarySource <- qdebugInfo
 }
 
 func (qmc *QuesmaManagementConsole) PushSecondaryInfo(qdebugInfo *QueryDebugSecondarySource) {
-	qdebugInfo.QueryTranslatedResults = []byte(util.JsonPrettify(string(qdebugInfo.QueryTranslatedResults), true))
-	qdebugInfo.IncomingQueryBody = []byte(util.JsonPrettify(string(qdebugInfo.IncomingQueryBody), true))
 	qmc.queryDebugSecondarySource <- qdebugInfo
 }
 
@@ -220,7 +217,8 @@ func (qmc *QuesmaManagementConsole) processChannelMessage() {
 	select {
 	case msg := <-qmc.queryDebugPrimarySource:
 		logger.Debug().Msg("Received debug info from primary source: " + msg.Id)
-		debugPrimaryInfo := QueryDebugPrimarySource{msg.Id, msg.QueryResp, msg.PrimaryTook}
+		debugPrimaryInfo := QueryDebugPrimarySource{msg.Id,
+			[]byte(util.JsonPrettify(string(msg.QueryResp), true)), msg.PrimaryTook}
 		qmc.mutex.Lock()
 		if value, ok := qmc.debugInfoMessages[msg.Id]; !ok {
 			qmc.debugInfoMessages[msg.Id] = QueryDebugInfo{
@@ -242,9 +240,9 @@ func (qmc *QuesmaManagementConsole) processChannelMessage() {
 		secondaryDebugInfo := QueryDebugSecondarySource{
 			msg.Id,
 			msg.Uri,
-			msg.IncomingQueryBody,
+			[]byte(util.JsonPrettify(string(msg.IncomingQueryBody), true)),
 			msg.QueryBodyTranslated,
-			msg.QueryTranslatedResults,
+			[]byte(util.JsonPrettify(string(msg.QueryTranslatedResults), true)),
 			msg.SecondaryTook,
 		}
 		qmc.mutex.Lock()

From 2b7f59b540bd2ded4328b248756ac14d15fd1364 Mon Sep 17 00:00:00 2001
From: Jacek Migdal <jacek@quesma.com>
Date: Thu, 2 May 2024 15:27:06 +0200
Subject: [PATCH 6/6] Rename to path

---
 quesma/quesma/search.go                | 19 ++++++++++++-------
 quesma/quesma/termsenum/terms_enum.go  |  9 +++++++--
 quesma/quesma/ui/html_pages_test.go    |  2 +-
 quesma/quesma/ui/html_panels.go        |  2 +-
 quesma/quesma/ui/management_console.go |  4 ++--
 5 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/quesma/quesma/search.go b/quesma/quesma/search.go
index a22483646..f6d7f13d4 100644
--- a/quesma/quesma/search.go
+++ b/quesma/quesma/search.go
@@ -141,11 +141,16 @@ func (q *QueryRunner) handleSearchCommon(ctx context.Context, cfg config.QuesmaC
 
 	startTime := time.Now()
 	id := ctx.Value(tracing.RequestIdCtxKey).(string)
-	uri := ctx.Value(tracing.RequestPath).(string)
+	path := ""
+	if value := ctx.Value(tracing.RequestPath); value != nil {
+		if str, ok := value.(string); ok {
+			path = str
+		}
+	}
 	pushSecondaryInfoToManagementConsole := func() {
 		qmc.PushSecondaryInfo(&ui.QueryDebugSecondarySource{
 			Id:                     id,
-			Uri:                    ctx.Value(tracing.RequestPath).(string),
+			Path:                   path,
 			IncomingQueryBody:      body,
 			QueryBodyTranslated:    translatedQueryBody,
 			QueryTranslatedResults: responseBody,
@@ -301,11 +306,11 @@ func (q *QueryRunner) handleSearchCommon(ctx context.Context, cfg config.QuesmaC
 			go func() { // Async search takes longer. Return partial results and wait for
 				recovery.LogPanicWithCtx(ctx)
 				res := <-optAsync.doneCh
-				q.storeAsyncSearch(qmc, id, optAsync.asyncRequestIdStr, optAsync.startTime, uri, body, res, true)
+				q.storeAsyncSearch(qmc, id, optAsync.asyncRequestIdStr, optAsync.startTime, path, body, res, true)
 			}()
 			return q.handlePartialAsyncSearch(ctx, optAsync.asyncRequestIdStr)
 		case res := <-optAsync.doneCh:
-			responseBody, err = q.storeAsyncSearch(qmc, id, optAsync.asyncRequestIdStr, optAsync.startTime, uri, body, res,
+			responseBody, err = q.storeAsyncSearch(qmc, id, optAsync.asyncRequestIdStr, optAsync.startTime, path, body, res,
 				optAsync.keepOnCompletion)
 
 			return responseBody, err
@@ -314,7 +319,7 @@ func (q *QueryRunner) handleSearchCommon(ctx context.Context, cfg config.QuesmaC
 }
 
 func (q *QueryRunner) storeAsyncSearch(qmc *ui.QuesmaManagementConsole, id, asyncRequestIdStr string,
-	startTime time.Time, uri string, body []byte, result AsyncSearchWithError, keep bool) (responseBody []byte, err error) {
+	startTime time.Time, path string, body []byte, result AsyncSearchWithError, keep bool) (responseBody []byte, err error) {
 	took := time.Since(startTime)
 	if result.err != nil {
 		if keep {
@@ -325,7 +330,7 @@ func (q *QueryRunner) storeAsyncSearch(qmc *ui.QuesmaManagementConsole, id, asyn
 		err = result.err
 		qmc.PushSecondaryInfo(&ui.QueryDebugSecondarySource{
 			Id:                     id,
-			Uri:                    uri,
+			Path:                   path,
 			IncomingQueryBody:      body,
 			QueryBodyTranslated:    result.translatedQueryBody,
 			QueryTranslatedResults: responseBody,
@@ -337,7 +342,7 @@ func (q *QueryRunner) storeAsyncSearch(qmc *ui.QuesmaManagementConsole, id, asyn
 	responseBody, err = asyncResponse.Marshal()
 	qmc.PushSecondaryInfo(&ui.QueryDebugSecondarySource{
 		Id:                     id,
-		Uri:                    uri,
+		Path:                   path,
 		IncomingQueryBody:      body,
 		QueryBodyTranslated:    result.translatedQueryBody,
 		QueryTranslatedResults: responseBody,
diff --git a/quesma/quesma/termsenum/terms_enum.go b/quesma/quesma/termsenum/terms_enum.go
index eb868fc3a..55a685364 100644
--- a/quesma/quesma/termsenum/terms_enum.go
+++ b/quesma/quesma/termsenum/terms_enum.go
@@ -43,10 +43,15 @@ func handleTermsEnumRequest(ctx context.Context, table string, reqBody []byte, q
 	} else {
 		result, err = json.Marshal(makeTermsEnumResponse(rows))
 	}
-
+	path := ""
+	if value := ctx.Value(tracing.RequestPath); value != nil {
+		if str, ok := value.(string); ok {
+			path = str
+		}
+	}
 	qmc.PushSecondaryInfo(&ui.QueryDebugSecondarySource{
 		Id:                     ctx.Value(tracing.RequestIdCtxKey).(string),
-		Uri:                    ctx.Value(tracing.RequestPath).(string),
+		Path:                   path,
 		IncomingQueryBody:      reqBody,
 		QueryBodyTranslated:    []byte(selectQuery.String()),
 		QueryTranslatedResults: result,
diff --git a/quesma/quesma/ui/html_pages_test.go b/quesma/quesma/ui/html_pages_test.go
index ccc5a3657..5fa08ee8a 100644
--- a/quesma/quesma/ui/html_pages_test.go
+++ b/quesma/quesma/ui/html_pages_test.go
@@ -21,7 +21,7 @@ func TestHtmlPages(t *testing.T) {
 	qmc := NewQuesmaManagementConsole(config.QuesmaConfiguration{}, nil, nil, logChan, telemetry.NewPhoneHomeEmptyAgent())
 	qmc.PushPrimaryInfo(&QueryDebugPrimarySource{Id: id, QueryResp: xssBytes})
 	qmc.PushSecondaryInfo(&QueryDebugSecondarySource{Id: id,
-		Uri:                    xss,
+		Path:                   xss,
 		IncomingQueryBody:      xssBytes,
 		QueryBodyTranslated:    xssBytes,
 		QueryTranslatedResults: xssBytes,
diff --git a/quesma/quesma/ui/html_panels.go b/quesma/quesma/ui/html_panels.go
index 5c482dfb8..c12674c6d 100644
--- a/quesma/quesma/ui/html_panels.go
+++ b/quesma/quesma/ui/html_panels.go
@@ -27,7 +27,7 @@ func generateQueries(debugKeyValueSlice []DebugKeyValue, withLinks bool) []byte
 		if withLinks {
 			buffer.Html(`<a href="/request-Id/`).Text(v.Key).Html(`">`)
 		}
-		buffer.Html("<p>RequestID:").Text(v.Key).Html(" URI: ").Text(v.Value.Uri).Html("</p>\n")
+		buffer.Html("<p>RequestID:").Text(v.Key).Html(" Path: ").Text(v.Value.Path).Html("</p>\n")
 		buffer.Html(`<pre Id="query`).Text(v.Key).Html(`">`)
 		buffer.Text(string(v.Value.IncomingQueryBody))
 		buffer.Html("\n</pre>")
diff --git a/quesma/quesma/ui/management_console.go b/quesma/quesma/ui/management_console.go
index df186e9a7..79ce6aa1f 100644
--- a/quesma/quesma/ui/management_console.go
+++ b/quesma/quesma/ui/management_console.go
@@ -47,7 +47,7 @@ type QueryDebugPrimarySource struct {
 type QueryDebugSecondarySource struct {
 	Id string
 
-	Uri               string
+	Path              string
 	IncomingQueryBody []byte
 
 	QueryBodyTranslated    []byte
@@ -239,7 +239,7 @@ func (qmc *QuesmaManagementConsole) processChannelMessage() {
 		logger.Debug().Msg("Received debug info from secondary source: " + msg.Id)
 		secondaryDebugInfo := QueryDebugSecondarySource{
 			msg.Id,
-			msg.Uri,
+			msg.Path,
 			[]byte(util.JsonPrettify(string(msg.IncomingQueryBody), true)),
 			msg.QueryBodyTranslated,
 			[]byte(util.JsonPrettify(string(msg.QueryTranslatedResults), true)),