From 5a32a8acee7a01c03b7da0deab933bf96b6fafb5 Mon Sep 17 00:00:00 2001 From: varnit goyal Date: Thu, 9 Jan 2025 16:06:55 +0530 Subject: [PATCH 1/3] TP-5555 | search addition --- internal/client/elastic/elastic.go | 2 -- service/ExceptionService.go | 4 ++-- service/package.json | 14 ++++++++++++++ service/searchService.go | 7 +++++-- 4 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 service/package.json diff --git a/internal/client/elastic/elastic.go b/internal/client/elastic/elastic.go index 98db07e..c3e6129 100644 --- a/internal/client/elastic/elastic.go +++ b/internal/client/elastic/elastic.go @@ -81,8 +81,6 @@ func (el *ElasticSearchClient) SearchDocuments(searchRequest string, fields []st } } - log.Printf("%s", aggregations) - return results, aggregations, res.Hits.Total.Value, nil } diff --git a/service/ExceptionService.go b/service/ExceptionService.go index 22267b7..6e79616 100644 --- a/service/ExceptionService.go +++ b/service/ExceptionService.go @@ -15,7 +15,6 @@ import ( "encoding/json" "fmt" "github.com/gin-gonic/gin" - "go.uber.org/zap" "gorm.io/gorm" "net/http" ) @@ -120,7 +119,7 @@ func (exceptionService *ExceptionService) CatchErrors(c *gin.Context) { //ensure we are processing a valid payload if len(lines) <= 2 { - exceptionService.logger.Error("payload is not valid", zap.Strings("payload", lines)) + //exceptionService.logger.Error("payload is not valid", zap.Strings("payload", lines)) c.JSON(http.StatusOK, gin.H{"status": "payload is not valid"}) return } @@ -145,6 +144,7 @@ func (exceptionService *ExceptionService) CatchErrors(c *gin.Context) { err := exceptionService.kafkaProducer.PublishEvent(errorItem, exceptionService.kafkaConfig.Topic, "", nil, encoder.JsonEncoderInstance) if err != nil { + exceptionService.logger.Error("Error publishing exception to Kafka: " + err.Error()) fmt.Println("Failed to push error to kafka") } } diff --git a/service/package.json b/service/package.json new file mode 100644 index 0000000..bbca381 --- /dev/null +++ b/service/package.json @@ -0,0 +1,14 @@ +{ + "name": "service", + "version": "1.0.0", + "description": "", + "main": "index.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "https://github.com/navi-ppl/cybertron.git" + }, + "private": true +} diff --git a/service/searchService.go b/service/searchService.go index 91774a9..43ae457 100644 --- a/service/searchService.go +++ b/service/searchService.go @@ -74,11 +74,14 @@ func (s *SearchService) GetSearchResults(c *gin.Context) { size_query := utils.CreateSizeQuery(int64(sizeInNumber)) term_query := utils.CreateTermSubQuery("project_id", projectId) - multiMatchQuery := utils.CreateMultiMatchQuery(search_key, "error", "title", "extra.metadata") + multiMatchQuery := utils.CreateMultiMatchQuery(search_key, "error", "title", "extra.metadata.agentId", + "extra.metadata.external_customer_id", + "extra.metadata.deviceId", + "extra.metadata.web_session_id", "extra.metadata.id") should_query := utils.CreateMustQuery(term_query, multiMatchQuery) boolQuery := utils.CreateBoolQuery(should_query) search_query := utils.CreateSearchQuery(boolQuery) - source_query := utils.CreateSourceQuery("error") + source_query := utils.CreateSourceQuery("error", "error_hash", "created_at") finalQuery := utils.CreateEsQuery(source_query, search_query, size_query) fields := []string{"error", "significant_stack", "title"} var res, _, total, err = s.elasticSearchClient.SearchDocuments(finalQuery, fields) From 0307010d468f84d7a91a324a245d593eff7d5044 Mon Sep 17 00:00:00 2001 From: varnit goyal Date: Thu, 9 Jan 2025 16:17:56 +0530 Subject: [PATCH 2/3] TP-5555 | error publishing kafka error remove --- pkg/jobs/jobScheduler.go | 1 - service/ExceptionService.go | 2 -- 2 files changed, 3 deletions(-) diff --git a/pkg/jobs/jobScheduler.go b/pkg/jobs/jobScheduler.go index d849bc2..33c1a19 100644 --- a/pkg/jobs/jobScheduler.go +++ b/pkg/jobs/jobScheduler.go @@ -47,7 +47,6 @@ func esCleanUpJob(s *JobScheduler) { rangeQuery := utils.CreateRangeQueryForLteString("created_at", sevenDaysAgo) search_query := utils.CreateSearchQuery(rangeQuery) es_query := utils.CreateEsQuery(search_query) - println("final query %v", es_query) s.elasticSearchClient.DeleteDocuments(es_query) } diff --git a/service/ExceptionService.go b/service/ExceptionService.go index 6e79616..cae78d9 100644 --- a/service/ExceptionService.go +++ b/service/ExceptionService.go @@ -13,7 +13,6 @@ import ( "cybertron/pkg/metrics" "cybertron/pkg/utils" "encoding/json" - "fmt" "github.com/gin-gonic/gin" "gorm.io/gorm" "net/http" @@ -145,7 +144,6 @@ func (exceptionService *ExceptionService) CatchErrors(c *gin.Context) { if err != nil { exceptionService.logger.Error("Error publishing exception to Kafka: " + err.Error()) - fmt.Println("Failed to push error to kafka") } } From 25a767d2d648b8f8da00d1ca7f610fe0ba8fd4f7 Mon Sep 17 00:00:00 2001 From: varnit goyal Date: Thu, 9 Jan 2025 16:18:36 +0530 Subject: [PATCH 3/3] TP-5555 | remove package json --- service/package.json | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 service/package.json diff --git a/service/package.json b/service/package.json deleted file mode 100644 index bbca381..0000000 --- a/service/package.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "service", - "version": "1.0.0", - "description": "", - "main": "index.js", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, - "repository": { - "type": "git", - "url": "https://github.com/navi-ppl/cybertron.git" - }, - "private": true -}