diff --git a/NOTICE.txt b/NOTICE.txt index 8705d0e2219..8047f9493a0 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -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/apm-data@v0.1.1-0.20231120111210-bd8f3ecad5bb/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v0.1.1-0.20231212041654-b2a4dabeb6e3/LICENSE: Apache License Version 2.0, January 2004 diff --git a/changelogs/head.asciidoc b/changelogs/head.asciidoc index 55aa3eb326f..4d12089d629 100644 --- a/changelogs/head.asciidoc +++ b/changelogs/head.asciidoc @@ -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` diff --git a/go.mod b/go.mod index 3d90177c161..d1c2f19ad9c 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/go.sum b/go.sum index 962eca479a1..37203303f91 100644 --- a/go.sum +++ b/go.sum @@ -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= diff --git a/systemtest/approvals/TestJaeger/batch_0.approved.json b/systemtest/approvals/TestJaeger/batch_0.approved.json index 6d2e8adb656..3484db6e060 100644 --- a/systemtest/approvals/TestJaeger/batch_0.approved.json +++ b/systemtest/approvals/TestJaeger/batch_0.approved.json @@ -502,7 +502,10 @@ "traces" ], "event.outcome": [ - "unknown" + "success" + ], + "event.success_count": [ + 1 ], "host.hostname": [ "host01" @@ -573,6 +576,9 @@ "transaction.name.text": [ "Driver::findNearest" ], + "transaction.result": [ + "Success" + ], "transaction.sampled": [ true ], diff --git a/systemtest/approvals/TestJaeger/batch_1.approved.json b/systemtest/approvals/TestJaeger/batch_1.approved.json index d765ad08e9d..71f7aef4764 100644 --- a/systemtest/approvals/TestJaeger/batch_1.approved.json +++ b/systemtest/approvals/TestJaeger/batch_1.approved.json @@ -413,7 +413,10 @@ "traces" ], "event.outcome": [ - "unknown" + "success" + ], + "event.success_count": [ + 1 ], "host.hostname": [ "host01" @@ -496,7 +499,10 @@ "traces" ], "event.outcome": [ - "unknown" + "success" + ], + "event.success_count": [ + 1 ], "host.hostname": [ "host01" @@ -579,7 +585,10 @@ "traces" ], "event.outcome": [ - "unknown" + "success" + ], + "event.success_count": [ + 1 ], "host.hostname": [ "host01" @@ -748,7 +757,10 @@ "traces" ], "event.outcome": [ - "unknown" + "success" + ], + "event.success_count": [ + 1 ], "host.hostname": [ "host01" @@ -917,7 +929,10 @@ "traces" ], "event.outcome": [ - "unknown" + "success" + ], + "event.success_count": [ + 1 ], "host.hostname": [ "host01" @@ -1000,7 +1015,10 @@ "traces" ], "event.outcome": [ - "unknown" + "success" + ], + "event.success_count": [ + 1 ], "host.hostname": [ "host01" @@ -1083,7 +1101,10 @@ "traces" ], "event.outcome": [ - "unknown" + "success" + ], + "event.success_count": [ + 1 ], "host.hostname": [ "host01" @@ -1166,7 +1187,10 @@ "traces" ], "event.outcome": [ - "unknown" + "success" + ], + "event.success_count": [ + 1 ], "host.hostname": [ "host01" @@ -1249,7 +1273,10 @@ "traces" ], "event.outcome": [ - "unknown" + "success" + ], + "event.success_count": [ + 1 ], "host.hostname": [ "host01" @@ -1332,7 +1359,10 @@ "traces" ], "event.outcome": [ - "unknown" + "success" + ], + "event.success_count": [ + 1 ], "host.hostname": [ "host01" @@ -1415,7 +1445,10 @@ "traces" ], "event.outcome": [ - "unknown" + "success" + ], + "event.success_count": [ + 1 ], "host.hostname": [ "host01" diff --git a/systemtest/approvals/TestOTLPGRPCTraces.approved.json b/systemtest/approvals/TestOTLPGRPCTraces.approved.json index dee4990f459..dbcfe453a16 100644 --- a/systemtest/approvals/TestOTLPGRPCTraces.approved.json +++ b/systemtest/approvals/TestOTLPGRPCTraces.approved.json @@ -203,7 +203,10 @@ "traces" ], "event.outcome": [ - "unknown" + "success" + ], + "event.success_count": [ + 1 ], "labels.resource_attribute_array": [ "a", @@ -276,6 +279,9 @@ "transaction.representative_count": [ 1 ], + "transaction.result": [ + "Success" + ], "transaction.sampled": [ true ],