Merge pull request #205 from axw/0.5

Check reused error stacktrace slice correctly

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 
-## [Unreleased](https://github.com/elastic/apm-agent-go/compare/v0.5.0...master)
+## [Unreleased](https://github.com/elastic/apm-agent-go/compare/v0.5.1...master)
+
+## [v0.5.1](https://github.com/elastic/apm-agent-go/releases/tag/v0.5.1)
+
+ - Fixed a bug causing error stacktraces and culprit to sometimes not be set (#204)
 
 ## [v0.5.0](https://github.com/elastic/apm-agent-go/releases/tag/v0.5.0)
 

error.go

@@ -90,7 +90,7 @@ func (t *Tracer) NewError(err error) *Error {
 	}
 	initException(&e.model.Exception, errors.Cause(err))
 	initStacktrace(e, err)
-	if e.stacktrace == nil {
+	if len(e.stacktrace) == 0 {
 		e.SetStacktrace(2)
 	}
 	return e

error_test.go

@@ -1,6 +1,7 @@
 package elasticapm_test
 
 import (
+	"fmt"
 	"path/filepath"
 	"runtime"
 	"testing"
@@ -59,18 +60,45 @@ func TestInternalStackTrace(t *testing.T) {
 	}}, stacktrace)
 }
 
+func TestErrorAutoStackTraceReuse(t *testing.T) {
+	tracer, r := transporttest.NewRecorderTracer()
+	defer tracer.Close()
+
+	err := fmt.Errorf("hullo") // no stacktrace attached
+	for i := 0; i < 1000; i++ {
+		tracer.NewError(err).Send()
+	}
+	tracer.Flush(nil)
+
+	// The previously sent error objects should have
+	// been reset and will be reused. We reuse the
+	// stacktrace slice. See elastic/apm-agent-go#204.
+	for i := 0; i < 1000; i++ {
+		tracer.NewError(err).Send()
+	}
+	tracer.Flush(nil)
+
+	payloads := r.Payloads()
+	assert.NotEmpty(t, payloads)
+	for _, p := range payloads {
+		errors := p.Errors()
+		assert.NotEmpty(t, errors)
+		for _, e := range errors {
+			assert.NotEqual(t, "", e.Culprit)
+			assert.NotEmpty(t, e.Exception.Stacktrace)
+		}
+	}
+}
+
 func sendError(t *testing.T, err error, f ...func(*elasticapm.Error)) *model.Error {
-	var r transporttest.RecorderTransport
-	tracer, newTracerErr := elasticapm.NewTracer("tracer_testing", "")
-	assert.NoError(t, newTracerErr)
+	tracer, r := transporttest.NewRecorderTracer()
 	defer tracer.Close()
 
 	error_ := tracer.NewError(err)
 	for _, f := range f {
 		f(error_)
 	}
 
-	tracer.Transport = &r
 	error_.Send()
 	tracer.Flush(nil)
 

version.go

@@ -2,5 +2,5 @@ package elasticapm
 
 const (
 	// AgentVersion is the Elastic APM Go Agent version.
-	AgentVersion = "0.5.0"
+	AgentVersion = "0.5.1"
 )