-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Support resource detectors for service telemetry #14312
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
Draft
iblancasa
wants to merge
6
commits into
open-telemetry:main
Choose a base branch
from
iblancasa:14311
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
3a5607c
Support resource detectors for service telemetry
iblancasa eaf2c26
Increase timeout
iblancasa 19ca3bb
Merge branch 'main' of github.com:open-telemetry/opentelemetry-collec…
iblancasa f29a1c2
Fix ci
iblancasa e36da81
Merge branch 'main' of github.com:open-telemetry/opentelemetry-collec…
iblancasa f66cd1e
Fix CI
iblancasa File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| # Use this changelog template to create an entry for release notes. | ||
|
|
||
| # One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' | ||
| change_type: enhancement | ||
|
|
||
| # The name of the component, or a single word describing the area of concern, (e.g. receiver/otlp) | ||
| component: all | ||
|
|
||
| # A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). | ||
| note: Add support for resource detectors in service telemetry configuration | ||
|
|
||
| # One or more tracking issues or pull requests related to the change | ||
| issues: [14311, 10909] | ||
|
|
||
| # (Optional) One or more lines of additional information to render under the primary note. | ||
| # These lines will be padded with 2 spaces and then inserted directly into the document. | ||
| # Use pipe (|) for multiline entries. | ||
| subtext: | | ||
| Service telemetry now supports automatic resource attribute detection using OpenTelemetry SDK detectors. | ||
| Configure detectors under `service.telemetry.detectors` to auto-detect environment variables, host information, and cloud metadata. | ||
| This aligns the Collector configuration surface with the declarative schema maintained in https://github.com/open-telemetry/opentelemetry-configuration (resource.yaml), while keeping extra SDK detectors available. | ||
| To use `OTEL_RESOURCE_ATTRIBUTES` and `OTEL_SERVICE_NAME` environment variables, enable the `env` detector. | ||
| Supported detectors: env, host, aws (ec2/ecs/eks/lambda), gcp, azure. | ||
| Example configuration (now aligned with the declarative schema): | ||
|
|
||
| service: | ||
| telemetry: | ||
| resource: | ||
| attributes: | ||
| - name: service.name | ||
| value: otelcol | ||
| attributes_list: deployment.environment=prod | ||
| detection/development: | ||
| detectors: | ||
| - env: {} | ||
| - host: {} | ||
| - aws/ec2: {} | ||
| attributes: | ||
| excluded: | ||
| - "cloud.account.id" | ||
|
|
||
| # Optional: The change log or logs in which this entry should be included. | ||
| # e.g. '[user]' or '[user, api]' | ||
| # Include 'user' if the change is relevant to end users. | ||
| # Include 'api' if there is a change to a library API. | ||
| # Default: '[user]' | ||
| change_logs: [] |
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
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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
Oops, something went wrong.
Oops, something went wrong.
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.
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.
This is unrelated to your PR. Could you move it to another one?
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.
The problem is that, without this, the tests fails now.
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.
That seems like a problem we want to fix rather than walk around. Especially as a 10 minutes timeout is very long.