varnitgoyal95/cybertron
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #62 from navi-ppl/TP-5555/search-addition

Browse Source 
TP-5555 | search addition
This commit is contained in:
Aman Singh
2025-01-09 16:20:29 +05:30
committed by GitHub
parent 3bd26de65a 25a767d2d6
commit 62da8d4619
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/client/elastic/elastic.go
View File

@@ -81,8 +81,6 @@ func (el *ElasticSearchClient) SearchDocuments(searchRequest string, fields []st
}
}
log.Printf("%s", aggregations)
return results, aggregations, res.Hits.Total.Value, nil
}

1
pkg/jobs/jobScheduler.go
View File

@@ -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)
}

6
service/ExceptionService.go
View File

@@ -13,9 +13,7 @@ import (
"cybertron/pkg/metrics"
"cybertron/pkg/utils"
"encoding/json"
"fmt"
"github.com/gin-gonic/gin"
"go.uber.org/zap"
"gorm.io/gorm"
"net/http"
)
@@ -120,7 +118,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,7 +143,7 @@ func (exceptionService *ExceptionService) CatchErrors(c *gin.Context) {
err := exceptionService.kafkaProducer.PublishEvent(errorItem, exceptionService.kafkaConfig.Topic, "", nil, encoder.JsonEncoderInstance)
if err != nil {
fmt.Println("Failed to push error to kafka")
exceptionService.logger.Error("Error publishing exception to Kafka: " + err.Error())
}
}

7
service/searchService.go
View File

@@ -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)