GitHub-Proxy/signoz
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SigNoz/signoz synced 2025-08-14 00:45:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: do not return empty confId even if agentConf has not recommendations (#3773)

Browse Source
This commit is contained in:
Raj Kamal Singh 2023-10-19 14:35:45 +05:30 committed by GitHub
parent 6b2427f1c2
commit 838860da40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/query-service/agentConf/manager.go
View File

@ -2,6 +2,7 @@ package agentConf
import (
"context"
"crypto/sha256"
"fmt"
"strings"
"sync"
@ -101,7 +102,7 @@ func (m *Manager) RecommendAgentConfig(currentConfYaml []byte) (
err error,
) {
recommendation := currentConfYaml
settingVersions := []string{}
settingVersionsUsed := []string{}
for _, feature := range m.agentFeatures {
featureType := ElementTypeDef(feature.AgentFeatureType())
@ -124,7 +125,7 @@ func (m *Manager) RecommendAgentConfig(currentConfYaml []byte) (
}
recommendation = updatedConf
configId := fmt.Sprintf("%s:%d", featureType, latestConfig.Version)
settingVersions = append(settingVersions, configId)
settingVersionsUsed = append(settingVersionsUsed, configId)
m.updateDeployStatus(
context.Background(),
@ -138,7 +139,16 @@ func (m *Manager) RecommendAgentConfig(currentConfYaml []byte) (
}
configId = strings.Join(settingVersions, ",")
if len(settingVersionsUsed) > 0 {
configId = strings.Join(settingVersionsUsed, ",")
} else {
// Do not return an empty configId even if no recommendations were made
hash := sha256.New()
hash.Write(recommendation)
configId = string(hash.Sum(nil))
}
return recommendation, configId, nil
}