-
Notifications
You must be signed in to change notification settings - Fork 200
[9.2] (backport #10922) feat: move edot in a separate package #11086
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
Open
mergify
wants to merge
2
commits into
9.2
Choose a base branch
from
mergify/bp/9.2/pr-10922
base: 9.2
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.
Conversation
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
* feat: introduce edot as a separate repo sub-package * chore: rename edot/pkg to edot/otelcol * go mod tidy * Update beats in edot go.mod to match agent go.mod. --------- Co-authored-by: Mikołaj Świątek <[email protected]> Co-authored-by: Blake Rouse <[email protected]> (cherry picked from commit c1777a5) # Conflicts: # NOTICE-fips.txt # NOTICE.txt # go.mod
Contributor
Author
|
Cherry-pick of c1777a5 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 |
Collaborator
|
Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane) |
Collaborator
⏳ Build in-progress, with failures
Failed CI StepsHistory
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
backport
conflicts
There is a conflict in the backported pull request
skip-changelog
Team:Elastic-Agent-Control-Plane
Label for the Agent Control Plane team
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?
This PR introduces EDOT (Elastic Distribution for OpenTelemetry) as a separate repository sub-package by moving code from
internal/pkg/oteltointernal/edot. This is a pure refactoring/relocation change with no functional modifications. Specifically:internal/pkg/otel/*tointernal/edot/pkg/*github.com/elastic/elastic-agent/internal/pkg/otel/...togithub.com/elastic/elastic-agent/internal/edot/pkg/...update:beats,otel:readme, etc., and scripts to reference the new package locationgo.modandgo.sumto reflect the new import pathsChanges summary: 50 files changed, +53,172 additions, -50,175 deletions (the large diff is primarily due to
go.mod/go.sum/NOTICE*.txtregeneration and mechanical import path updates)Why is it important?
This change is the second step in the incremental approach to separate EDOT from elastic-agent (as outlined in PR #9308). Introducing EDOT as a separate sub-package provides:
go.modinternal/edot/makes it straightforward to later extract it as a separate module or even repositoryThis follows the incremental approach decided by the team to split the large PR #9308 into smaller, reviewable chunks.
Checklist
./changelog/fragmentsusing the changelog toolDisruptive User Impact
None. This is a pure internal code reorganisation with no changes to functionality, APIs, configuration, or user-facing behaviour. The change is completely transparent to end users.
How to test this PR locally
Since this is a refactoring PR with no functional changes, testing focuses on ensuring everything continues to work as before, everything should work as before. So run any/all unit-test and/or integration test.
Related issues
N/A
This is an automatic backport of pull request #10922 done by Mergify.