Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jun 17, 2025

Proposed commit message

Beats receivers currently use the hostname as the "service.name" logger field. Adjust it to reflect the beat name for consistency with standard beats.

Checklist

  • 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.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Related issues

* otel: fix service.name for beats receivers

Beats receivers currently use the hostname as the "service.name" logger
field. Adjust it to reflect the beat name for consistency with standard
beats.

* use require.Contains before Equal

* fix linter issues

(cherry picked from commit df3dcad)

# Conflicts:
#	x-pack/filebeat/fbreceiver/receiver_test.go
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jun 17, 2025
@mergify mergify bot requested a review from a team as a code owner June 17, 2025 11:08
@mergify mergify bot added the backport label Jun 17, 2025
@mergify mergify bot removed the request for review from a team June 17, 2025 11:08
@mergify mergify bot requested review from khushijain21 and rdner June 17, 2025 11:08
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jun 17, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Jun 17, 2025

Cherry-pick of df3dcad has failed:

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

You are currently cherry-picking commit df3dcadbd.
  (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:   libbeat/otelbeat/oteltest/oteltest.go
	modified:   x-pack/libbeat/cmd/instance/beat.go
	modified:   x-pack/metricbeat/mbreceiver/receiver_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x-pack/filebeat/fbreceiver/receiver_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

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jun 17, 2025
@github-actions github-actions bot added cleanup Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team labels Jun 17, 2025
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jun 17, 2025
@mauri870 mauri870 enabled auto-merge (squash) June 17, 2025 11:54
@mauri870 mauri870 merged commit e0aa79d into 9.0 Jun 17, 2025
175 checks passed
@mauri870 mauri870 deleted the mergify/bp/9.0/pr-44831 branch June 17, 2025 15:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport cleanup conflicts There is a conflict in the backported pull request Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants