capture code stacktrace

Makefile

@@ -14,9 +14,11 @@ protolint:
 gomodtidy:
 	go mod tidy -v
 
-generate:
+generate_code:
 	go generate ./...
 
+generate: generate_code update-licenses
+
 fieldalignment:
 	go run golang.org/x/tools/go/analysis/passes/fieldalignment/cmd/[email protected] -test=false $(shell go list ./... | grep -v modeldecoder/generator | grep -v test | grep -v model/modelpb)
 

input/elasticapm/internal/modeldecoder/rumv3/transaction_test.go

@@ -243,6 +243,7 @@ func TestDecodeMapToTransactionModel(t *testing.T) {
 				"representative_count",
 				"stacktrace.library_frame",
 				"stacktrace.vars",
+				"code",
 				// stacktrace original and sourcemap values are set when sourcemapping is applied
 				"stacktrace.original",
 				"stacktrace.sourcemap",

input/elasticapm/internal/modeldecoder/v2/span_test.go

@@ -112,6 +112,9 @@ func TestDecodeMapToSpanModel(t *testing.T) {
 				// Derived using service.target.*
 				"destination_service.Resource",
 
+				// only provided for otel-based agents
+				"code",
+
 				// Not set for spans:
 				"destination_service.response_time",
 				"destination_service.ResponseTime.Count",

input/otlp/traces.go

@@ -76,6 +76,7 @@ const (
 	attributeUrlFull                    = "url.full"
 	attributeUserAgentOriginal          = "user_agent.original"
 	attributeDbElasticsearchClusterName = "db.elasticsearch.cluster.name"
+	attributeStackTrace                 = "code.stacktrace" // semconv 1.24 or later
 )
 
 // ConsumeTracesResult contains the number of rejected spans and error message for partial success response.
@@ -746,6 +747,12 @@ func TranslateSpan(spanKind ptrace.SpanKind, attributes pcommon.Map, event *mode
 				httpURL = stringval
 				isHTTP = true
 
+			case attributeStackTrace:
+				if event.Span.Code == nil {
+					event.Span.Code = modelpb.CodeFromVTPool()
+				}
+				event.Span.Code.Stacktrace = stringval
+
 			// miscellaneous
 			case "span.kind": // filter out
 			case semconv.AttributePeerService:

input/otlp/traces_test.go

@@ -1596,6 +1596,15 @@ func TestGRPCTransactionFromNodejsSDK(t *testing.T) {
 	})
 }
 
+func TestSpanCodeStacktrace(t *testing.T) {
+	t.Run("code stacktrace", func(t *testing.T) {
+		event := transformSpanWithAttributes(t, map[string]interface{}{
+			"code.stacktrace": "stacktrace value",
+		})
+		assert.Equal(t, "stacktrace value", event.Span.Code.Stacktrace)
+	})
+}
+
 func testJaegerLogs() []jaegermodel.Log {
 	return []jaegermodel.Log{{
 		// errors that can be converted to elastic errors

model/modeljson/internal/span.go

@@ -22,6 +22,7 @@ type Span struct {
 	Composite           *SpanComposite     `json:"composite,omitempty"`
 	Destination         *SpanDestination   `json:"destination,omitempty"`
 	DB                  *DB                `json:"db,omitempty"`
+	Code                *Code              `json:"code,omitempty"`
 	Sync                *bool              `json:"sync,omitempty"`
 	Kind                string             `json:"kind,omitempty"`
 	Action              string             `json:"action,omitempty"`
@@ -35,6 +36,10 @@ type Span struct {
 	RepresentativeCount float64            `json:"representative_count,omitempty"`
 }
 
+type Code struct {
+	Stacktrace string `json:"stacktrace,omitempty"`
+}
+
 type SpanDestination struct {
 	Service SpanDestinationService `json:"service"`
 }

model/modeljson/span.pb.json.go

@@ -93,6 +93,12 @@ func SpanModelJSON(e *modelpb.Span, out *modeljson.Span) {
 			}
 		}
 	}
+	if e.Code != nil {
+		out.Code = &modeljson.Code{
+			Stacktrace: e.Code.Stacktrace,
+		}
+	}
+
 	if n := len(e.Links); n > 0 {
 		out.Links = make([]modeljson.SpanLink, n)
 		for i, link := range e.Links {