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


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

…43493)

* [Chore] Use single logger instance

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

Co-authored-by: Mauri de Souza Meneguzzo <[email protected]>

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

Co-authored-by: Mauri de Souza Meneguzzo <[email protected]>

* 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

* add libbeat/output & libbeat/template

* fix tests

* add libbeat/dashboards & libbeat/cfgfile

* add libbeat/dashboards & libbeat/cfgfile

* fix lint

* add libbeat/persistentcache

* mage check

* mage check

* merge and fix tests

* fix test

* add logger on metricbeat

* fix lint

* fix lint

* fix tests

* address review comments

* lint check

* fix lint

* fix lint

* fix lint

* fix lint

* fix lint

* fix lint in redis files

* lint fix

* fix lint

* fix lint and tests

* fix logstash test

* fix test reload functionality

* add integration build tag

* use t.TempDir and non-capitalize logged errors

* add linter check

* fix log discrepancy

* add nolint for errors starting with capitalized letter

* fix logger discrepancy

* add linting fixes

---------

Co-authored-by: Mauri de Souza Meneguzzo <[email protected]>
(cherry picked from commit 8920a05)

# Conflicts:
#	filebeat/beater/filebeat.go
#	heartbeat/beater/heartbeat.go
#	libbeat/autodiscover/autodiscover_test.go
#	libbeat/cfgfile/reload.go
#	libbeat/cmd/instance/beat.go
#	libbeat/outputs/elasticsearch/client_integration_test.go
#	libbeat/outputs/elasticsearch/client_test.go
#	libbeat/outputs/logstash/logstash_integration_test.go
#	metricbeat/beater/metricbeat.go
@mergify mergify bot added the backport label Jun 6, 2025
@mergify mergify bot requested a review from a team as a code owner June 6, 2025 08:02
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jun 6, 2025
@mergify mergify bot requested review from a team as code owners June 6, 2025 08:02
@mergify
Copy link
Contributor Author

mergify bot commented Jun 6, 2025

Cherry-pick of 8920a05 has failed:

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

You are currently cherry-picking commit 8920a0598.
  (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/beater/crawler.go
	modified:   filebeat/cmd/modules.go
	modified:   libbeat/autodiscover/autodiscover.go
	modified:   libbeat/cfgfile/glob_manager.go
	modified:   libbeat/cfgfile/glob_manager_test.go
	modified:   libbeat/cfgfile/glob_watcher.go
	modified:   libbeat/cfgfile/glob_watcher_test.go
	modified:   libbeat/cfgfile/list.go
	modified:   libbeat/cfgfile/list_test.go
	modified:   libbeat/cmd/instance/beat_test.go
	modified:   libbeat/cmd/test/output.go
	modified:   libbeat/dashboards/dashboards.go
	modified:   libbeat/dashboards/kibana_loader.go
	modified:   libbeat/idxmgmt/client_handler.go
	modified:   libbeat/idxmgmt/idxmgmt.go
	modified:   libbeat/idxmgmt/lifecycle/es_client_handler.go
	modified:   libbeat/idxmgmt/lifecycle/file_client_handler.go
	modified:   libbeat/mock/mockbeat.go
	modified:   libbeat/outputs/console/console.go
	modified:   libbeat/outputs/console/console_test.go
	modified:   libbeat/outputs/discard/discard.go
	modified:   libbeat/outputs/elasticsearch/bulk_test.go
	modified:   libbeat/outputs/elasticsearch/client.go
	modified:   libbeat/outputs/elasticsearch/client_proxy_test.go
	modified:   libbeat/outputs/elasticsearch/elasticsearch.go
	modified:   libbeat/outputs/fileout/file.go
	modified:   libbeat/outputs/kafka/client.go
	modified:   libbeat/outputs/kafka/config_test.go
	modified:   libbeat/outputs/kafka/kafka.go
	modified:   libbeat/outputs/kafka/kafka_integration_test.go
	modified:   libbeat/outputs/kafka/partition_test.go
	modified:   libbeat/outputs/logstash/async.go
	modified:   libbeat/outputs/logstash/async_test.go
	modified:   libbeat/outputs/logstash/client_test.go
	deleted:    libbeat/outputs/logstash/common_test.go
	modified:   libbeat/outputs/logstash/deadlock_test.go
	modified:   libbeat/outputs/logstash/logstash_test.go
	modified:   libbeat/outputs/logstash/sync.go
	modified:   libbeat/outputs/logstash/sync_test.go
	modified:   libbeat/outputs/logstash/window_test.go
	modified:   libbeat/outputs/redis/client.go
	modified:   libbeat/outputs/redis/redis.go
	modified:   libbeat/outputs/redis/redis_integration_test.go
	modified:   libbeat/outputs/redis/redis_test.go
	modified:   libbeat/outputs/util_test.go
	modified:   libbeat/template/load.go
	modified:   libbeat/template/load_integration_test.go
	modified:   libbeat/template/load_test.go
	modified:   metricbeat/cmd/modules.go
	modified:   metricbeat/mb/module/configuration.go
	modified:   packetbeat/beater/packetbeat.go
	modified:   packetbeat/beater/reloader.go
	modified:   x-pack/libbeat/common/cloudfoundry/cache.go
	modified:   x-pack/libbeat/common/cloudfoundry/cache_test.go
	modified:   x-pack/libbeat/outputs/otelconsumer/otelconsumer.go
	modified:   x-pack/libbeat/outputs/otelconsumer/otelconsumer_test.go
	modified:   x-pack/libbeat/persistentcache/persistentcache.go
	modified:   x-pack/libbeat/persistentcache/persistentcache_test.go
	modified:   x-pack/libbeat/persistentcache/store_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   filebeat/beater/filebeat.go
	both modified:   heartbeat/beater/heartbeat.go
	both modified:   libbeat/autodiscover/autodiscover_test.go
	both modified:   libbeat/cfgfile/reload.go
	both modified:   libbeat/cmd/instance/beat.go
	both modified:   libbeat/outputs/elasticsearch/client_integration_test.go
	both modified:   libbeat/outputs/elasticsearch/client_test.go
	both modified:   libbeat/outputs/logstash/logstash_integration_test.go
	both modified:   metricbeat/beater/metricbeat.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 faec and removed request for a team June 6, 2025 08:02
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jun 6, 2025
@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
…43493)

* [Chore] Use single logger instance

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

Co-authored-by: Mauri de Souza Meneguzzo <[email protected]>

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

Co-authored-by: Mauri de Souza Meneguzzo <[email protected]>

* 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

* add libbeat/output & libbeat/template

* fix tests

* add libbeat/dashboards & libbeat/cfgfile

* add libbeat/dashboards & libbeat/cfgfile

* fix lint

* add libbeat/persistentcache

* mage check

* mage check

* merge and fix tests

* fix test

* add logger on metricbeat

* fix lint

* fix lint

* fix tests

* address review comments

* lint check

* fix lint

* fix lint

* fix lint

* fix lint

* fix lint

* fix lint in redis files

* lint fix

* fix lint

* fix lint and tests

* fix logstash test

* fix test reload functionality

* add integration build tag

* use t.TempDir and non-capitalize logged errors

* add linter check

* fix log discrepancy

* add nolint for errors starting with capitalized letter

* fix logger discrepancy

* add linting fixes

---------

Co-authored-by: Mauri de Souza Meneguzzo <[email protected]>
@pierrehilbert
Copy link
Contributor

@khushijain21 That's strange, looks like you have a conflict with #40816 missing but I thought we backported it to 8.x branch (that is now 8.19).

@khushijain21
Copy link
Contributor

@khushijain21 That's strange, looks like you have a conflict with #40816 missing but I thought we backported it to 8.x branch (that is now 8.19).

There was another PR that moved that code to x-pack and was also merged before this. This is why

@pierrehilbert
Copy link
Contributor

Forgot about it thanks :-)

@khushijain21 khushijain21 enabled auto-merge (squash) June 6, 2025 09:57
@mergify
Copy link
Contributor Author

mergify bot commented Jun 9, 2025

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

@khushijain21 khushijain21 merged commit b60a110 into 8.19 Jun 9, 2025
197 of 200 checks passed
@khushijain21 khushijain21 deleted the mergify/bp/8.19/pr-43493 branch June 9, 2025 07:19
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.

4 participants