mirror of
https://github.com/containerd/containerd.git
synced 2026-11-06 13:27:16 +00:00
Sebastiaan van Stijn
442969ef0e
Log fields which contain an error currently fall through to JSON
marshaling, which may produce an unhelpful value such as "{}" instead
of the error message.
Handle error values explicitly and use fmt.Sprint when formatting error
and fmt.Stringer values. Besides preserving their textual
representation, fmt handles typed-nil implementations without
propagating a panic from their Error or String method.
Also simplify the final fmt.Sprintf("%v", v) fallback to fmt.Sprint(v).
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
88 lines
2.2 KiB
Go
88 lines
2.2 KiB
Go
/*
|
|
Copyright The containerd Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package tracing
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
|
|
"go.opentelemetry.io/otel/attribute"
|
|
)
|
|
|
|
func keyValue(k string, v any) attribute.KeyValue {
|
|
if v == nil {
|
|
return attribute.String(k, "<nil>")
|
|
}
|
|
|
|
switch typed := v.(type) {
|
|
case bool:
|
|
return attribute.Bool(k, typed)
|
|
case []bool:
|
|
return attribute.BoolSlice(k, typed)
|
|
case int:
|
|
return attribute.Int(k, typed)
|
|
case []int:
|
|
return attribute.IntSlice(k, typed)
|
|
case int8:
|
|
return attribute.Int(k, int(typed))
|
|
case []int8:
|
|
ls := make([]int, 0, len(typed))
|
|
for _, i := range typed {
|
|
ls = append(ls, int(i))
|
|
}
|
|
return attribute.IntSlice(k, ls)
|
|
case int16:
|
|
return attribute.Int(k, int(typed))
|
|
case []int16:
|
|
ls := make([]int, 0, len(typed))
|
|
for _, i := range typed {
|
|
ls = append(ls, int(i))
|
|
}
|
|
return attribute.IntSlice(k, ls)
|
|
case int32:
|
|
return attribute.Int64(k, int64(typed))
|
|
case []int32:
|
|
ls := make([]int64, 0, len(typed))
|
|
for _, i := range typed {
|
|
ls = append(ls, int64(i))
|
|
}
|
|
return attribute.Int64Slice(k, ls)
|
|
case int64:
|
|
return attribute.Int64(k, typed)
|
|
case []int64:
|
|
return attribute.Int64Slice(k, typed)
|
|
case float64:
|
|
return attribute.Float64(k, typed)
|
|
case []float64:
|
|
return attribute.Float64Slice(k, typed)
|
|
case string:
|
|
return attribute.String(k, typed)
|
|
case []string:
|
|
return attribute.StringSlice(k, typed)
|
|
case error:
|
|
return attribute.String(k, fmt.Sprint(typed))
|
|
}
|
|
|
|
if stringer, ok := v.(fmt.Stringer); ok {
|
|
return attribute.String(k, fmt.Sprint(stringer))
|
|
}
|
|
if b, err := json.Marshal(v); b != nil && err == nil {
|
|
return attribute.String(k, string(b))
|
|
}
|
|
return attribute.String(k, fmt.Sprint(v))
|
|
}
|