fix stack vs handling

hannahkm · hannahkm · commit 85ca9a27d022 · 2026-03-12T11:54:00.000-04:00
fix test

neat fix

oops
diff --git a/ddtrace/tracer/span.go b/ddtrace/tracer/span.go
@@ -675,20 +675,12 @@ func (s *Span) setTagErrorLocked(value any, cfg errorConfig) {
 		if cfg.noDebugStack {
 			return
 		}
-		switch err := v.(type) {
-		case xerrors.Formatter:
+		switch v.(type) {
+		case xerrors.Formatter, fmt.Formatter, *errortrace.TracerError:
 			s.setMetaLocked(ext.ErrorStack, fmt.Sprintf("%+v", v))
-		case fmt.Formatter:
-			// pkg/errors approach
-			s.setMetaLocked(ext.ErrorStack, fmt.Sprintf("%+v", v))
-		case *errortrace.TracerError:
-			// instrumentation/errortrace approach
-			s.setMetaLocked(ext.ErrorStack, fmt.Sprintf("%+v", v))
-			s.setMetaLocked(ext.ErrorHandlingStack, err.Format())
-		default:
-			stack := takeStacktrace(cfg.stackFrames, cfg.stackSkip)
-			s.setMetaLocked(ext.ErrorHandlingStack, stack)
 		}
+		handlingStack := takeStacktrace(cfg.stackFrames, cfg.stackSkip)
+		s.setMetaLocked(ext.ErrorHandlingStack, handlingStack)
 	case nil:
 		// no error
 		s.setErrorFlagLocked(false)
diff --git a/ddtrace/tracer/span_test.go b/ddtrace/tracer/span_test.go
@@ -1066,7 +1066,7 @@ func TestSpanErrorStackMetrics(t *testing.T) {
 			tracer.StartSpan("operation").Finish(WithError(errortrace.New("test")))
 		}
 
-		assert.Equal(0.0, telemetryClient.Count(telemetry.NamespaceTracers, "errorstack.source", []string{"source:takeStacktrace"}).Get())
+		assert.Equal(5.0, telemetryClient.Count(telemetry.NamespaceTracers, "errorstack.source", []string{"source:takeStacktrace"}).Get())
 
 		assert.Equal(5.0, telemetryClient.Count(telemetry.NamespaceTracers, "errorstack.source", []string{"source:TracerError"}).Get())
 		if !windows {

Original file line number	Diff line number	Diff line change
`@@ -1066,7 +1066,7 @@ func TestSpanErrorStackMetrics(t *testing.T) {`
`1066`	`1066`	`tracer.StartSpan("operation").Finish(WithError(errortrace.New("test")))`
`1067`	`1067`	`}`
`1068`	`1068`
`1069`		`- assert.Equal(0.0, telemetryClient.Count(telemetry.NamespaceTracers, "errorstack.source", []string{"source:takeStacktrace"}).Get())`
	`1069`	`+ assert.Equal(5.0, telemetryClient.Count(telemetry.NamespaceTracers, "errorstack.source", []string{"source:takeStacktrace"}).Get())`
`1070`	`1070`
`1071`	`1071`	`assert.Equal(5.0, telemetryClient.Count(telemetry.NamespaceTracers, "errorstack.source", []string{"source:TracerError"}).Get())`
`1072`	`1072`	`if !windows {`