InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

daemon/logger: use consistent name for "extra attributes"

Browse Source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2025-02-15 19:31:23 +01:00
parent ba559c4f12
commit cbbff10b01
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
daemon/logger/gcplogs/gcplogging.go
View File

@@ -156,7 +156,7 @@ func New(info logger.Info) (logger.Logger, error) {
return nil, fmt.Errorf("unable to connect or authenticate with Google Cloud Logging: %v", err)
}
extraAttributes, err := info.ExtraAttributes(nil)
extraAttrs, err := info.ExtraAttributes(nil)
if err != nil {
return nil, err
}
@@ -170,7 +170,7 @@ func New(info logger.Info) (logger.Logger, error) {
ImageName: info.ContainerImageName,
ImageID: info.ContainerImageID,
Created: info.ContainerCreated,
Metadata: extraAttributes,
Metadata: extraAttrs,
},
}

8
daemon/logger/jsonfilelog/jsonfilelog.go
View File

@@ -81,7 +81,7 @@ func New(info logger.Info) (logger.Logger, error) {
}
}
attrs, err := info.ExtraAttributes(nil)
extraAttrs, err := info.ExtraAttributes(nil)
if err != nil {
return nil, err
}
@@ -92,13 +92,13 @@ func New(info logger.Info) (logger.Logger, error) {
return nil, err
}
if tag != "" {
attrs["tag"] = tag
extraAttrs["tag"] = tag
}
var extra json.RawMessage
if len(attrs) > 0 {
if len(extraAttrs) > 0 {
var err error
extra, err = json.Marshal(attrs)
extra, err = json.Marshal(extraAttrs)
if err != nil {
return nil, err
}

8
daemon/logger/splunk/splunk.go
View File

@@ -255,7 +255,7 @@ func New(info logger.Info) (logger.Logger, error) {
}
}
attrs, err := info.ExtraAttributes(nil)
extraAttrs, err := info.ExtraAttributes(nil)
if err != nil {
return nil, err
}
@@ -318,14 +318,14 @@ func New(info logger.Info) (logger.Logger, error) {
case splunkFormatInline:
nullEvent := &splunkMessageEvent{
Tag: tag,
Attrs: attrs,
Attrs: extraAttrs,
}
loggerWrapper = &splunkLoggerInline{splLogger, nullEvent}
case splunkFormatJSON:
nullEvent := &splunkMessageEvent{
Tag: tag,
Attrs: attrs,
Attrs: extraAttrs,
}
loggerWrapper = &splunkLoggerJSON{&splunkLoggerInline{splLogger, nullEvent}}
@@ -335,7 +335,7 @@ func New(info logger.Info) (logger.Logger, error) {
prefix.WriteString(tag)
prefix.WriteString(" ")
}
for key, value := range attrs {
for key, value := range extraAttrs {
prefix.WriteString(key)
prefix.WriteString("=")
prefix.WriteString(value)