chore: revert breaking error tracking changes (#4095)

Co-authored-by: kakkoyun <[email protected]>
Co-authored-by: kemal.akkoyun <[email protected]>

Author: hannahkm

ddtrace/tracer/span.go

@@ -454,6 +454,7 @@ func (s *Span) setTagError(value interface{}, cfg errorConfig) {
 	case error:
 		// if anyone sets an error value as the tag, be nice here
 		// and provide all the benefits.
+		// TODO: once Error Tracking fix is resolved, update relevant tags here. See #4095
 		setError(true)
 		s.setMeta(ext.ErrorMsg, v.Error())
 		s.setMeta(ext.ErrorType, reflect.TypeOf(v).String())
@@ -462,18 +463,18 @@ func (s *Span) setTagError(value interface{}, cfg errorConfig) {
 		}
 		switch err := v.(type) {
 		case xerrors.Formatter:
-			s.setMeta(ext.ErrorStack, fmt.Sprintf("%+v", v))
+			s.setMeta(ext.ErrorDetails, fmt.Sprintf("%+v", v))
 		case fmt.Formatter:
 			// pkg/errors approach
-			s.setMeta(ext.ErrorStack, fmt.Sprintf("%+v", v))
+			s.setMeta(ext.ErrorDetails, fmt.Sprintf("%+v", v))
 		case *errortrace.TracerError:
 			// instrumentation/errortrace approach
 			s.setMeta(ext.ErrorStack, fmt.Sprintf("%+v", v))
 			s.setMeta(ext.ErrorHandlingStack, err.Format())
 			return
 		}
 		stack := takeStacktrace(cfg.stackFrames, cfg.stackSkip)
-		s.setMeta(ext.ErrorHandlingStack, stack)
+		s.setMeta(ext.ErrorStack, stack)
 	case nil:
 		// no error
 		setError(false)

ddtrace/tracer/span_test.go

@@ -345,7 +345,7 @@ func TestSpanFinishWithError(t *testing.T) {
 	assert.Equal(int32(1), span.error)
 	errMsg, _ := getMeta(span, ext.ErrorMsg)
 	errType, _ := getMeta(span, ext.ErrorType)
-	errStack, _ := getMeta(span, ext.ErrorHandlingStack)
+	errStack, _ := getMeta(span, ext.ErrorStack)
 	assert.Equal("test error", errMsg)
 	assert.Equal("*errors.errorString", errType)
 	assert.NotEmpty(errStack)
@@ -360,7 +360,7 @@ func TestSpanFinishWithErrorNoDebugStack(t *testing.T) {
 
 	errMsg, _ := getMeta(span, ext.ErrorMsg)
 	errType, _ := getMeta(span, ext.ErrorType)
-	_, hasErrStack := getMeta(span, ext.ErrorHandlingStack)
+	_, hasErrStack := getMeta(span, ext.ErrorStack)
 	assert.Equal(int32(1), span.error)
 	assert.Equal("test error", errMsg)
 	assert.Equal("*errors.errorString", errType)
@@ -376,7 +376,7 @@ func TestSpanFinishWithErrorStackFrames(t *testing.T) {
 
 	errMsg, _ := getMeta(span, ext.ErrorMsg)
 	errType, _ := getMeta(span, ext.ErrorType)
-	errStack, _ := getMeta(span, ext.ErrorHandlingStack)
+	errStack, _ := getMeta(span, ext.ErrorStack)
 
 	assert.Equal(int32(1), span.error)
 	assert.Equal("test error", errMsg)
@@ -429,7 +429,7 @@ func TestSpanSetTag(t *testing.T) {
 	assert.Equal(int32(1), span.error)
 	assert.Equal("abc", span.meta[ext.ErrorMsg])
 	assert.Equal("*errors.errorString", span.meta[ext.ErrorType])
-	assert.NotEmpty(span.meta[ext.ErrorHandlingStack])
+	assert.NotEmpty(span.meta[ext.ErrorStack])
 
 	span.SetTag(ext.Error, "something else")
 	assert.Equal(int32(1), span.error)
@@ -539,7 +539,7 @@ func TestSpanSetTagError(t *testing.T) {
 	t.Run("on", func(t *testing.T) {
 		span := newBasicSpan("web.request")
 		span.setTagError(errors.New("error value with trace"), errorConfig{noDebugStack: false})
-		assert.NotEmpty(t, span.meta[ext.ErrorHandlingStack])
+		assert.NotEmpty(t, span.meta[ext.ErrorStack])
 	})
 }
 
@@ -876,7 +876,7 @@ func TestErrorStack(t *testing.T) {
 		assert.Equal("Something wrong", span.meta[ext.ErrorMsg])
 		assert.Equal("*errors.errorString", span.meta[ext.ErrorType])
 
-		stack := span.meta[ext.ErrorHandlingStack]
+		stack := span.meta[ext.ErrorStack]
 		assert.NotEqual("", stack)
 		assert.Contains(stack, "tracer.TestErrorStack")
 		assert.NotContains(stack, "tracer.createTestError")
@@ -899,7 +899,7 @@ func TestSpanError(t *testing.T) {
 	assert.Equal(int32(1), span.error)
 	assert.Equal("Something wrong", span.meta[ext.ErrorMsg])
 	assert.Equal("*errors.errorString", span.meta[ext.ErrorType])
-	assert.NotEqual("", span.meta[ext.ErrorHandlingStack])
+	assert.NotEqual("", span.meta[ext.ErrorStack])
 	span.Finish()
 
 	// operating on a finished span is a no-op
@@ -932,7 +932,7 @@ func TestSpanError_Typed(t *testing.T) {
 	assert.Equal(int32(1), span.error)
 	assert.Equal("boom", span.meta[ext.ErrorMsg])
 	assert.Equal("*tracer.boomError", span.meta[ext.ErrorType])
-	assert.NotEqual("", span.meta[ext.ErrorHandlingStack])
+	assert.NotEqual("", span.meta[ext.ErrorStack])
 }
 
 func TestSpanErrorNil(t *testing.T) {