-
Notifications
You must be signed in to change notification settings - Fork 8.2k
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
[APM UI] Fix OpenTelemetry agent names #193134
[APM UI] Fix OpenTelemetry agent names #193134
Conversation
🤖 GitHub commentsExpand to view the GitHub comments
Just comment with:
|
Pinging @elastic/obs-ux-infra_services-team (Team:obs-ux-infra_services) |
d2faabb
to
a80cbd0
Compare
packages/kbn-custom-icons/src/components/agent_icon/get_agent_icon.ts
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I haven't tested it, but the code is looking good. Thanks for the synthtrace scenario. Left a few comments
Great point, @rogercoll ! @rmyz Can we cover that case as well please? So that the prefix can be either |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good job, checked with the scenario and works as expected, added some small comments/questions, should be quick to add
packages/kbn-custom-icons/src/components/agent_icon/get_agent_icon.ts
Outdated
Show resolved
Hide resolved
will add that case @rogercoll @AlexanderWert , thanks for checking guys! 🚀 |
Added I will be fixing the failing tests |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Code LGTM 💯 Thanks for the changes!
} | ||
|
||
return ( | ||
agentName.startsWith(`opentelemetry/${language}`) || agentName.startsWith(`otlp/${language}`) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit:
agentName.startsWith(`opentelemetry/${language}`) || agentName.startsWith(`otlp/${language}`) | |
agentName.startsWith(`opentelemetry/${language}` || `otlp/${language}`); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Telemetry changes LGTM
238b91f
to
7c1f216
Compare
@elasticmachine merge upstream |
@@ -8,6 +8,7 @@ | |||
*/ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
💪 !
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM! Thanks for the changes.
@elasticmachine merge upstream |
9ca7365
to
548d7a3
Compare
💚 Build Succeeded
Metrics [docs]Public APIs missing comments
Async chunks
History
To update your PR or re-run it, just comment with: cc @rmyz |
## Summary Fixes elastic#180444 This PR fixes the agent names not being able to properly be retrieved by the APM UI, changing the way we map OpenTelemetry agent names. As the format changed from `(opentelemetry|otlp)/{agentName}` to `(opentelemetry|otlp)/{agentName}/{details}`, we now get the second part splitting by `/`. Added mappings for RUM, Android, and iOS OpenTelemetry client, also fixed `get_service_metadata_details` to get the correct OpenTelemetry details. |Before|After| |-|-| |![image](https://github.com/user-attachments/assets/28732018-511b-44e0-ac86-cdbe7ed0d1e0)|![image](https://github.com/user-attachments/assets/45a29cc6-f939-4c52-bcc7-54dc15b1a403)| ## How to test 1. Checkout to this branch 2. Run `node scripts/synthtrace many_otel_services.ts --live --clean` which will fill some APM Otel services. 3. Check that the icon is now rendering (cherry picked from commit 735e216)
💔 Some backports could not be created
Note: Successful backport PRs will be merged automatically after passing CI. Manual backportTo create the backport manually run:
Questions ?Please refer to the Backport tool documentation |
💚 All backports created successfully
Note: Successful backport PRs will be merged automatically after passing CI. Questions ?Please refer to the Backport tool documentation |
## Summary Fixes elastic#180444 This PR fixes the agent names not being able to properly be retrieved by the APM UI, changing the way we map OpenTelemetry agent names. As the format changed from `(opentelemetry|otlp)/{agentName}` to `(opentelemetry|otlp)/{agentName}/{details}`, we now get the second part splitting by `/`. Added mappings for RUM, Android, and iOS OpenTelemetry client, also fixed `get_service_metadata_details` to get the correct OpenTelemetry details. |Before|After| |-|-| |![image](https://github.com/user-attachments/assets/28732018-511b-44e0-ac86-cdbe7ed0d1e0)|![image](https://github.com/user-attachments/assets/45a29cc6-f939-4c52-bcc7-54dc15b1a403)| ## How to test 1. Checkout to this branch 2. Run `node scripts/synthtrace many_otel_services.ts --live --clean` which will fill some APM Otel services. 3. Check that the icon is now rendering (cherry picked from commit 735e216) # Conflicts: # src/plugins/telemetry/schema/oss_plugins.json
# Backport This will backport the following commits from `main` to `8.x`: - [[APM UI] Fix OpenTelemetry agent names (#193134)](#193134) <!--- Backport version: 9.4.3 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Sergi Romeu","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-09-20T07:07:14Z","message":"[APM UI] Fix OpenTelemetry agent names (#193134)\n\n## Summary\r\n\r\nFixes https://github.com/elastic/kibana/issues/180444\r\n\r\nThis PR fixes the agent names not being able to properly be retrieved by\r\nthe APM UI, changing the way we map OpenTelemetry agent names.\r\nAs the format changed from `(opentelemetry|otlp)/{agentName}` to\r\n`(opentelemetry|otlp)/{agentName}/{details}`, we now get the second part\r\nsplitting by `/`.\r\n\r\nAdded mappings for RUM, Android, and iOS OpenTelemetry client, also\r\nfixed `get_service_metadata_details` to get the correct OpenTelemetry\r\ndetails.\r\n\r\n|Before|After|\r\n|-|-|\r\n\r\n|![image](https://github.com/user-attachments/assets/28732018-511b-44e0-ac86-cdbe7ed0d1e0)|![image](https://github.com/user-attachments/assets/45a29cc6-f939-4c52-bcc7-54dc15b1a403)|\r\n\r\n## How to test\r\n1. Checkout to this branch\r\n2. Run `node scripts/synthtrace many_otel_services.ts --live --clean`\r\nwhich will fill some APM Otel services.\r\n3. Check that the icon is now rendering","sha":"735e216a952670eb57eaea1229be16e89f9bf1cd","branchLabelMapping":{"^v9.0.0$":"main","^v8.16.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","v9.0.0","apm:opentelemetry","backport:prev-major","ci:project-deploy-observability","Team:obs-ux-infra_services","backport:version"],"title":"[APM UI] Fix OpenTelemetry agent names","number":193134,"url":"https://github.com/elastic/kibana/pull/193134","mergeCommit":{"message":"[APM UI] Fix OpenTelemetry agent names (#193134)\n\n## Summary\r\n\r\nFixes https://github.com/elastic/kibana/issues/180444\r\n\r\nThis PR fixes the agent names not being able to properly be retrieved by\r\nthe APM UI, changing the way we map OpenTelemetry agent names.\r\nAs the format changed from `(opentelemetry|otlp)/{agentName}` to\r\n`(opentelemetry|otlp)/{agentName}/{details}`, we now get the second part\r\nsplitting by `/`.\r\n\r\nAdded mappings for RUM, Android, and iOS OpenTelemetry client, also\r\nfixed `get_service_metadata_details` to get the correct OpenTelemetry\r\ndetails.\r\n\r\n|Before|After|\r\n|-|-|\r\n\r\n|![image](https://github.com/user-attachments/assets/28732018-511b-44e0-ac86-cdbe7ed0d1e0)|![image](https://github.com/user-attachments/assets/45a29cc6-f939-4c52-bcc7-54dc15b1a403)|\r\n\r\n## How to test\r\n1. Checkout to this branch\r\n2. Run `node scripts/synthtrace many_otel_services.ts --live --clean`\r\nwhich will fill some APM Otel services.\r\n3. Check that the icon is now rendering","sha":"735e216a952670eb57eaea1229be16e89f9bf1cd"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/193134","number":193134,"mergeCommit":{"message":"[APM UI] Fix OpenTelemetry agent names (#193134)\n\n## Summary\r\n\r\nFixes https://github.com/elastic/kibana/issues/180444\r\n\r\nThis PR fixes the agent names not being able to properly be retrieved by\r\nthe APM UI, changing the way we map OpenTelemetry agent names.\r\nAs the format changed from `(opentelemetry|otlp)/{agentName}` to\r\n`(opentelemetry|otlp)/{agentName}/{details}`, we now get the second part\r\nsplitting by `/`.\r\n\r\nAdded mappings for RUM, Android, and iOS OpenTelemetry client, also\r\nfixed `get_service_metadata_details` to get the correct OpenTelemetry\r\ndetails.\r\n\r\n|Before|After|\r\n|-|-|\r\n\r\n|![image](https://github.com/user-attachments/assets/28732018-511b-44e0-ac86-cdbe7ed0d1e0)|![image](https://github.com/user-attachments/assets/45a29cc6-f939-4c52-bcc7-54dc15b1a403)|\r\n\r\n## How to test\r\n1. Checkout to this branch\r\n2. Run `node scripts/synthtrace many_otel_services.ts --live --clean`\r\nwhich will fill some APM Otel services.\r\n3. Check that the icon is now rendering","sha":"735e216a952670eb57eaea1229be16e89f9bf1cd"}}]}] BACKPORT--> --------- Co-authored-by: Sergi Romeu <[email protected]>
# Backport This will backport the following commits from `main` to `8.15`: - [[APM UI] Fix OpenTelemetry agent names (#193134)](#193134) <!--- Backport version: 8.9.8 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Sergi Romeu","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-09-20T07:07:14Z","message":"[APM UI] Fix OpenTelemetry agent names (#193134)\n\n## Summary\r\n\r\nFixes https://github.com/elastic/kibana/issues/180444\r\n\r\nThis PR fixes the agent names not being able to properly be retrieved by\r\nthe APM UI, changing the way we map OpenTelemetry agent names.\r\nAs the format changed from `(opentelemetry|otlp)/{agentName}` to\r\n`(opentelemetry|otlp)/{agentName}/{details}`, we now get the second part\r\nsplitting by `/`.\r\n\r\nAdded mappings for RUM, Android, and iOS OpenTelemetry client, also\r\nfixed `get_service_metadata_details` to get the correct OpenTelemetry\r\ndetails.\r\n\r\n|Before|After|\r\n|-|-|\r\n\r\n|![image](https://github.com/user-attachments/assets/28732018-511b-44e0-ac86-cdbe7ed0d1e0)|![image](https://github.com/user-attachments/assets/45a29cc6-f939-4c52-bcc7-54dc15b1a403)|\r\n\r\n## How to test\r\n1. Checkout to this branch\r\n2. Run `node scripts/synthtrace many_otel_services.ts --live --clean`\r\nwhich will fill some APM Otel services.\r\n3. Check that the icon is now rendering","sha":"735e216a952670eb57eaea1229be16e89f9bf1cd","branchLabelMapping":{"^v9.0.0$":"main","^v8.16.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","v9.0.0","apm:opentelemetry","backport:prev-major","ci:project-deploy-observability","Team:obs-ux-infra_services","backport:version"],"number":193134,"url":"https://github.com/elastic/kibana/pull/193134","mergeCommit":{"message":"[APM UI] Fix OpenTelemetry agent names (#193134)\n\n## Summary\r\n\r\nFixes https://github.com/elastic/kibana/issues/180444\r\n\r\nThis PR fixes the agent names not being able to properly be retrieved by\r\nthe APM UI, changing the way we map OpenTelemetry agent names.\r\nAs the format changed from `(opentelemetry|otlp)/{agentName}` to\r\n`(opentelemetry|otlp)/{agentName}/{details}`, we now get the second part\r\nsplitting by `/`.\r\n\r\nAdded mappings for RUM, Android, and iOS OpenTelemetry client, also\r\nfixed `get_service_metadata_details` to get the correct OpenTelemetry\r\ndetails.\r\n\r\n|Before|After|\r\n|-|-|\r\n\r\n|![image](https://github.com/user-attachments/assets/28732018-511b-44e0-ac86-cdbe7ed0d1e0)|![image](https://github.com/user-attachments/assets/45a29cc6-f939-4c52-bcc7-54dc15b1a403)|\r\n\r\n## How to test\r\n1. Checkout to this branch\r\n2. Run `node scripts/synthtrace many_otel_services.ts --live --clean`\r\nwhich will fill some APM Otel services.\r\n3. Check that the icon is now rendering","sha":"735e216a952670eb57eaea1229be16e89f9bf1cd"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","labelRegex":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/193134","number":193134,"mergeCommit":{"message":"[APM UI] Fix OpenTelemetry agent names (#193134)\n\n## Summary\r\n\r\nFixes https://github.com/elastic/kibana/issues/180444\r\n\r\nThis PR fixes the agent names not being able to properly be retrieved by\r\nthe APM UI, changing the way we map OpenTelemetry agent names.\r\nAs the format changed from `(opentelemetry|otlp)/{agentName}` to\r\n`(opentelemetry|otlp)/{agentName}/{details}`, we now get the second part\r\nsplitting by `/`.\r\n\r\nAdded mappings for RUM, Android, and iOS OpenTelemetry client, also\r\nfixed `get_service_metadata_details` to get the correct OpenTelemetry\r\ndetails.\r\n\r\n|Before|After|\r\n|-|-|\r\n\r\n|![image](https://github.com/user-attachments/assets/28732018-511b-44e0-ac86-cdbe7ed0d1e0)|![image](https://github.com/user-attachments/assets/45a29cc6-f939-4c52-bcc7-54dc15b1a403)|\r\n\r\n## How to test\r\n1. Checkout to this branch\r\n2. Run `node scripts/synthtrace many_otel_services.ts --live --clean`\r\nwhich will fill some APM Otel services.\r\n3. Check that the icon is now rendering","sha":"735e216a952670eb57eaea1229be16e89f9bf1cd"}},{"url":"https://github.com/elastic/kibana/pull/193509","number":193509,"branch":"8.x","state":"OPEN"}]}] BACKPORT-->
Summary
Fixes #180444
This PR fixes the agent names not being able to properly be retrieved by the APM UI, changing the way we map OpenTelemetry agent names.
As the format changed from
(opentelemetry|otlp)/{agentName}
to(opentelemetry|otlp)/{agentName}/{details}
, we now get the second part splitting by/
.Added mappings for RUM, Android, and iOS OpenTelemetry client, also fixed
get_service_metadata_details
to get the correct OpenTelemetry details.How to test
node scripts/synthtrace many_otel_services.ts --live --clean
which will fill some APM Otel services.