Remove incorrect or unnecessary fields from documents from otlp span …

…event (#374) otlp span event documents contain unnecessary fields, as a side effect of span event APMEvent being cloned from the span APMEvent. Due to this, parent.id value is either empty or grandparent's id. Remove it. Remove service.target.* and service.origin.*
elastic · Oct 9, 2024 · 44e3a29 · 44e3a29
1 parent 330078b
commit 44e3a29
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 54 deletions.
diff --git a/input/otlp/test_approved/span_jaeger_http.approved.json b/input/otlp/test_approved/span_jaeger_http.approved.json
@@ -106,11 +106,7 @@
                 "language": {
                     "name": "unknown"
                 },
-                "name": "unknown",
-                "target": {
-                    "name": "foo.bar.com:80",
-                    "type": "http"
-                }
+                "name": "unknown"
             },
             "timestamp": {
                 "us": 1576500418000768
@@ -151,11 +147,7 @@
                 "language": {
                     "name": "unknown"
                 },
-                "name": "unknown",
-                "target": {
-                    "name": "foo.bar.com:80",
-                    "type": "http"
-                }
+                "name": "unknown"
             },
             "timestamp": {
                 "us": 1576500418000768
@@ -199,11 +191,7 @@
                 "language": {
                     "name": "unknown"
                 },
-                "name": "unknown",
-                "target": {
-                    "name": "foo.bar.com:80",
-                    "type": "http"
-                }
+                "name": "unknown"
             },
             "timestamp": {
                 "us": 1576500418000768
@@ -247,11 +235,7 @@
                 "language": {
                     "name": "unknown"
                 },
-                "name": "unknown",
-                "target": {
-                    "name": "foo.bar.com:80",
-                    "type": "http"
-                }
+                "name": "unknown"
             },
             "timestamp": {
                 "us": 1576500418000768
@@ -295,11 +279,7 @@
                 "language": {
                     "name": "unknown"
                 },
-                "name": "unknown",
-                "target": {
-                    "name": "foo.bar.com:80",
-                    "type": "http"
-                }
+                "name": "unknown"
             },
             "timestamp": {
                 "us": 1576500418000768
@@ -340,11 +320,7 @@
                 "language": {
                     "name": "unknown"
                 },
-                "name": "unknown",
-                "target": {
-                    "name": "foo.bar.com:80",
-                    "type": "http"
-                }
+                "name": "unknown"
             },
             "timestamp": {
                 "us": 1576500418000768
@@ -380,18 +356,11 @@
                 "isValid": "false"
             },
             "message": "baggage",
-            "parent": {
-                "id": "0000000058585858"
-            },
             "service": {
                 "language": {
                     "name": "unknown"
                 },
-                "name": "unknown",
-                "target": {
-                    "name": "foo.bar.com:80",
-                    "type": "http"
-                }
+                "name": "unknown"
             },
             "span": {
                 "id": "0000000041414646"
@@ -427,18 +396,11 @@
                 "level": "info"
             },
             "message": "retrying connection",
-            "parent": {
-                "id": "0000000058585858"
-            },
             "service": {
                 "language": {
                     "name": "unknown"
                 },
-                "name": "unknown",
-                "target": {
-                    "name": "foo.bar.com:80",
-                    "type": "http"
-                }
+                "name": "unknown"
             },
             "span": {
                 "id": "0000000041414646"
@@ -473,18 +435,11 @@
             "labels": {
                 "level": "error"
             },
-            "parent": {
-                "id": "0000000058585858"
-            },
             "service": {
                 "language": {
                     "name": "unknown"
                 },
-                "name": "unknown",
-                "target": {
-                    "name": "foo.bar.com:80",
-                    "type": "http"
-                }
+                "name": "unknown"
             },
             "span": {
                 "id": "0000000041414646"

diff --git a/input/otlp/traces.go b/input/otlp/traces.go
@@ -1073,6 +1073,14 @@ func (c *Consumer) convertSpanEvent(
 	initEventLabels(event)
 	event.Transaction = nil // populate fields as required from parent
 	event.Span = nil        // populate fields as required from parent
+	event.ParentId = ""     // populate fields as required from parent
+
+	// Remove unnecessary fields from span event
+	if event.Service != nil {
+		event.Service.Target = nil
+		event.Service.Origin = nil
+	}
+
 	event.Timestamp = modelpb.FromTime(spanEvent.Timestamp().AsTime().Add(timeDelta))
 
 	isJaeger := strings.HasPrefix(parent.Agent.Name, "Jaeger")