Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 16, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
00b9f9f
Only overwrite service.version if service.name is also set
tobiasstadler Feb 14, 2022
9588621
Added #7281 to the changelog
tobiasstadler Feb 14, 2022
c425eea
Fixed tests
tobiasstadler Feb 15, 2022
3dcc971
Merge branch 'main' into service-version-needs-service-name
axw Feb 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions beater/test_approved_es_documents/TestPublishIntegrationErrors.approved.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,8 +327,7 @@
"runtime": {
"name": "node",
"version": "8.0.0"
},
"version": "5.1.3"
}
},
"source": {
"ip": "12.53.12.1"
Expand Down
9 changes: 3 additions & 6 deletions beater/test_approved_es_documents/TestPublishIntegrationEvents.approved.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,8 +261,7 @@
"runtime": {
"name": "Java",
"version": "10.0.2"
},
"version": "4.3.0"
}
},
"source": {
"ip": "12.53.12.1"
Expand Down Expand Up @@ -400,8 +399,7 @@
"runtime": {
"name": "Java",
"version": "10.0.2"
},
"version": "4.3.0"
}
},
"span": {
"action": "connect",
Expand Down Expand Up @@ -602,8 +600,7 @@
"runtime": {
"name": "Java",
"version": "10.0.2"
},
"version": "4.3.0"
}
},
"source": {
"ip": "12.53.12.1",
Expand Down
3 changes: 1 addition & 2 deletions beater/test_approved_es_documents/TestPublishIntegrationSpans.approved.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,8 +655,7 @@
"runtime": {
"name": "node",
"version": "8.0.0"
},
"version": "5.1.3"
}
},
"span": {
"action": "query",
Expand Down
1 change: 1 addition & 0 deletions changelogs/head.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions model/modeldecoder/rumv3/decoder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 1 addition & 3 deletions model/modeldecoder/v2/decoder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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() {
Expand Down
3 changes: 1 addition & 2 deletions processor/stream/test_approved_es_documents/testIntakeIntegrationErrors.approved.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,8 +313,7 @@
"runtime": {
"name": "node",
"version": "8.0.0"
},
"version": "5.1.3"
}
},
"source": {
"ip": "12.53.12.1"
Expand Down
9 changes: 3 additions & 6 deletions processor/stream/test_approved_es_documents/testIntakeIntegrationEvents.approved.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,8 +246,7 @@
"runtime": {
"name": "Java",
"version": "10.0.2"
},
"version": "4.3.0"
}
},
"source": {
"ip": "12.53.12.1"
Expand Down Expand Up @@ -372,8 +371,7 @@
"runtime": {
"name": "Java",
"version": "10.0.2"
},
"version": "4.3.0"
}
},
"span": {
"action": "connect",
Expand Down Expand Up @@ -561,8 +559,7 @@
"runtime": {
"name": "Java",
"version": "10.0.2"
},
"version": "4.3.0"
}
},
"source": {
"ip": "12.53.12.1",
Expand Down
3 changes: 1 addition & 2 deletions processor/stream/test_approved_es_documents/testIntakeIntegrationSpans.approved.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,8 +575,7 @@
"runtime": {
"name": "node",
"version": "8.0.0"
},
"version": "5.1.3"
}
},
"span": {
"action": "query",
Expand Down