Skip to content

[8.19] (backport #9257) [beatreceivers] Integrate beatsauthextension#9970

Merged
swiatekm merged 14 commits into8.19from
mergify/bp/8.19/pr-9257
Sep 29, 2025
Merged

[8.19] (backport #9257) [beatreceivers] Integrate beatsauthextension#9970
swiatekm merged 14 commits into8.19from
mergify/bp/8.19/pr-9257

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Sep 15, 2025

What does this PR do?

This PR adds beatsauthextension to elasticsearch config translation layer and also propagates local logger to the translation logic

Why is it important?

It replaces es-exporter's Rountripper with beat's implementation of it. This is important for 1:1 behavioral compatibility between beats and beatreceivers

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

How to test this PR locally

Check E2E test

Related issues

This is an automatic backport of pull request #9257 done by [Mergify](https://mergify.com).

@khushijain21 @mergify
[beatreceivers] Integrate beatsauthextension (#9257)
7bdf11a 
* [beatreceivers] Integrate beatsauthextension

* add test cases

* final tests and this works

* update

* remove agent.port

* mage otel:readme

* address review comments

* check is ssl.TLS is non-nil

* address review comments

* remove port

* make notice for beatsauth

* update beatsauthextension

* beatsauth final test

* final fix

* add beatsauthextension test

* Address comments

* fix test

* fix test

* change comment

* update beatsauthextension

* Update internal/pkg/otel/translate/otelconfig.go

Co-authored-by: Craig MacKenzie <craig.mackenzie@elastic.co>

* fix ci

* add a test that a unique extension is created per output

* fix ci

* add comment

* add better test

* fix test

---------

Co-authored-by: Craig MacKenzie <craig.mackenzie@elastic.co>
(cherry picked from commit 779fafd)

# Conflicts:
#	internal/pkg/otel/manager/manager_test.go
#	internal/pkg/otel/translate/otelconfig.go
#	internal/pkg/otel/translate/otelconfig_test.go
@mergify mergify bot requested a review from a team as a code owner September 15, 2025 19:01
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Sep 15, 2025
@mergify mergify bot requested review from kaanyalti and michalpristas and removed request for a team September 15, 2025 19:01
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Sep 15, 2025

Cherry-pick of 779fafd has failed:

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

You are currently cherry-picking commit 779fafdcd.
  (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:   NOTICE-fips.txt
	modified:   NOTICE.txt
	modified:   go.mod
	modified:   go.sum
	modified:   internal/pkg/otel/README.md
	modified:   internal/pkg/otel/components.go
	modified:   testing/integration/ess/otel_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   internal/pkg/otel/manager/manager_test.go
	both modified:   internal/pkg/otel/translate/otelconfig.go
	both modified:   internal/pkg/otel/translate/otelconfig_test.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

@github-actions github-actions bot added Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team skip-changelog labels Sep 15, 2025
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Sep 15, 2025

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Sep 15, 2025

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

khushijain21
khushijain21 previously approved these changes Sep 18, 2025
View reviewed changes
@kaanyalti
Copy link
Copy Markdown

kaanyalti commented Sep 18, 2025

@khushijain21 Can you merge target into the backport branch? That should fix the ci failures

@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Sep 21, 2025

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/8.19/pr-9257 upstream/mergify/bp/8.19/pr-9257
git merge upstream/8.19
git push upstream mergify/bp/8.19/pr-9257

@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Sep 22, 2025

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

khushijain21
khushijain21 previously approved these changes Sep 23, 2025
View reviewed changes
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Sep 29, 2025

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/8.19/pr-9257 upstream/mergify/bp/8.19/pr-9257
git merge upstream/8.19
git push upstream mergify/bp/8.19/pr-9257

@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Sep 29, 2025

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

@swiatekm
Merge branch '8.19' into mergify/bp/8.19/pr-9257
b35b2b7 
# Conflicts:
#	internal/pkg/otel/translate/otelconfig.go
#	internal/pkg/otel/translate/otelconfig_test.go
@swiatekm swiatekm removed the conflicts There is a conflict in the backported pull request label Sep 29, 2025
swiatekm
swiatekm previously approved these changes Sep 29, 2025
View reviewed changes
@swiatekm swiatekm enabled auto-merge (squash) September 29, 2025 10:56
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Sep 29, 2025

⏳ Build in-progress, with failures

Failed CI Steps

History

cc @khushijain21

@swiatekm swiatekm self-requested a review September 29, 2025 17:22
@elastic-sonarqube
Copy link
Copy Markdown

elastic-sonarqube bot commented Sep 29, 2025

Quality Gate passed Quality Gate passed

Issues
1 New issue
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
82.8% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube

@swiatekm swiatekm merged commit 1cfbe9d into 8.19 Sep 29, 2025
19 checks passed
@swiatekm swiatekm deleted the mergify/bp/8.19/pr-9257 branch September 29, 2025 18:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@swiatekm swiatekm swiatekm approved these changes

@khushijain21 khushijain21 khushijain21 left review comments

@michalpristas michalpristas Awaiting requested review from michalpristas michalpristas is a code owner automatically assigned from elastic/elastic-agent-control-plane

@kaanyalti kaanyalti Awaiting requested review from kaanyalti kaanyalti is a code owner automatically assigned from elastic/elastic-agent-control-plane

Assignees

@khushijain21 khushijain21

Labels

backport skip-changelog Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@elasticmachine @kaanyalti @khushijain21 @swiatekm @ebeahan