Skip to content

[9.1] (backport #11394) [otel config translate] allow hosts to be string not just slice#11431

Merged
leehinman merged 3 commits into9.1from
mergify/bp/9.1/pr-11394
Dec 1, 2025
Merged

[9.1] (backport #11394) [otel config translate] allow hosts to be string not just slice#11431
leehinman merged 3 commits into9.1from
mergify/bp/9.1/pr-11394

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Nov 25, 2025

What does this PR do?

Allows the hosts part of the beat output to be a string instead of a slice.

This is to match the behavior of beats which allows this.

Why is it important?

This means that more hand written configuration will work "out of the box" with beat receivers.

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

cd internal/pkg/otel/translate
go test -run TestToOtelConfig

Related issues

Questions to ask yourself

  • How are we going to support this in production?
  • How are we going to measure its adoption?
  • How are we going to debug this?
  • What are the metrics I should take care of?
  • ...

This is an automatic backport of pull request #11394 done by [Mergify](https://mergify.com).
* [otel config translate] allow hosts to be string not just slice

* update changelog to bugfix

(cherry picked from commit 70ef801)

# Conflicts:
#	internal/pkg/otel/translate/output_elasticsearch.go
#	internal/pkg/otel/translate/output_elasticsearch_test.go
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Nov 25, 2025
@mergify mergify bot requested a review from a team as a code owner November 25, 2025 21:52
@mergify mergify bot requested review from blakerouse and michel-laterman and removed request for a team November 25, 2025 21:52
@mergify
Copy link
Contributor Author

mergify bot commented Nov 25, 2025

Cherry-pick of 70ef801 has failed:

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

You are currently cherry-picking commit 70ef801ad.
  (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:
	new file:   changelog/fragments/1764016303-allow-host-to-be-a-string-for-otel-configuration-translation.yaml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   internal/pkg/otel/translate/output_elasticsearch.go
	deleted by us:   internal/pkg/otel/translate/output_elasticsearch_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 the enhancement New feature or request label Nov 25, 2025
leehinman
leehinman previously approved these changes Nov 25, 2025
@elasticmachine
Copy link
Contributor

💚 Build Succeeded

History

cc @leehinman

@pierrehilbert pierrehilbert added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Dec 1, 2025
@elasticmachine
Copy link
Contributor

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

@leehinman leehinman merged commit dd24201 into 9.1 Dec 1, 2025
22 checks passed
@leehinman leehinman deleted the mergify/bp/9.1/pr-11394 branch December 1, 2025 17:02
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 enhancement New feature or request Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team

3 participants