Skip to content
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.

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

feat: use latest apm-data to set success event.outcome when otel span.Status is Unset #12199

Merged
merged 7 commits into from
Dec 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -362,11 +362,11 @@ these terms.

--------------------------------------------------------------------------------
Dependency : github.com/elastic/apm-data
Version: v0.1.1-0.20231120111210-bd8f3ecad5bb
Version: v0.1.1-0.20231212041654-b2a4dabeb6e3
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].20231120111210-bd8f3ecad5bb/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].20231212041654-b2a4dabeb6e3/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down
1 change: 1 addition & 0 deletions changelogs/head.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ https://github.com/elastic/apm-server/compare/8.12\...main[View commits]

[float]
==== Added
- map OTel's `span.Status: Unset` to `event.outcome: success` instead of `event.outcome: unknown`
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ require (
github.com/dgraph-io/badger/v2 v2.2007.3-0.20201012072640-f5a7e0a1c83b
github.com/dustin/go-humanize v1.0.1
github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6
github.com/elastic/apm-data v0.1.1-0.20231120111210-bd8f3ecad5bb
github.com/elastic/apm-data v0.1.1-0.20231212041654-b2a4dabeb6e3
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231227085400-8c4a40fdbfda
github.com/elastic/elastic-agent-client/v7 v7.6.0
github.com/elastic/elastic-agent-libs v0.7.2
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,8 @@ github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFP
github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM=
github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 h1:Js+C3HEE0a5BDFmhEmJV/Uo4uzj/paHjd7yl6+KYguw=
github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6/go.mod h1:ba3gaJCuhxXN/O5AuiI56xxd6DukQdVOK0NfpzBntNo=
github.com/elastic/apm-data v0.1.1-0.20231120111210-bd8f3ecad5bb h1:mpfOadQBl6amJQzbXa0d9oy9GTvrlx0kqAb4R1soNoU=
github.com/elastic/apm-data v0.1.1-0.20231120111210-bd8f3ecad5bb/go.mod h1:z4iJVl8vyQa5v5o7UapWGHTsycBKsKfJfILuf2TZpYo=
github.com/elastic/apm-data v0.1.1-0.20231212041654-b2a4dabeb6e3 h1:pavWRIAjsPregjeLBOFlm6UBDbsVYXGuQh+ancXJNiw=
github.com/elastic/apm-data v0.1.1-0.20231212041654-b2a4dabeb6e3/go.mod h1:z4iJVl8vyQa5v5o7UapWGHTsycBKsKfJfILuf2TZpYo=
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231227085400-8c4a40fdbfda h1:JGfPRuxBRxVONx42TogqxZuJGCEjXOLDyQrIqiB6ALo=
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20231227085400-8c4a40fdbfda/go.mod h1:9tCrNLNmwxLSsacBw7hOc4tpQ4MD9+0+abJuQDwoZjw=
github.com/elastic/elastic-agent-autodiscover v0.6.6 h1:P1y0dDpbhJc7Uw/xe85irPEad4Vljygc+y4iSxtqW7A=
Expand Down
8 changes: 7 additions & 1 deletion systemtest/approvals/TestJaeger/batch_0.approved.json
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,10 @@
"traces"
],
"event.outcome": [
"unknown"
"success"
],
"event.success_count": [
1
],
"host.hostname": [
"host01"
Expand Down Expand Up @@ -573,6 +576,9 @@
"transaction.name.text": [
"Driver::findNearest"
],
"transaction.result": [
"Success"
],
"transaction.sampled": [
true
],
Expand Down
55 changes: 44 additions & 11 deletions systemtest/approvals/TestJaeger/batch_1.approved.json
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,10 @@
"traces"
],
"event.outcome": [
"unknown"
"success"
],
"event.success_count": [
1
],
"host.hostname": [
"host01"
Expand Down Expand Up @@ -496,7 +499,10 @@
"traces"
],
"event.outcome": [
"unknown"
"success"
],
"event.success_count": [
1
],
"host.hostname": [
"host01"
Expand Down Expand Up @@ -579,7 +585,10 @@
"traces"
],
"event.outcome": [
"unknown"
"success"
],
"event.success_count": [
1
],
"host.hostname": [
"host01"
Expand Down Expand Up @@ -748,7 +757,10 @@
"traces"
],
"event.outcome": [
"unknown"
"success"
],
"event.success_count": [
1
],
"host.hostname": [
"host01"
Expand Down Expand Up @@ -917,7 +929,10 @@
"traces"
],
"event.outcome": [
"unknown"
"success"
],
"event.success_count": [
1
],
"host.hostname": [
"host01"
Expand Down Expand Up @@ -1000,7 +1015,10 @@
"traces"
],
"event.outcome": [
"unknown"
"success"
],
"event.success_count": [
1
],
"host.hostname": [
"host01"
Expand Down Expand Up @@ -1083,7 +1101,10 @@
"traces"
],
"event.outcome": [
"unknown"
"success"
],
"event.success_count": [
1
],
"host.hostname": [
"host01"
Expand Down Expand Up @@ -1166,7 +1187,10 @@
"traces"
],
"event.outcome": [
"unknown"
"success"
],
"event.success_count": [
1
],
"host.hostname": [
"host01"
Expand Down Expand Up @@ -1249,7 +1273,10 @@
"traces"
],
"event.outcome": [
"unknown"
"success"
],
"event.success_count": [
1
],
"host.hostname": [
"host01"
Expand Down Expand Up @@ -1332,7 +1359,10 @@
"traces"
],
"event.outcome": [
"unknown"
"success"
],
"event.success_count": [
1
],
"host.hostname": [
"host01"
Expand Down Expand Up @@ -1415,7 +1445,10 @@
"traces"
],
"event.outcome": [
"unknown"
"success"
],
"event.success_count": [
1
],
"host.hostname": [
"host01"
Expand Down
8 changes: 7 additions & 1 deletion systemtest/approvals/TestOTLPGRPCTraces.approved.json
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,10 @@
"traces"
],
"event.outcome": [
"unknown"
"success"
],
"event.success_count": [
1
],
"labels.resource_attribute_array": [
"a",
Expand Down Expand Up @@ -276,6 +279,9 @@
"transaction.representative_count": [
1
],
"transaction.result": [
"Success"
],
"transaction.sampled": [
true
],
Expand Down