Skip to content

Commit

Permalink
opentelemetry: finish a span with an error if one is provided (#2279)
Browse files Browse the repository at this point in the history
  • Loading branch information
katiehockman authored Oct 19, 2023
1 parent 75acbfa commit 7dae464
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions ddtrace/opentelemetry/span.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ package opentelemetry

import (
"encoding/binary"
"errors"
"strconv"
"strings"

Expand Down Expand Up @@ -45,6 +46,7 @@ func (s *span) End(options ...oteltrace.SpanEndOption) {
var opts []tracer.FinishOption
if s.statusInfo.code == otelcodes.Error {
s.SetTag(ext.ErrorMsg, s.statusInfo.description)
opts = append(opts, tracer.WithError(errors.New(s.statusInfo.description)))
}
if t := finishCfg.Timestamp(); !t.IsZero() {
opts = append(opts, tracer.FinishTime(t))
Expand Down
2 changes: 2 additions & 0 deletions ddtrace/opentelemetry/span_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ func TestSpanEnd(t *testing.T) {
assert.NotContains(payload, ignoredName)
assert.Contains(payload, msg)
assert.NotContains(payload, ignoredMsg)
assert.Contains(payload, `"error":1`) // this should be an error span

for k, v := range attributes {
assert.Contains(payload, fmt.Sprintf("\"%s\":\"%s\"", k, v))
Expand Down Expand Up @@ -374,6 +375,7 @@ func TestSpanEndOptions(t *testing.T) {
assert.Contains(p, fmt.Sprint(startTime.UnixNano()))
assert.Contains(p, `"duration":5000000000,`)
assert.Contains(p, `persisted_option`)
assert.Contains(p, `"error":1`)
}

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

0 comments on commit 7dae464

Please sign in to comment.