From eb0b74c7cc9a27260e95034cef9cc9e2cdc3003f Mon Sep 17 00:00:00 2001 From: Rafal Strzalinski Date: Mon, 16 Jun 2025 12:35:46 +0200 Subject: [PATCH 1/2] Add Quesma version to the logging context --- platform/v2/core/quesma_logger.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/platform/v2/core/quesma_logger.go b/platform/v2/core/quesma_logger.go index b7c8544e7..0682051c4 100644 --- a/platform/v2/core/quesma_logger.go +++ b/platform/v2/core/quesma_logger.go @@ -5,6 +5,7 @@ package quesma_api import ( "context" "fmt" + "github.com/QuesmaOrg/quesma/platform/buildinfo" "github.com/QuesmaOrg/quesma/platform/v2/core/tracing" "github.com/hashicorp/golang-lru/v2/expirable" "github.com/rs/zerolog" @@ -19,6 +20,7 @@ const ( Path = "path" AsyncId = "async_id" OpaqueId = "opaque_id" + Version = "version" DefaultBurstSamplerPeriodSeconds = 20 // burst up to 600 lines of logs per 20 seconds period DefaultBurstSamplerMaxLogsPerSecond = 30 // ~100k lines of logs per hour @@ -163,6 +165,8 @@ func (l *QuesmaLoggerImpl) addKnownContextValues(event *zerolog.Event, ctx conte event = event.Str(OpaqueId, requestId) } + event = event.Str(Version, buildinfo.Version) + return event } From a7505f49d06514ec06cf6c3a644f7df8c632b790 Mon Sep 17 00:00:00 2001 From: Rafal Strzalinski Date: Tue, 17 Jun 2025 16:23:53 +0200 Subject: [PATCH 2/2] WIP --- platform/persistence/elastic.go | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/platform/persistence/elastic.go b/platform/persistence/elastic.go index 414b446bf..cb1bff4fe 100644 --- a/platform/persistence/elastic.go +++ b/platform/persistence/elastic.go @@ -8,7 +8,6 @@ import ( "github.com/QuesmaOrg/quesma/platform/config" "github.com/QuesmaOrg/quesma/platform/elasticsearch" "github.com/QuesmaOrg/quesma/platform/logger" - "github.com/QuesmaOrg/quesma/platform/types" "github.com/goccy/go-json" "io" "log" @@ -60,20 +59,16 @@ func (p *ElasticJSONDatabase) refresh() error { func (p *ElasticJSONDatabase) Put(key string, data string) error { - elasticsearchURL := fmt.Sprintf("%s/_update/%s", p.indexName, key) + elasticsearchURL := fmt.Sprintf("%s/_doc/%s", p.indexName, key) w := Wrapper{Content: data} - updateContent := types.JSON{} - updateContent["doc"] = w - updateContent["doc_as_upsert"] = true - - jsonData, err := json.Marshal(updateContent) + jsonData, err := json.Marshal(w) if err != nil { return err } - resp, err := p.httpClient.Request(context.Background(), "POST", elasticsearchURL, jsonData) + resp, err := p.httpClient.Request(context.Background(), "PUT", elasticsearchURL, jsonData) if err != nil { return err }