mderasse/gocommon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(config): Fix extrafields / attribute on logger / tracing
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse Source
This commit is contained in:
Matthieu 'JP' DERASSE 2023-01-10 21:26:51 +00:00
parent 582a9e6192
commit 5a0beb9e2c
Signed by: mderasse
GPG Key ID: 55141C777B16A705
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
log/config.go
View File

@ -114,9 +114,13 @@ func (c *ConfigStruct) applyEnv() error {
// Extra Fields // Extra Fields
if v := os.Getenv(fmt.Sprintf("%s%s", envPrefix, "EXTRA_FIELDS")); v != "" { if v := os.Getenv(fmt.Sprintf("%s%s", envPrefix, "EXTRA_FIELDS")); v != "" {
if c.ExtrasFields == nil {
c.ExtrasFields = make(map[string]interface{})
}
extraFieldsPart := strings.Split(v, ",") extraFieldsPart := strings.Split(v, ",")
for _, efp := range extraFieldsPart { for _, efp := range extraFieldsPart {
extraFieldKV := strings.SplitN(efp, ":", 1) extraFieldKV := strings.SplitN(efp, ":", 2)
if len(extraFieldKV) != 2 { if len(extraFieldKV) != 2 {
return errors.NotValidf(fmt.Sprintf("Invalid extra_field %s in environment variable. Should be a key1:value1,key2:value2 format", efp)) return errors.NotValidf(fmt.Sprintf("Invalid extra_field %s in environment variable. Should be a key1:value1,key2:value2 format", efp))
} }

6
tracing/config.go
View File

@ -116,9 +116,13 @@ func (c *ConfigStruct) applyEnv() error {
// Attributes // Attributes
if v := os.Getenv(fmt.Sprintf("%s%s", envPrefix, "ATTRIBUTES")); v != "" { if v := os.Getenv(fmt.Sprintf("%s%s", envPrefix, "ATTRIBUTES")); v != "" {
if c.Attributes == nil {
c.Attributes = make(map[string]string)
}
attributeParts := strings.Split(v, ",") attributeParts := strings.Split(v, ",")
for _, ap := range attributeParts { for _, ap := range attributeParts {
attributeKV := strings.SplitN(ap, ":", 1) attributeKV := strings.SplitN(ap, ":", 2)
if len(attributeKV) != 2 { if len(attributeKV) != 2 {
return errors.NotValidf(fmt.Sprintf("Invalid attribute %s in environment variable. Should be a key1:value1,key2:value2 format", ap)) return errors.NotValidf(fmt.Sprintf("Invalid attribute %s in environment variable. Should be a key1:value1,key2:value2 format", ap))
} }