Only send agent data for non-opentelemetry agents#79587
Merged
smith merged 7 commits intoelastic:masterfrom Oct 12, 2020
Merged
Only send agent data for non-opentelemetry agents#79587smith merged 7 commits intoelastic:masterfrom
smith merged 7 commits intoelastic:masterfrom
Conversation
Contributor
|
Pinging @elastic/apm-ui (Team:apm) |
| * Support additional agent types by appending definitions in mappings.json | ||
| * (for telemetry) and the AgentName type. | ||
| */ | ||
| export type AgentName = ElasticAgentName | OpenTelemetryAgentName; |
Contributor
There was a problem hiding this comment.
@afharo if the telemetry tools support aliases, we might have a bug. I worked around the Unknown type TypeParameter; T error thrown when extracting the updated schema by explicitly typing AgentName with the combined options from ElasticAgentName and OpenTelemetryAgentName.
| * Support additional agent types by appending definitions in mappings.json | ||
| * (for telemetry) and the AgentName type. | ||
| */ | ||
| export type AgentName = ElasticAgentName | OpenTelemetryAgentName; |
Contributor
There was a problem hiding this comment.
Suggested change
| export type AgentName = ElasticAgentName | OpenTelemetryAgentName; | |
| export type AgentName = | |
| | 'go' | |
| | 'java' | |
| | 'js-base' | |
| | 'rum-js' | |
| | 'nodejs' | |
| | 'python' | |
| | 'dotnet' | |
| | 'ruby' | |
| | 'otlp' | |
| | 'opentelemetry/cpp' | |
| | 'opentelemetry/dotnet' | |
| | 'opentelemetry/erlang' | |
| | 'opentelemetry/go' | |
| | 'opentelemetry/java' | |
| | 'opentelemetry/nodejs' | |
| | 'opentelemetry/php' | |
| | 'opentelemetry/python' | |
| | 'opentelemetry/ruby' | |
| | 'opentelemetry/webjs'; |
Member
There was a problem hiding this comment.
I've created #79654 as a fix to the @kbn/telemetry-tools 😉
2 tasks
Contributor
Author
|
@elasticmachine merge upstream |
Contributor
|
@elasticmachine merge upstream |
2c2d9fe to
849341e
Compare
afharo
approved these changes
Oct 8, 2020
Member
afharo
left a comment
There was a problem hiding this comment.
Deleting fields is always good 👍
LGTM!
Contributor
|
@elasticmachine merge upstream |
Contributor
💚 Build SucceededMetrics [docs]
History
To update your PR or re-run it, just comment with: |
ogupte
approved these changes
Oct 12, 2020
smith
added a commit
to smith/kibana
that referenced
this pull request
Oct 12, 2020
smith
added a commit
to smith/kibana
that referenced
this pull request
Oct 12, 2020
smith
added a commit
that referenced
this pull request
Oct 12, 2020
smith
added a commit
that referenced
this pull request
Oct 12, 2020
jloleysens
added a commit
to jloleysens/kibana
that referenced
this pull request
Oct 13, 2020
…a-tier-migration * 'master' of github.com:elastic/kibana: (34 commits) Line Visualization improper scaling can result in gaps elastic#79663 (elastic#80135) [Security Solution][Timeline] Fix SelectableTimeline search (elastic#80128) move field_mapping util to saved_objects plugin (elastic#79918) [ML] Datagrid: Ensure column content with 'boolean' schema is not capitalized (elastic#80041) [CI] Correctly resolve repository root for JUnit reports (elastic#80226) [Ingest Manager] Fix package upgrade breaking after first rollover before new data has arrived (elastic#79887) [Security Solution] Fix positioning of Kibana banners list inside Sec… (elastic#80124) add missing await to fix test (elastic#80202) Revert test data changed in previous commit. (elastic#79479) [Security Solution] [Sourcerer] Jest beef up (elastic#79907) Re-enable transaction duration alert story (elastic#80187) [npm] remove canvas dep (elastic#80185) [DOCS] Redirects ILM docs to Elasticsearch reference (elastic#79798) [APM] Catch health status error from ML (elastic#80131) Fix layout and remove title for add alert popover. (elastic#77633) [Discover] Loading spinner cleanup (elastic#79819) [Security Solution] [Resolver] Remove related events api (elastic#79036) [Ingest Manager] Remove fields from index pattern during package uninstall (elastic#80082) do not refetch license if signature header absents from a response (elastic#79645) Only send agent data for non-opentelemetry agents (elastic#79587) ... # Conflicts: # x-pack/plugins/index_lifecycle_management/server/routes/api/nodes/register_list_route.ts
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
7 participants
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.
Only send the count of services using the agent for OpenTelemetry agents. Exclude the full agent data like we do in Elastic agents.
This is a follow-up to #75978. See also elastic/infra#23696.