[APM][OTel] Use telemetry.sdk as a fallback for missing agent.name on non-tracing data
#196529
Conversation
This file contains 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
rmyz
changed the title
telemetry.sdk as a fallback for missing agent.nametelemetry.sdk as a fallback for missing agent.name on non-tracing data
|
/ci |
rmyz
added
release_note:fix
apm:opentelemetry
rmyz
commented
Oct 16, 2024
| @@ -124,6 +127,16 @@ export async function getServiceTransactionStats({ | |||
| size: maxNumServices, | |||
| }, | |||
| aggs: { | |||
There was a problem hiding this comment.
Warning
I don't know if this is the best place in the query for this.
|
/ci |
|
/ci |
|
Pinging @elastic/obs-ux-infra_services-team (Team:obs-ux-infra_services) |
cauemarcondes
approved these changes
Oct 17, 2024
jennypavlova
requested changes
Oct 17, 2024
There was a problem hiding this comment.
Nice, thanks for the fix! I compared the service lists with the table icons and they are fixed there 🎉
I wasn't able to add the collector changes you mentioned (it resulted in an error) but based on my testing without them I couldn't see some of the icons in the service details pages:
Screen.Recording.2024-10-17.at.14.06.37.mov
Should we change the logic to check for the agent name here as well 🤔 Not sure if that's the issue or other information is missing can you please take a look?
Edit: Forgot to mention that using sendotlp the icons are there but I saw unknown when I clicked on the second one (should be the condition I mentioned or something missing in my env so if you see the info there you can ignore that)
kpatticha
reviewed
Oct 18, 2024
x-pack/plugins/observability_solution/apm/server/utils/get_agent_name.ts
Outdated
Show resolved
Hide resolved
|
/ci |
jennypavlova
approved these changes
Oct 18, 2024
💚 Build Succeeded
Metrics [docs]Public APIs missing comments
Unknown metric groupsAPI count
History
cc @rmyz |
|
Starting backport for target branches: 8.x https://github.com/elastic/kibana/actions/runs/11402881755 |
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Oct 18, 2024
…` on non-tracing data (elastic#196529) ## Summary Related to elastic#195854 This PR adds a fallback when we are missing `agent.name` on APM Service Inventory list. Using [OTel semantic convention fields](https://opentelemetry.io/docs/specs/semconv/resource/#telemetry-sdk) `telemetry.sdk.language` and `telemetry.sdk.name` to maintain `agent.name` format for OTel fields like `otlp/${agent}` `opentelemetry/${agent}`. ## Screenshots | Before | After | |-------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------| |  |  | | ## How to test it 1. Open otel-apm-e2e-poc repo 2. Add the following code under `processors -> transform -> metric_statements` in `otelcol.yaml` ```yaml - context: datapoint statements: - set(attributes["processor.event"], "metric") ``` 3. Run `make start-stack` & `make build` & `make run` on otel poc repo 4. Don't forget to run also `make start` on opentelemetry-demo and [follow this guide](https://github.com/elastic/otel-apm-e2e-poc?tab=readme-ov-file#working-with-opentelemetry-demo) to make it work. 5. In Kibana add `elasticsearch.ignoreVersionMismatch: true` to `kibana.dev.yml`. 6. If you go to APM Service Inventory list you will see missing icons. 7. Checkout to my branch 8. Try again, they should be fixed (cherry picked from commit 16098c4)
💚 All backports created successfully
Note: Successful backport PRs will be merged automatically after passing CI. Questions ?Please refer to the Backport tool documentation |
rmyz
deleted the
195854-apm-make-ui-more-resilent-to-missing-fields-otel
branch
kibanamachine
added
the
backport missing
|
Looks like this PR has a backport PR but it still hasn't been merged. Please merge it ASAP to keep the branches relatively in sync. |
kibanamachine
added a commit
that referenced
this pull request
Oct 21, 2024
…sing `agent.name` on non-tracing data (#196529) (#196854) # Backport This will backport the following commits from `main` to `8.x`: - [[APM][OTel] Use `telemetry.sdk` as a fallback for missing `agent.name` on non-tracing data (#196529)](#196529) <!--- 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-10-18T11:30:19Z","message":"[APM][OTel] Use `telemetry.sdk` as a fallback for missing `agent.name` on non-tracing data (#196529)\n\n## Summary\r\n\r\nRelated to #195854\r\n\r\nThis PR adds a fallback when we are missing `agent.name` on APM Service\r\nInventory list.\r\nUsing [OTel semantic convention\r\nfields](https://opentelemetry.io/docs/specs/semconv/resource/#telemetry-sdk)\r\n`telemetry.sdk.language` and `telemetry.sdk.name` to maintain\r\n`agent.name` format for OTel fields like `otlp/${agent}`\r\n`opentelemetry/${agent}`.\r\n\r\n## Screenshots\r\n| Before | After |\r\n\r\n|-------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------|\r\n|\r\n\r\n|\r\n\r\n|\r\n\r\n|\r\n\r\n\r\n## How to test it\r\n1. Open otel-apm-e2e-poc repo\r\n2. Add the following code under `processors -> transform ->\r\nmetric_statements` in `otelcol.yaml`\r\n```yaml\r\n - context: datapoint\r\n statements:\r\n - set(attributes[\"processor.event\"], \"metric\")\r\n```\r\n3. Run `make start-stack` & `make build` & `make run` on otel poc repo \r\n4. Don't forget to run also `make start` on opentelemetry-demo and\r\n[follow this\r\nguide](https://github.com/elastic/otel-apm-e2e-poc?tab=readme-ov-file#working-with-opentelemetry-demo)\r\nto make it work.\r\n5. In Kibana add `elasticsearch.ignoreVersionMismatch: true` to\r\n`kibana.dev.yml`.\r\n6. If you go to APM Service Inventory list you will see missing icons.\r\n7. Checkout to my branch\r\n8. Try again, they should be fixed","sha":"16098c454751939d9e3587ff458bb652b28e3d79","branchLabelMapping":{"^v9.0.0$":"main","^v8.17.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","v9.0.0","apm:opentelemetry","backport:prev-minor","ci:project-deploy-observability","Team:obs-ux-infra_services"],"title":"[APM][OTel] Use `telemetry.sdk` as a fallback for missing `agent.name` on non-tracing data","number":196529,"url":"https://github.com/elastic/kibana/pull/196529","mergeCommit":{"message":"[APM][OTel] Use `telemetry.sdk` as a fallback for missing `agent.name` on non-tracing data (#196529)\n\n## Summary\r\n\r\nRelated to #195854\r\n\r\nThis PR adds a fallback when we are missing `agent.name` on APM Service\r\nInventory list.\r\nUsing [OTel semantic convention\r\nfields](https://opentelemetry.io/docs/specs/semconv/resource/#telemetry-sdk)\r\n`telemetry.sdk.language` and `telemetry.sdk.name` to maintain\r\n`agent.name` format for OTel fields like `otlp/${agent}`\r\n`opentelemetry/${agent}`.\r\n\r\n## Screenshots\r\n| Before | After |\r\n\r\n|-------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------|\r\n|\r\n\r\n|\r\n\r\n|\r\n\r\n|\r\n\r\n\r\n## How to test it\r\n1. Open otel-apm-e2e-poc repo\r\n2. Add the following code under `processors -> transform ->\r\nmetric_statements` in `otelcol.yaml`\r\n```yaml\r\n - context: datapoint\r\n statements:\r\n - set(attributes[\"processor.event\"], \"metric\")\r\n```\r\n3. Run `make start-stack` & `make build` & `make run` on otel poc repo \r\n4. Don't forget to run also `make start` on opentelemetry-demo and\r\n[follow this\r\nguide](https://github.com/elastic/otel-apm-e2e-poc?tab=readme-ov-file#working-with-opentelemetry-demo)\r\nto make it work.\r\n5. In Kibana add `elasticsearch.ignoreVersionMismatch: true` to\r\n`kibana.dev.yml`.\r\n6. If you go to APM Service Inventory list you will see missing icons.\r\n7. Checkout to my branch\r\n8. Try again, they should be fixed","sha":"16098c454751939d9e3587ff458bb652b28e3d79"}},"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/196529","number":196529,"mergeCommit":{"message":"[APM][OTel] Use `telemetry.sdk` as a fallback for missing `agent.name` on non-tracing data (#196529)\n\n## Summary\r\n\r\nRelated to #195854\r\n\r\nThis PR adds a fallback when we are missing `agent.name` on APM Service\r\nInventory list.\r\nUsing [OTel semantic convention\r\nfields](https://opentelemetry.io/docs/specs/semconv/resource/#telemetry-sdk)\r\n`telemetry.sdk.language` and `telemetry.sdk.name` to maintain\r\n`agent.name` format for OTel fields like `otlp/${agent}`\r\n`opentelemetry/${agent}`.\r\n\r\n## Screenshots\r\n| Before | After |\r\n\r\n|-------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------|\r\n|\r\n\r\n|\r\n\r\n|\r\n\r\n|\r\n\r\n\r\n## How to test it\r\n1. Open otel-apm-e2e-poc repo\r\n2. Add the following code under `processors -> transform ->\r\nmetric_statements` in `otelcol.yaml`\r\n```yaml\r\n - context: datapoint\r\n statements:\r\n - set(attributes[\"processor.event\"], \"metric\")\r\n```\r\n3. Run `make start-stack` & `make build` & `make run` on otel poc repo \r\n4. Don't forget to run also `make start` on opentelemetry-demo and\r\n[follow this\r\nguide](https://github.com/elastic/otel-apm-e2e-poc?tab=readme-ov-file#working-with-opentelemetry-demo)\r\nto make it work.\r\n5. In Kibana add `elasticsearch.ignoreVersionMismatch: true` to\r\n`kibana.dev.yml`.\r\n6. If you go to APM Service Inventory list you will see missing icons.\r\n7. Checkout to my branch\r\n8. Try again, they should be fixed","sha":"16098c454751939d9e3587ff458bb652b28e3d79"}}]}] BACKPORT--> Co-authored-by: Sergi Romeu <[email protected]>
kibanamachine
added
v8.17.0
and removed
backport missing
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
Closes #195854
This PR adds a fallback when we are missing
agent.nameon APM Service Inventory list.Using OTel semantic convention fields
telemetry.sdk.languageandtelemetry.sdk.nameto maintainagent.nameformat for OTel fields likeotlp/${agent}opentelemetry/${agent}.Screenshots
How to test it
processors -> transform -> metric_statementsinotelcol.yamlmake start-stack&make build&make runon otel poc repomake starton opentelemetry-demo and follow this guide to make it work.elasticsearch.ignoreVersionMismatch: truetokibana.dev.yml.