Only overwrite service.version if service.name is also set (#7281)

tobiasstadler · axw · web-flow · commit 4fa6b6a327e6 · 2022-02-16T09:01:16.000+08:00
* Only overwrite service.version if service.name is also set * Added #7281 to the changelog * Fixed tests Co-authored-by: Andrew Wilkins <axw@elastic.co>
diff --git a/beater/test_approved_es_documents/TestPublishIntegrationErrors.approved.json b/beater/test_approved_es_documents/TestPublishIntegrationErrors.approved.json
@@ -327,8 +327,7 @@
                 "runtime": {
                     "name": "node",
                     "version": "8.0.0"
-                },
-                "version": "5.1.3"
+                }
             },
             "source": {
                 "ip": "12.53.12.1"
diff --git a/beater/test_approved_es_documents/TestPublishIntegrationEvents.approved.json b/beater/test_approved_es_documents/TestPublishIntegrationEvents.approved.json
@@ -261,8 +261,7 @@
                 "runtime": {
                     "name": "Java",
                     "version": "10.0.2"
-                },
-                "version": "4.3.0"
+                }
             },
             "source": {
                 "ip": "12.53.12.1"
@@ -400,8 +399,7 @@
                 "runtime": {
                     "name": "Java",
                     "version": "10.0.2"
-                },
-                "version": "4.3.0"
+                }
             },
             "span": {
                 "action": "connect",
@@ -602,8 +600,7 @@
                 "runtime": {
                     "name": "Java",
                     "version": "10.0.2"
-                },
-                "version": "4.3.0"
+                }
             },
             "source": {
                 "ip": "12.53.12.1",
diff --git a/beater/test_approved_es_documents/TestPublishIntegrationSpans.approved.json b/beater/test_approved_es_documents/TestPublishIntegrationSpans.approved.json
@@ -655,8 +655,7 @@
                 "runtime": {
                     "name": "node",
                     "version": "8.0.0"
-                },
-                "version": "5.1.3"
+                }
             },
             "span": {
                 "action": "query",
diff --git a/changelogs/head.asciidoc b/changelogs/head.asciidoc
@@ -14,6 +14,7 @@ See <<apm-server-configuration>> for more information.
 [float]
 ==== Bug fixes
 - Fix infinite loop in tail-based sampling subscriber causing high CPU and repeated Elasticsearch searches {pull}7211[7211]
+- Do not overwrite `service version` if no transaction/error/... specific `service.name` is givven {pull}7281[7281]
 
 [float]
 ==== Intake API Changes
diff --git a/model/modeldecoder/rumv3/decoder.go b/model/modeldecoder/rumv3/decoder.go
@@ -436,16 +436,14 @@ func mapToServiceModel(from contextService, out *model.Service) {
 	}
 	if from.Name.IsSet() {
 		out.Name = from.Name.Val
+		out.Version = from.Version.Val
 	}
 	if from.Runtime.Name.IsSet() {
 		out.Runtime.Name = from.Runtime.Name.Val
 	}
 	if from.Runtime.Version.IsSet() {
 		out.Runtime.Version = from.Runtime.Version.Val
 	}
-	if from.Version.IsSet() {
-		out.Version = from.Version.Val
-	}
 }
 
 func mapToAgentModel(from contextServiceAgent, out *model.Agent) {
diff --git a/model/modeldecoder/v2/decoder.go b/model/modeldecoder/v2/decoder.go
@@ -763,6 +763,7 @@ func mapToServiceModel(from contextService, out *model.Service) {
 	}
 	if from.Name.IsSet() {
 		out.Name = from.Name.Val
+		out.Version = from.Version.Val
 	}
 	if from.Node.Name.IsSet() {
 		out.Node.Name = from.Node.Name.Val
@@ -773,9 +774,6 @@ func mapToServiceModel(from contextService, out *model.Service) {
 	if from.Runtime.Version.IsSet() {
 		out.Runtime.Version = from.Runtime.Version.Val
 	}
-	if from.Version.IsSet() {
-		out.Version = from.Version.Val
-	}
 	if from.Origin.IsSet() {
 		outOrigin := &model.ServiceOrigin{}
 		if from.Origin.ID.IsSet() {
diff --git a/processor/stream/test_approved_es_documents/testIntakeIntegrationErrors.approved.json b/processor/stream/test_approved_es_documents/testIntakeIntegrationErrors.approved.json
@@ -313,8 +313,7 @@
                 "runtime": {
                     "name": "node",
                     "version": "8.0.0"
-                },
-                "version": "5.1.3"
+                }
             },
             "source": {
                 "ip": "12.53.12.1"
diff --git a/processor/stream/test_approved_es_documents/testIntakeIntegrationEvents.approved.json b/processor/stream/test_approved_es_documents/testIntakeIntegrationEvents.approved.json
@@ -246,8 +246,7 @@
                 "runtime": {
                     "name": "Java",
                     "version": "10.0.2"
-                },
-                "version": "4.3.0"
+                }
             },
             "source": {
                 "ip": "12.53.12.1"
@@ -372,8 +371,7 @@
                 "runtime": {
                     "name": "Java",
                     "version": "10.0.2"
-                },
-                "version": "4.3.0"
+                }
             },
             "span": {
                 "action": "connect",
@@ -561,8 +559,7 @@
                 "runtime": {
                     "name": "Java",
                     "version": "10.0.2"
-                },
-                "version": "4.3.0"
+                }
             },
             "source": {
                 "ip": "12.53.12.1",
diff --git a/processor/stream/test_approved_es_documents/testIntakeIntegrationSpans.approved.json b/processor/stream/test_approved_es_documents/testIntakeIntegrationSpans.approved.json
@@ -575,8 +575,7 @@
                 "runtime": {
                     "name": "node",
                     "version": "8.0.0"
-                },
-                "version": "5.1.3"
+                }
             },
             "span": {
                 "action": "query",

Original file line number	Diff line number	Diff line change
`@@ -436,16 +436,14 @@ func mapToServiceModel(from contextService, out *model.Service) {`
`436`	`436`	`}`
`437`	`437`	`if from.Name.IsSet() {`
`438`	`438`	`out.Name = from.Name.Val`
	`439`	`+ out.Version = from.Version.Val`
`439`	`440`	`}`
`440`	`441`	`if from.Runtime.Name.IsSet() {`
`441`	`442`	`out.Runtime.Name = from.Runtime.Name.Val`
`442`	`443`	`}`
`443`	`444`	`if from.Runtime.Version.IsSet() {`
`444`	`445`	`out.Runtime.Version = from.Runtime.Version.Val`
`445`	`446`	`}`
`446`		`- if from.Version.IsSet() {`
`447`		`- out.Version = from.Version.Val`
`448`		`- }`
`449`	`447`	`}`
`450`	`448`
`451`	`449`	`func mapToAgentModel(from contextServiceAgent, out *model.Agent) {`
Original file line number	Diff line number	Diff line change
`@@ -763,6 +763,7 @@ func mapToServiceModel(from contextService, out *model.Service) {`
`763`	`763`	`}`
`764`	`764`	`if from.Name.IsSet() {`
`765`	`765`	`out.Name = from.Name.Val`
	`766`	`+ out.Version = from.Version.Val`
`766`	`767`	`}`
`767`	`768`	`if from.Node.Name.IsSet() {`
`768`	`769`	`out.Node.Name = from.Node.Name.Val`
`@@ -773,9 +774,6 @@ func mapToServiceModel(from contextService, out *model.Service) {`
`773`	`774`	`if from.Runtime.Version.IsSet() {`
`774`	`775`	`out.Runtime.Version = from.Runtime.Version.Val`
`775`	`776`	`}`
`776`		`- if from.Version.IsSet() {`
`777`		`- out.Version = from.Version.Val`
`778`		`- }`
`779`	`777`	`if from.Origin.IsSet() {`
`780`	`778`	`outOrigin := &model.ServiceOrigin{}`
`781`	`779`	`if from.Origin.ID.IsSet() {`