Skip to content

[9.3] (backport #13173) Move telemetry into internal/edot.#13183

Merged
blakerouse merged 7 commits into9.3from
mergify/bp/9.3/pr-13173
Mar 21, 2026
Merged

[9.3] (backport #13173) Move telemetry into internal/edot.#13183
blakerouse merged 7 commits into9.3from
mergify/bp/9.3/pr-13173

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Mar 17, 2026

What does this PR do?

Moves the internaltelemetry and elasticmonitoring receiver to the internal/edot module.

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 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 an automatic backport of pull request #13173 done by [Mergify](https://mergify.com).

* 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
@mergify mergify bot requested a review from a team as a code owner March 17, 2026 13:01
@mergify mergify bot requested review from michel-laterman and ycombinator and removed request for a team March 17, 2026 13:01
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Mar 17, 2026
@mergify
Copy link
Contributor Author

mergify bot commented Mar 17, 2026

Cherry-pick of 5ad91a0 has failed:

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

You are currently cherry-picking commit 5ad91a05d.
  (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:   go.sum
	modified:   internal/edot/go.mod
	renamed:    internal/pkg/otel/internaltelemetry/factory.go -> internal/edot/internaltelemetry/factory.go
	modified:   internal/edot/otelcol/components.go
	renamed:    internal/pkg/otel/receivers/elasticmonitoring/README.md -> internal/edot/receivers/elasticmonitoring/README.md
	renamed:    internal/pkg/otel/receivers/elasticmonitoring/convert.go -> internal/edot/receivers/elasticmonitoring/convert.go
	renamed:    internal/pkg/otel/receivers/elasticmonitoring/convert_test.go -> internal/edot/receivers/elasticmonitoring/convert_test.go
	renamed:    internal/pkg/otel/receivers/elasticmonitoring/factory.go -> internal/edot/receivers/elasticmonitoring/factory.go
	renamed:    internal/pkg/otel/receivers/elasticmonitoring/receiver.go -> internal/edot/receivers/elasticmonitoring/receiver.go
	modified:   internal/pkg/otel/manager/manager.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   NOTICE-fips.txt
	both modified:   NOTICE.txt
	both modified:   go.mod

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

@github-actions github-actions bot added Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team skip-changelog labels Mar 17, 2026
@elasticmachine
Copy link
Contributor

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

@mergify
Copy link
Contributor Author

mergify bot commented Mar 20, 2026

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/9.3/pr-13173 upstream/mergify/bp/9.3/pr-13173
git merge upstream/9.3
git push upstream mergify/bp/9.3/pr-13173

blakerouse and others added 4 commits March 20, 2026 10:32
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>
@elasticmachine
Copy link
Contributor

💚 Build Succeeded

History

cc @blakerouse

@blakerouse blakerouse merged commit ce3bf06 into 9.3 Mar 21, 2026
24 checks passed
@blakerouse blakerouse deleted the mergify/bp/9.3/pr-13173 branch March 21, 2026 02:31
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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants