Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jun 6, 2025

Proposed commit message

See https://github.com/elastic/ingest-dev/issues/5251

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.

How to test this PR locally

Run this test in x-pack/filebeat/fbreceiver

go test -run ^TestMultipleReceivers$ ./x-pack/filebeat/fbreceiver -v

Related issues

Checklist

✅ libbeat Directories Checklist

…43356)

* [Chore] Use single logger instance

* Update x-pack/filebeat/fbreceiver/receiver_test.go

Co-authored-by: Mauri de Souza Meneguzzo <mauri870@gmail.com>

* Update x-pack/filebeat/fbreceiver/receiver_test.go

Co-authored-by: Mauri de Souza Meneguzzo <mauri870@gmail.com>

* libbeat/cmd is complete

* keep only libbeat changes

* keep only libbeat changes

* add libbeat/monitoring/report package

* add my fork

* use beat.Info.Logger

* remove cloudid

* remove println

* fix tests

* add libbeat/idxmgmt

* add libbeat/monitoring/report

* go mod tidy

* fix idxmgmt tests

* fixing and finishing things

* fix tests

* fix tests

* fix tests

* debugging statement

* stringify debug statement

* fixing tests

* fixing tests

* add libbeat/instrumentation

* update ea-libs

* fix lint

* fix tests and lint

* golangci lint

* initialize logger before using in instrumentation

* address review comments

* address review comments 2

---------

Co-authored-by: Mauri de Souza Meneguzzo <mauri870@gmail.com>
(cherry picked from commit 019fe1d)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
#	libbeat/cmd/instance/beat.go
#	libbeat/cmd/instance/beat_test.go
#	x-pack/filebeat/fbreceiver/receiver_test.go
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jun 6, 2025
@mergify mergify bot requested review from a team as code owners June 6, 2025 04:05
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jun 6, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Jun 6, 2025

Cherry-pick of 019fe1d has failed:

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

You are currently cherry-picking commit 019fe1d13.
  (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:   filebeat/tests/integration/filebeat_test.go
	modified:   libbeat/api/server.go
	modified:   libbeat/api/server_test.go
	modified:   libbeat/beat/info.go
	modified:   libbeat/cmd/instance/beat_reexec_other.go
	modified:   libbeat/cmd/instance/locks/lock.go
	modified:   libbeat/cmd/instance/locks/lock_test.go
	modified:   libbeat/cmd/test/output.go
	modified:   libbeat/idxmgmt/idxmgmt.go
	modified:   libbeat/idxmgmt/std_test.go
	modified:   libbeat/instrumentation/instrumentation.go
	modified:   libbeat/instrumentation/instrumentation_test.go
	modified:   libbeat/monitoring/report/elasticsearch/client.go
	modified:   libbeat/monitoring/report/elasticsearch/elasticsearch.go
	modified:   libbeat/monitoring/report/elasticsearch/elasticsearch_test.go
	modified:   libbeat/monitoring/report/log/log.go
	modified:   libbeat/monitoring/report/log/log_test.go
	modified:   libbeat/outputs/elasticsearch/client_integration_test.go
	modified:   libbeat/outputs/elasticsearch/client_test.go
	modified:   libbeat/outputs/logstash/logstash_integration_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   go.sum
	both modified:   libbeat/cmd/instance/beat.go
	both modified:   libbeat/cmd/instance/beat_test.go
	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

@mergify mergify bot requested review from AndersonQ and khushijain21 and removed request for a team June 6, 2025 04:05
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jun 6, 2025
@github-actions github-actions bot added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Jun 6, 2025
@elasticmachine
Copy link
Contributor

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

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jun 6, 2025
@khushijain21 khushijain21 enabled auto-merge (squash) June 6, 2025 06:21
@khushijain21 khushijain21 merged commit f1ee2e1 into 8.19 Jun 6, 2025
197 of 200 checks passed
@khushijain21 khushijain21 deleted the mergify/bp/8.19/pr-43356 branch June 6, 2025 07:32
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 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.

3 participants