Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4985 from laurazard/otel-exit-code-int 

otel: capture exit code as int64
This commit is contained in:
Laura Brehm 2024-04-05 10:21:52 +01:00 committed by GitHub
parent 10b9810989 cefcba9871
commit b2fe82a23e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cli/command/telemetry_utils.go
View File

@ -3,7 +3,6 @@ package command
import ( import (
"context" "context"
"fmt" "fmt"
"strconv"
"strings" "strings"
"time" "time"
@ -110,7 +109,7 @@ func attributesFromError(err error) []attribute.KeyValue {
} }
attrs = append(attrs, attribute.String("command.error.type", otelErrorType(err))) attrs = append(attrs, attribute.String("command.error.type", otelErrorType(err)))
} }
attrs = append(attrs, attribute.String("command.status.code", strconv.Itoa(exitCode))) attrs = append(attrs, attribute.Int("command.status.code", exitCode))
return attrs return attrs
} }

6
cli/command/telemetry_utils_test.go
View File

@ -159,7 +159,7 @@ func TestAttributesFromError(t *testing.T) {
testName: "no error", testName: "no error",
err: nil, err: nil,
expected: []attribute.KeyValue{ expected: []attribute.KeyValue{
attribute.String("command.status.code", "0"), attribute.Int("command.status.code", 0),
}, },
}, },
{ {
@ -167,7 +167,7 @@ func TestAttributesFromError(t *testing.T) {
err: statusError{StatusCode: 127}, err: statusError{StatusCode: 127},
expected: []attribute.KeyValue{ expected: []attribute.KeyValue{
attribute.String("command.error.type", "generic"), attribute.String("command.error.type", "generic"),
attribute.String("command.status.code", "127"), attribute.Int("command.status.code", 127),
}, },
}, },
{ {
@ -175,7 +175,7 @@ func TestAttributesFromError(t *testing.T) {
err: context.Canceled, err: context.Canceled,
expected: []attribute.KeyValue{ expected: []attribute.KeyValue{
attribute.String("command.error.type", "canceled"), attribute.String("command.error.type", "canceled"),
attribute.String("command.status.code", "1"), attribute.Int("command.status.code", 1),
}, },
}, },
} { } {