[Discover][Traces][Waterfall] Update isSpan logic to work properly with APM data#225602
Merged
iblancof merged 3 commits intoelastic:mainfrom Jun 30, 2025
Merged
Conversation
Contributor
|
Pinging @elastic/obs-ux-infra_services-team (Team:obs-ux-infra_services) |
Contributor
Contributor
|
Starting backport for target branches: 8.19, 9.1 https://github.com/elastic/kibana/actions/runs/15968026835 |
Contributor
|
Starting backport for target branches: 8.19, 9.1 https://github.com/elastic/kibana/actions/runs/15968037393 |
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Jun 30, 2025
…th APM data (elastic#225602) ## Summary Relates to elastic#214795 This simplifies the logic used to determine whether a document is a span or a transaction in the waterfall view, aligning it with the [changes we recently made in the profile enablement logic](elastic@2e02c0c). It also fixes an issue when checking for APM data: we were comparing an array (returned by ES) with a string, which caused APM spans and transactions to always be treated as transactions. ||Before|After| |-|-|-| |APM|❌|✅| |Processed OTel|✅|✅| |Non-processed OTel|✅|✅| (cherry picked from commit 7e58bfc)
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Jun 30, 2025
…th APM data (elastic#225602) ## Summary Relates to elastic#214795 This simplifies the logic used to determine whether a document is a span or a transaction in the waterfall view, aligning it with the [changes we recently made in the profile enablement logic](elastic@2e02c0c). It also fixes an issue when checking for APM data: we were comparing an array (returned by ES) with a string, which caused APM spans and transactions to always be treated as transactions. ||Before|After| |-|-|-| |APM|❌|✅| |Processed OTel|✅|✅| |Non-processed OTel|✅|✅| (cherry picked from commit 7e58bfc)
Contributor
💚 All backports created successfully
Note: Successful backport PRs will be merged automatically after passing CI. Questions ?Please refer to the Backport tool documentation |
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Jun 30, 2025
…th APM data (elastic#225602) ## Summary Relates to elastic#214795 This simplifies the logic used to determine whether a document is a span or a transaction in the waterfall view, aligning it with the [changes we recently made in the profile enablement logic](elastic@2e02c0c). It also fixes an issue when checking for APM data: we were comparing an array (returned by ES) with a string, which caused APM spans and transactions to always be treated as transactions. ||Before|After| |-|-|-| |APM|❌|✅| |Processed OTel|✅|✅| |Non-processed OTel|✅|✅| (cherry picked from commit 7e58bfc)
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Jun 30, 2025
…th APM data (elastic#225602) ## Summary Relates to elastic#214795 This simplifies the logic used to determine whether a document is a span or a transaction in the waterfall view, aligning it with the [changes we recently made in the profile enablement logic](elastic@2e02c0c). It also fixes an issue when checking for APM data: we were comparing an array (returned by ES) with a string, which caused APM spans and transactions to always be treated as transactions. ||Before|After| |-|-|-| |APM|❌|✅| |Processed OTel|✅|✅| |Non-processed OTel|✅|✅| (cherry picked from commit 7e58bfc)
Contributor
💚 All backports created successfully
Note: Successful backport PRs will be merged automatically after passing CI. Questions ?Please refer to the Backport tool documentation |
kibanamachine
added a commit
that referenced
this pull request
Jun 30, 2025
…rly with APM data (#225602) (#225769) # Backport This will backport the following commits from `main` to `9.1`: - [[Discover][Traces][Waterfall] Update isSpan logic to work properly with APM data (#225602)](#225602) <!--- Backport version: 9.6.6 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Irene Blanco","email":"irene.blanco@elastic.co"},"sourceCommit":{"committedDate":"2025-06-30T08:36:41Z","message":"[Discover][Traces][Waterfall] Update isSpan logic to work properly with APM data (#225602)\n\n## Summary\n\nRelates to https://github.com/elastic/kibana/issues/214795\n\nThis simplifies the logic used to determine whether a document is a span\nor a transaction in the waterfall view, aligning it with the [changes we\nrecently made in the profile enablement\nlogic](https://github.com/elastic/kibana/pull/224697/commits/2e02c0cf6387e5e59bab2272f639f582ee4fca64).\n\nIt also fixes an issue when checking for APM data: we were comparing an\narray (returned by ES) with a string, which caused APM spans and\ntransactions to always be treated as transactions.\n\n||Before|After|\n|-|-|-|\n|APM|❌|✅|\n|Processed OTel|✅|✅|\n|Non-processed OTel|✅|✅|","sha":"7e58bfc865025107768016c4067ddab9b048fca6","branchLabelMapping":{"^v9.2.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["bug","release_note:skip","Team:obs-ux-infra_services","backport:version","v9.1.0","v8.19.0","v9.2.0"],"title":"[Discover][Traces][Waterfall] Update isSpan logic to work properly with APM data","number":225602,"url":"https://github.com/elastic/kibana/pull/225602","mergeCommit":{"message":"[Discover][Traces][Waterfall] Update isSpan logic to work properly with APM data (#225602)\n\n## Summary\n\nRelates to https://github.com/elastic/kibana/issues/214795\n\nThis simplifies the logic used to determine whether a document is a span\nor a transaction in the waterfall view, aligning it with the [changes we\nrecently made in the profile enablement\nlogic](https://github.com/elastic/kibana/pull/224697/commits/2e02c0cf6387e5e59bab2272f639f582ee4fca64).\n\nIt also fixes an issue when checking for APM data: we were comparing an\narray (returned by ES) with a string, which caused APM spans and\ntransactions to always be treated as transactions.\n\n||Before|After|\n|-|-|-|\n|APM|❌|✅|\n|Processed OTel|✅|✅|\n|Non-processed OTel|✅|✅|","sha":"7e58bfc865025107768016c4067ddab9b048fca6"}},"sourceBranch":"main","suggestedTargetBranches":["9.1","8.19"],"targetPullRequestStates":[{"branch":"9.1","label":"v9.1.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.19","label":"v8.19.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v9.2.0","branchLabelMappingKey":"^v9.2.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/225602","number":225602,"mergeCommit":{"message":"[Discover][Traces][Waterfall] Update isSpan logic to work properly with APM data (#225602)\n\n## Summary\n\nRelates to https://github.com/elastic/kibana/issues/214795\n\nThis simplifies the logic used to determine whether a document is a span\nor a transaction in the waterfall view, aligning it with the [changes we\nrecently made in the profile enablement\nlogic](https://github.com/elastic/kibana/pull/224697/commits/2e02c0cf6387e5e59bab2272f639f582ee4fca64).\n\nIt also fixes an issue when checking for APM data: we were comparing an\narray (returned by ES) with a string, which caused APM spans and\ntransactions to always be treated as transactions.\n\n||Before|After|\n|-|-|-|\n|APM|❌|✅|\n|Processed OTel|✅|✅|\n|Non-processed OTel|✅|✅|","sha":"7e58bfc865025107768016c4067ddab9b048fca6"}}]}] BACKPORT--> Co-authored-by: Irene Blanco <irene.blanco@elastic.co>
Contributor
|
Looks like this PR has backport PRs but they still haven't been merged. Please merge them ASAP to keep the branches relatively in sync. |
kibanamachine
added a commit
that referenced
this pull request
Jul 1, 2025
…erly with APM data (#225602) (#225768) # Backport This will backport the following commits from `main` to `8.19`: - [[Discover][Traces][Waterfall] Update isSpan logic to work properly with APM data (#225602)](#225602) <!--- Backport version: 9.6.6 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Irene Blanco","email":"irene.blanco@elastic.co"},"sourceCommit":{"committedDate":"2025-06-30T08:36:41Z","message":"[Discover][Traces][Waterfall] Update isSpan logic to work properly with APM data (#225602)\n\n## Summary\n\nRelates to https://github.com/elastic/kibana/issues/214795\n\nThis simplifies the logic used to determine whether a document is a span\nor a transaction in the waterfall view, aligning it with the [changes we\nrecently made in the profile enablement\nlogic](https://github.com/elastic/kibana/pull/224697/commits/2e02c0cf6387e5e59bab2272f639f582ee4fca64).\n\nIt also fixes an issue when checking for APM data: we were comparing an\narray (returned by ES) with a string, which caused APM spans and\ntransactions to always be treated as transactions.\n\n||Before|After|\n|-|-|-|\n|APM|❌|✅|\n|Processed OTel|✅|✅|\n|Non-processed OTel|✅|✅|","sha":"7e58bfc865025107768016c4067ddab9b048fca6","branchLabelMapping":{"^v9.2.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["bug","release_note:skip","Team:obs-ux-infra_services","backport:version","v9.1.0","v8.19.0","v9.2.0"],"title":"[Discover][Traces][Waterfall] Update isSpan logic to work properly with APM data","number":225602,"url":"https://github.com/elastic/kibana/pull/225602","mergeCommit":{"message":"[Discover][Traces][Waterfall] Update isSpan logic to work properly with APM data (#225602)\n\n## Summary\n\nRelates to https://github.com/elastic/kibana/issues/214795\n\nThis simplifies the logic used to determine whether a document is a span\nor a transaction in the waterfall view, aligning it with the [changes we\nrecently made in the profile enablement\nlogic](https://github.com/elastic/kibana/pull/224697/commits/2e02c0cf6387e5e59bab2272f639f582ee4fca64).\n\nIt also fixes an issue when checking for APM data: we were comparing an\narray (returned by ES) with a string, which caused APM spans and\ntransactions to always be treated as transactions.\n\n||Before|After|\n|-|-|-|\n|APM|❌|✅|\n|Processed OTel|✅|✅|\n|Non-processed OTel|✅|✅|","sha":"7e58bfc865025107768016c4067ddab9b048fca6"}},"sourceBranch":"main","suggestedTargetBranches":["9.1","8.19"],"targetPullRequestStates":[{"branch":"9.1","label":"v9.1.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.19","label":"v8.19.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v9.2.0","branchLabelMappingKey":"^v9.2.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/225602","number":225602,"mergeCommit":{"message":"[Discover][Traces][Waterfall] Update isSpan logic to work properly with APM data (#225602)\n\n## Summary\n\nRelates to https://github.com/elastic/kibana/issues/214795\n\nThis simplifies the logic used to determine whether a document is a span\nor a transaction in the waterfall view, aligning it with the [changes we\nrecently made in the profile enablement\nlogic](https://github.com/elastic/kibana/pull/224697/commits/2e02c0cf6387e5e59bab2272f639f582ee4fca64).\n\nIt also fixes an issue when checking for APM data: we were comparing an\narray (returned by ES) with a string, which caused APM spans and\ntransactions to always be treated as transactions.\n\n||Before|After|\n|-|-|-|\n|APM|❌|✅|\n|Processed OTel|✅|✅|\n|Non-processed OTel|✅|✅|","sha":"7e58bfc865025107768016c4067ddab9b048fca6"}}]}] BACKPORT--> Co-authored-by: Irene Blanco <irene.blanco@elastic.co>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Relates to #214795
This simplifies the logic used to determine whether a document is a span or a transaction in the waterfall view, aligning it with the changes we recently made in the profile enablement logic.
It also fixes an issue when checking for APM data: we were comparing an array (returned by ES) with a string, which caused APM spans and transactions to always be treated as transactions.