feat: add error.id to jaeger errors (#272)

elastic · May 7, 2024 · e72603d · e72603d
1 parent 337a5ee
commit e72603d
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 2 deletions.
diff --git a/input/otlp/test_approved/span_jaeger_data_stream_with_error.approved.json b/input/otlp/test_approved/span_jaeger_data_stream_with_error.approved.json
@@ -49,6 +49,7 @@
                 "namespace": "4"
             },
             "error": {
+                "id": "dynamic",
                 "exception": [
                     {
                         "message": "no connection established"
@@ -78,4 +79,4 @@
             }
         }
     ]
-}
+}
diff --git a/input/otlp/test_approved/span_jaeger_http.approved.json b/input/otlp/test_approved/span_jaeger_http.approved.json
@@ -78,6 +78,7 @@
                 "version": "unknown"
             },
             "error": {
+                "id": "dynamic",
                 "exception": [
                     {
                         "message": "no connection established"
@@ -173,6 +174,7 @@
                 "version": "unknown"
             },
             "error": {
+                "id": "dynamic",
                 "exception": [
                     {
                         "message": "no connection established"
@@ -220,6 +222,7 @@
                 "version": "unknown"
             },
             "error": {
+                "id": "dynamic",
                 "exception": [
                     {
                         "message": "no connection established"
@@ -267,6 +270,7 @@
                 "version": "unknown"
             },
             "error": {
+                "id": "dynamic",
                 "exception": [
                     {
                         "type": "DBClosedException"

diff --git a/input/otlp/test_approved/transaction_jaeger_data_stream_with_error.approved.json b/input/otlp/test_approved/transaction_jaeger_data_stream_with_error.approved.json
@@ -46,6 +46,7 @@
                 "namespace": "4"
             },
             "error": {
+                "id": "dynamic",
                 "exception": [
                     {
                         "message": "no connection established"
@@ -77,4 +78,4 @@
             }
         }
     ]
-}
+}
diff --git a/input/otlp/test_approved/transaction_jaeger_full.approved.json b/input/otlp/test_approved/transaction_jaeger_full.approved.json
@@ -70,6 +70,7 @@
                 "version": "unknown"
             },
             "error": {
+                "id": "dynamic",
                 "exception": [
                     {
                         "message": "no connection established"
@@ -185,6 +186,7 @@
                 "version": "unknown"
             },
             "error": {
+                "id": "dynamic",
                 "exception": [
                     {
                         "message": "no connection established"
@@ -242,6 +244,7 @@
                 "version": "unknown"
             },
             "error": {
+                "id": "dynamic",
                 "exception": [
                     {
                         "message": "no connection established"
@@ -299,6 +302,7 @@
                 "version": "unknown"
             },
             "error": {
+                "id": "dynamic",
                 "exception": [
                     {
                         "type": "DBClosedException"

diff --git a/input/otlp/traces.go b/input/otlp/traces.go
@@ -1221,6 +1221,9 @@ func (c *Consumer) convertJaegerErrorSpanEvent(event ptrace.SpanEvent, apmEvent
 		e.Exception = modelpb.ExceptionFromVTPool()
 		e.Exception.Message = exMessage
 		e.Exception.Type = exType
+		if id, err := newUniqueID(); err == nil {
+			e.Id = id
+		}
 	}
 	return e
 }

diff --git a/input/otlp/traces_test.go b/input/otlp/traces_test.go
@@ -1960,6 +1960,12 @@ func approveEventDocs(t testing.TB, name string, docs [][]byte) {
 			delete(m, "event")
 		}
 
+		if e, ok := m["error"].(map[string]any); ok {
+			if _, ok := e["id"]; ok {
+				e["id"] = "dynamic"
+			}
+		}
+
 		events[i] = m
 	}
 	received := map[string]any{"events": events}