[9.3] (backport #13173) Move telemetry into internal/edot.#13183
Merged
blakerouse merged 7 commits into9.3from Mar 21, 2026
Merged
[9.3] (backport #13173) Move telemetry into internal/edot.#13183blakerouse merged 7 commits into9.3from
blakerouse merged 7 commits into9.3from
Conversation
* Move telemetry into internal/edot. * Remove nested otel directory. * go mod tidy and notice * Regenerate NOTICE. (cherry picked from commit 5ad91a0) # Conflicts: # NOTICE-fips.txt # NOTICE.txt # go.mod
Contributor
Author
|
Cherry-pick of 5ad91a0 has failed: To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally |
Contributor
|
Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane) |
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Contributor
Author
|
This pull request is now in conflicts. Could you fix it? 🙏 |
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
The backport cherry-pick applied main's dependency versions (v0.145.0/v0.29.0) to internal/edot/go.mod instead of 9.3's versions (v0.147.0/v0.36.0), causing internal/edot/README.md to be out of sync with go.mod. Restore to 9.3 versions and promote configtelemetry, consumer, pdata, otelconf, and otel from indirect to direct as the original PR intended. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Contributor
💚 Build Succeeded
History
cc @blakerouse |
blakerouse
approved these changes
Mar 21, 2026
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.
What does this PR do?
Moves the
internaltelemetryandelasticmonitoringreceiver to theinternal/edotmodule.Why is it important?
The Elastic Agent doesn't use this code in its modules it is only used inside of the EDOT collector, so it should be inside of
internal/edot.Checklist
[ ] I have added tests that prove my fix is effective or that my feature works[ ] I have added an entry in./changelog/fragmentsusing the changelog tool[ ] I have added an integration test or an E2E testDisruptive User Impact
None
This is an automatic backport of pull request #13173 done by [Mergify](https://mergify.com).