[8.19] (backport #10922) feat: move edot in a separate package #11085

mergify · 2025-11-07T20:52:24Z

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/otel to internal/edot. This is a pure refactoring/relocation change with no functional modifications. Specifically:

Relocates EDOT code: Moves all EDOT-related code from internal/pkg/otel/* to internal/edot/pkg/*
Updates all import paths: Changes throughout the codebase from github.com/elastic/elastic-agent/internal/pkg/otel/... to github.com/elastic/elastic-agent/internal/edot/pkg/...
Maintains functionality: Zero behavioural changes - all existing functionality remains identical
Preserves internal structure: The internal organisation within EDOT packages remains unchanged
Updates build system: Adjusts mage targets, namely update:beats, otel:readme, etc., and scripts to reference the new package location
Updates dependencies: Regenerates go.mod and go.sum to reflect the new import paths

Changes summary: 50 files changed, +53,172 additions, -50,175 deletions (the large diff is primarily due to go.mod/go.sum/NOTICE*.txt regeneration 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:

Clearer separation of concerns: Physically separates EDOT code from elastic-agent control plane code at the repository level, making the architecture explicit
Prepares for module separation: Establishes the package structure needed to eventually extract EDOT into its own Go module with a separate go.mod
Improves code organization: Makes it immediately clear which code belongs to EDOT vs elastic-agent control plane
Simplifies future splitting: Having EDOT in internal/edot/ makes it straightforward to later extract it as a separate module or even repository

This follows the incremental approach decided by the team to split the large PR #9308 into smaller, reviewable chunks.

Checklist

I have read and understood the pull request guidelines of this project.
My code follows the style guidelines of this project
I have commented my code, particularly in hard-to-understand areas
I have made corresponding changes to the documentation
I have made corresponding change to the default configuration files
I have added tests that prove my fix is effective or that my feature works
I have added an entry in ./changelog/fragments using the changelog tool
I have added an integration test or an E2E test

Disruptive 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.

* 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 <mail@mikolajswiatek.com> Co-authored-by: Blake Rouse <blake.rouse@elastic.co> (cherry picked from commit c1777a5) # Conflicts: # .ci/updatecli/updatecli-bump-golang.yml # .golangci.yml # NOTICE-fips.txt # NOTICE.txt # go.mod # go.sum # internal/edot/otelcol/components_linux.go # internal/edot/otelcol/components_others.go # internal/edot/otelcol/core_components_test.go # internal/pkg/agent/cmd/common.go # internal/pkg/agent/cmd/run_unix.go # internal/pkg/otel/components_others.go # internal/pkg/otel/samples_test.go # magefile.go

mergify · 2025-11-07T20:52:27Z

Cherry-pick of c1777a5 has failed:

On branch mergify/bp/8.19/pr-10922
Your branch is up to date with 'origin/8.19'.

You are currently cherry-picking commit c1777a5ce.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .ci/scripts/update-otel.sh
	modified:   dev-tools/mage/build.go
	modified:   dev-tools/mage/target/update/update.go
	modified:   dev-tools/notice/overrides.json
	new file:   internal/edot/LICENSE.txt
	renamed:    internal/pkg/agent/cmd/command_components.go -> internal/edot/cmd/command_components.go
	renamed:    internal/pkg/agent/cmd/command_components_fips_test.go -> internal/edot/cmd/command_components_fips_test.go
	renamed:    internal/pkg/agent/cmd/command_components_nofips_test.go -> internal/edot/cmd/command_components_nofips_test.go
	new file:   internal/edot/cmd/common.go
	renamed:    internal/pkg/agent/cmd/diagnostics_otel.go -> internal/edot/cmd/diagnostics_otel.go
	renamed:    internal/pkg/agent/cmd/otel.go -> internal/edot/cmd/otel.go
	renamed:    internal/pkg/agent/cmd/otel_flags.go -> internal/edot/cmd/otel_flags.go
	renamed:    internal/pkg/agent/cmd/otel_flags_test.go -> internal/edot/cmd/otel_flags_test.go
	renamed:    internal/pkg/agent/cmd/otel_test.go -> internal/edot/cmd/otel_test.go
	renamed:    internal/pkg/agent/cmd/testdata/otel/components-output-fips.yml -> internal/edot/cmd/testdata/otel/components-output-fips.yml
	renamed:    internal/pkg/agent/cmd/testdata/otel/components-output.yml -> internal/edot/cmd/testdata/otel/components-output.yml
	renamed:    internal/pkg/agent/cmd/testdata/otel/elastic-agent.yml -> internal/edot/cmd/testdata/otel/elastic-agent.yml
	renamed:    internal/pkg/agent/cmd/testdata/otel/otel.yml -> internal/edot/cmd/testdata/otel/otel.yml
	renamed:    internal/pkg/agent/cmd/validate.go -> internal/edot/cmd/validate.go
	renamed:    internal/pkg/agent/cmd/validate_test.go -> internal/edot/cmd/validate_test.go
	new file:   internal/edot/go.mod
	new file:   internal/edot/go.sum
	renamed:    internal/pkg/otel/agentprovider/buffer_provider.go -> internal/edot/otelcol/agentprovider/buffer_provider.go
	renamed:    internal/pkg/otel/agentprovider/buffer_provider_test.go -> internal/edot/otelcol/agentprovider/buffer_provider_test.go
	renamed:    internal/pkg/otel/agentprovider/provider.go -> internal/edot/otelcol/agentprovider/provider.go
	renamed:    internal/pkg/otel/agentprovider/provider_test.go -> internal/edot/otelcol/agentprovider/provider_test.go
	renamed:    internal/pkg/otel/agentprovider/scheme.go -> internal/edot/otelcol/agentprovider/scheme.go
	renamed:    internal/pkg/otel/command_components.go -> internal/edot/otelcol/command_components.go
	renamed:    internal/pkg/otel/components.go -> internal/edot/otelcol/components.go
	renamed:    internal/pkg/otel/components_fips.go -> internal/edot/otelcol/components_fips.go
	renamed:    internal/pkg/otel/components_nofips.go -> internal/edot/otelcol/components_nofips.go
	renamed:    internal/pkg/otel/run.go -> internal/edot/otelcol/run.go
	renamed:    internal/pkg/otel/run_fips_test.go -> internal/edot/otelcol/run_fips_test.go
	renamed:    internal/pkg/otel/run_nofips_test.go -> internal/edot/otelcol/run_nofips_test.go
	renamed:    internal/pkg/otel/run_test.go -> internal/edot/otelcol/run_test.go
	renamed:    internal/pkg/otel/validate.go -> internal/edot/otelcol/validate.go
	modified:   internal/pkg/otel/README.md
	modified:   internal/pkg/otel/manager/testing/testing.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   .ci/updatecli/updatecli-bump-golang.yml
	both modified:   .golangci.yml
	both modified:   NOTICE-fips.txt
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   go.sum
	deleted by us:   internal/edot/otelcol/components_linux.go
	added by them:   internal/edot/otelcol/components_others.go
	deleted by us:   internal/edot/otelcol/core_components_test.go
	both modified:   internal/pkg/agent/cmd/common.go
	added by us:     internal/pkg/agent/cmd/run_unix.go
	both deleted:    internal/pkg/otel/components_others.go
	deleted by us:   internal/pkg/otel/samples_test.go
	both modified:   magefile.go

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

elasticmachine · 2025-11-07T20:52:39Z

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

mergify · 2025-11-10T05:06:46Z

This pull request has not been merged yet. Could you please review and merge it @pkoutsovasilis? 🙏

ebeahan · 2025-11-10T17:21:38Z

@blakerouse will need to take a look at the conflicts for this backport.

…10922

…11154) * Fix deps that are causing mix of versions. * Update README.md. * Fix notice. * Fix more mixed state.

elasticmachine · 2025-11-14T19:25:29Z

💚 Build Succeeded

Buildkite Build
Commit: 5bd4148

History

💔 Build #30363 failed 15f44ce
💔 Build #30350 failed 270eb35
💔 Build #30314 failed 75f2d2f
💔 Build #30099 failed 4342f65

cc @blakerouse

mergify bot added the backport label Nov 7, 2025

mergify bot requested a review from a team as a code owner November 7, 2025 20:52

mergify bot added the conflicts There is a conflict in the backported pull request label Nov 7, 2025

mergify bot requested a review from a team as a code owner November 7, 2025 20:52

mergify bot requested review from blakerouse and ycombinator and removed request for a team November 7, 2025 20:52

mergify bot assigned pkoutsovasilis Nov 7, 2025

github-actions bot added Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team skip-changelog labels Nov 7, 2025

Try to fix backport.

d5c17cb

ebeahan assigned blakerouse and unassigned pkoutsovasilis Nov 10, 2025

ebeahan mentioned this pull request Nov 10, 2025

[8.19] (backport #11068) [Automation] Bump Golang version to 1.24.10 #11111

Merged

blakerouse mentioned this pull request Nov 13, 2025

Fix OTEL deps that cause mix v1.43.0/v1.44.0 and v0.137.0/v0.138.0 #11154

Merged

blakerouse added 9 commits November 13, 2025 14:47

Merge remote-tracking branch 'upstream/8.19' into mergify/bp/8.19/pr-…

35495c3

…10922

Fix OTEL deps that cause mix v1.43.0/v1.44.0 and v0.137.0/v0.138.0 (#…

d01feb9

…11154) * Fix deps that are causing mix of versions. * Update README.md. * Fix notice. * Fix more mixed state.

Fix run_unix.

4b3a681

Fix another issue.

1d3e25d

Remove 9.0 specifics.

75f2d2f

Remove samples_test.go.

b527b40

Fix the beat_receivers_test.go.

270eb35

Run go mod tidy.

15f44ce

Fix notice.

5bd4148

blakerouse approved these changes Nov 14, 2025

View reviewed changes

blakerouse merged commit fb78013 into 8.19 Nov 14, 2025
17 checks passed

blakerouse deleted the mergify/bp/8.19/pr-10922 branch November 14, 2025 20:00

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[8.19] (backport #10922) feat: move edot in a separate package #11085

[8.19] (backport #10922) feat: move edot in a separate package #11085

mergify bot commented Nov 7, 2025

Uh oh!

mergify bot commented Nov 7, 2025

Uh oh!

elasticmachine commented Nov 7, 2025

Uh oh!

mergify bot commented Nov 10, 2025

Uh oh!

ebeahan commented Nov 10, 2025

Uh oh!

elasticmachine commented Nov 14, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

[8.19] (backport #10922) feat: move edot in a separate package #11085

[8.19] (backport #10922) feat: move edot in a separate package #11085

Conversation

mergify bot commented Nov 7, 2025

What does this PR do?

Why is it important?

Checklist

Disruptive User Impact

How to test this PR locally

Related issues

Uh oh!

mergify bot commented Nov 7, 2025

Uh oh!

elasticmachine commented Nov 7, 2025

Uh oh!

mergify bot commented Nov 10, 2025

Uh oh!

ebeahan commented Nov 10, 2025

Uh oh!

elasticmachine commented Nov 14, 2025

💚 Build Succeeded

History

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants