Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ddtrace/ext: change error.msg to error.message for UNC #1605

Merged
merged 3 commits into from Dec 6, 2022
Merged

ddtrace/ext: change error.msg to error.message for UNC #1605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac80420
ddtrace/ext: rename 'error.msg' to 'error.messge' for unity across tr…
zarirhamza Dec 6, 2022
25c3041
ddtrace/tracer: rename 'error.msg' to ext.ErrorMsg in test use cases
zarirhamza Dec 6, 2022
8448403
Merge branch 'main' into zarir/error_message
zarirhamza Dec 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ddtrace/ext/tags.go
View file
Open in desktop
Expand Up @@ -68,7 +68,7 @@ const (
Error = "error"

// ErrorMsg specifies the error message.
ErrorMsg = "error.msg"
ErrorMsg = "error.message"

// ErrorType specifies the error type.
ErrorType = "error.type"
Expand Down
18 changes: 9 additions & 9 deletions ddtrace/tracer/span_test.go
View file
Open in desktop
Expand Up @@ -478,9 +478,9 @@ func TestSpanError(t *testing.T) {
err := errors.New("Something wrong")
span.SetTag(ext.Error, err)
assert.Equal(int32(1), span.Error)
assert.Equal("Something wrong", span.Meta["error.msg"])
assert.Equal("*errors.errorString", span.Meta["error.type"])
assert.NotEqual("", span.Meta["error.stack"])
assert.Equal("Something wrong", span.Meta[ext.ErrorMsg])
assert.Equal("*errors.errorString", span.Meta[ext.ErrorType])
assert.NotEqual("", span.Meta[ext.ErrorStack])

// operating on a finished span is a no-op
span = tracer.newRootSpan("flask.request", "flask", "/")
Expand All @@ -491,9 +491,9 @@ func TestSpanError(t *testing.T) {

// '+1' is `_dd.p.dm`
assert.Equal(nMeta+1, len(span.Meta))
assert.Equal("", span.Meta["error.msg"])
assert.Equal("", span.Meta["error.type"])
assert.Equal("", span.Meta["error.stack"])
assert.Equal("", span.Meta[ext.ErrorMsg])
assert.Equal("", span.Meta[ext.ErrorType])
assert.Equal("", span.Meta[ext.ErrorStack])
}

func TestSpanError_Typed(t *testing.T) {
Expand All @@ -505,9 +505,9 @@ func TestSpanError_Typed(t *testing.T) {
err := &boomError{}
span.SetTag(ext.Error, err)
assert.Equal(int32(1), span.Error)
assert.Equal("boom", span.Meta["error.msg"])
assert.Equal("*tracer.boomError", span.Meta["error.type"])
assert.NotEqual("", span.Meta["error.stack"])
assert.Equal("boom", span.Meta[ext.ErrorMsg])
assert.Equal("*tracer.boomError", span.Meta[ext.ErrorType])
assert.NotEqual("", span.Meta[ext.ErrorStack])
}

func TestSpanErrorNil(t *testing.T) {
Expand Down