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

Merge pull request #8 from navi-ppl/TP-5555/clean-up

Browse Source 
TP-5555 | bucket name and relase id server driven
This commit is contained in:
Varnit Goyal
2024-10-12 20:15:38 +05:30
committed by GitHub
parent 75bed4e3ed e89a554e9a
commit 41970b8677
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/dependencies/dependencies.go
View File

@@ -37,7 +37,7 @@ func InitDependencies() *Dependencies {
elasticSearch, _ := db.NewElasticClient(*configs.GetElasticConfig())
sourceMapFetcher := service.NewFetchSourceMapService(logger, s3Client)
errorProcessorClient := service.NewErrorProcessor(logger, elasticSearch, sourceMapFetcher)
errorProcessorClient := service.NewErrorProcessor(logger, elasticSearch, sourceMapFetcher, *configs.GetAWSConfig())
kafkaListeners := initKafkaConsumers(errorProcessorClient)
go kafkaListeners.AttachErrorListener()
services := initServices(errorProcessorClient)

7
service/ErrorProcessor.go
View File

@@ -3,6 +3,7 @@ package service
import (
"encoding/json"
"fmt"
"log-enricher/configs"
"log-enricher/models/es"
dbPackage "log-enricher/pkg/db"
"log-enricher/pkg/encoder"
@@ -18,6 +19,7 @@ type ErrorProcessor struct {
logger *log.Logger
elasticSearchClient *dbPackage.ElasticSearchClient
sourceMapFetcher *SourceMapService
awsConfig configs.AwsConfig
}
type Frame struct {
@@ -61,11 +63,12 @@ type Exception struct {
Request interface{} `json:"request,omitempty"`
}
func NewErrorProcessor(logger *log.Logger, elasticSearchClient *dbPackage.ElasticSearchClient, sourceMapFetcherService *SourceMapService) *ErrorProcessor {
func NewErrorProcessor(logger *log.Logger, elasticSearchClient *dbPackage.ElasticSearchClient, sourceMapFetcherService *SourceMapService, awsConfig configs.AwsConfig) *ErrorProcessor {
return &ErrorProcessor{
logger: logger,
elasticSearchClient: elasticSearchClient,
sourceMapFetcher: sourceMapFetcherService,
awsConfig: awsConfig,
}
}
@@ -102,7 +105,7 @@ func (ep *ErrorProcessor) ProcessError(error []byte) {
frame := &payload.Stacktrace.Frames[i]
//todo make release dynamic
sourceMapPath, err := ep.sourceMapFetcher.GetSourceMap(fileName, projectId, "release-1")
sourceMapPath, err := ep.sourceMapFetcher.GetSourceMap(fileName, projectId, releaseId, ep.awsConfig.Bucket)
if err != nil {
fmt.Printf("error occured in fetching source map")
}

3
service/FetchSourceMapService.go
View File

@@ -67,10 +67,9 @@ func (sm *SourceMapService) downloadFromS3(key string, bucket string, filePath s
return err
}
func (sm *SourceMapService) GetSourceMap(fileName string, projectName string, releaseVersion string) (string, error) {
func (sm *SourceMapService) GetSourceMap(fileName string, projectName string, releaseVersion string, bucket string) (string, error) {
key := path.Join(projectName, releaseVersion, fileName)
//todo drive it from config
bucket := "navi-cd955a63c4476df0f00c1cea0e4a40d1"
cacheFilePath := filepath.Join(cacheDir, projectName, releaseVersion, fileName)
//checking local cache
if path, found := checkLocalCache(projectName, releaseVersion, fileName); found {