Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 18, 2025

Proposed commit message

With this PR - except libbeat/autodiscover and libbeat/plugin - all libbeat folder are global logger free.

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


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

* [Chore] Replace global logger with local logger #11

(cherry picked from commit 1a9498d)

# Conflicts:
#	filebeat/input/filestream/config.go
#	filebeat/input/filestream/filestream_test.go
#	filebeat/input/filestream/input.go
#	libbeat/cfgfile/reload_test.go
#	libbeat/otelbeat/oteltranslate/outputs/elasticsearch/config_otel_test.go
#	x-pack/libbeat/outputs/otelconsumer/otelconsumer.go
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jul 18, 2025
@mergify mergify bot requested review from a team as code owners July 18, 2025 11:34
@mergify mergify bot added the backport label Jul 18, 2025
@mergify mergify bot requested review from a team as code owners July 18, 2025 11:34
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jul 18, 2025
@mergify mergify bot requested a review from a team as a code owner July 18, 2025 11:34
Copy link
Contributor Author

mergify bot commented Jul 18, 2025

Cherry-pick of 1a9498d has failed:

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

You are currently cherry-picking commit 1a9498d07.
  (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:   dev-tools/cmd/dashboards/export_dashboards.go
	modified:   dev-tools/mage/check.go
	modified:   filebeat/autodiscover/builder/hints/logs.go
	modified:   filebeat/beater/filebeat.go
	modified:   filebeat/beater/filebeat_test.go
	modified:   filebeat/fileset/factory.go
	modified:   filebeat/input/filestream/copytruncate_prospector_test.go
	modified:   filebeat/input/filestream/prospector_creator_test.go
	modified:   filebeat/input/filestream/prospector_test.go
	modified:   filebeat/input/journald/input.go
	modified:   filebeat/input/log/harvester.go
	modified:   filebeat/input/v2/input-cursor/manager.go
	modified:   filebeat/input/v2/input-cursor/manager_test.go
	modified:   filebeat/input/winlog/input.go
	modified:   filebeat/processor/add_kubernetes_metadata/matchers.go
	modified:   filebeat/processor/add_kubernetes_metadata/matchers_test.go
	modified:   filebeat/scripts/tester/main.go
	modified:   heartbeat/autodiscover/builder/hints/monitors.go
	modified:   libbeat/autodiscover/appenders/config/config.go
	modified:   libbeat/autodiscover/providers/docker/docker.go
	modified:   libbeat/autodiscover/providers/jolokia/discovery.go
	modified:   libbeat/autodiscover/providers/jolokia/jolokia.go
	modified:   libbeat/autodiscover/providers/kubernetes/kubernetes.go
	modified:   libbeat/autodiscover/providers/kubernetes/kubernetes_test.go
	modified:   libbeat/autodiscover/providers/kubernetes/node_test.go
	modified:   libbeat/autodiscover/providers/kubernetes/pod_test.go
	modified:   libbeat/autodiscover/providers/kubernetes/service_test.go
	modified:   libbeat/autodiscover/template/config.go
	modified:   libbeat/autodiscover/template/config_test.go
	modified:   libbeat/cfgfile/cfgfile.go
	modified:   libbeat/cfgfile/reload.go
	modified:   libbeat/cloudid/cloudid.go
	modified:   libbeat/cmd/export/dashboard.go
	modified:   libbeat/cmd/instance/beat.go
	modified:   libbeat/dashboards/decode.go
	modified:   libbeat/dashboards/kibana_loader.go
	modified:   libbeat/dashboards/modify_json.go
	modified:   libbeat/dashboards/modify_json_test.go
	modified:   libbeat/idxmgmt/index_support.go
	modified:   libbeat/licenser/elastic_fetcher.go
	modified:   libbeat/licenser/elastic_fetcher_integration_test.go
	modified:   libbeat/licenser/elastic_fetcher_test.go
	modified:   libbeat/licenser/es_callback.go
	modified:   libbeat/management/management.go
	modified:   libbeat/otelbeat/beatconverter/beatconverter.go
	modified:   libbeat/otelbeat/oteltranslate/outputs/elasticsearch/config_otel.go
	modified:   libbeat/otelbeat/oteltranslate/tls_otel.go
	modified:   libbeat/otelbeat/oteltranslate/tls_otel_fips_test.go
	modified:   libbeat/otelbeat/oteltranslate/tls_otel_nofips_test.go
	modified:   libbeat/otelbeat/oteltranslate/tls_otel_test.go
	modified:   libbeat/outputs/console/console.go
	modified:   libbeat/outputs/discard/discard.go
	modified:   libbeat/outputs/elasticsearch/callbacks.go
	modified:   libbeat/outputs/elasticsearch/client.go
	modified:   libbeat/outputs/elasticsearch/elasticsearch.go
	modified:   libbeat/outputs/elasticsearch/elasticsearch_test.go
	modified:   libbeat/outputs/fileout/file.go
	modified:   libbeat/outputs/kafka/config_test.go
	modified:   libbeat/outputs/kafka/kafka.go
	modified:   libbeat/outputs/kafka/kafka_test.go
	modified:   libbeat/outputs/logstash/logstash.go
	modified:   libbeat/outputs/outil/select.go
	modified:   libbeat/outputs/outil/select_test.go
	modified:   libbeat/outputs/redis/redis.go
	modified:   libbeat/outputs/redis/redis_test.go
	modified:   libbeat/outputs/util.go
	modified:   libbeat/outputs/util_test.go
	modified:   libbeat/processors/add_cloud_metadata/add_cloud_metadata.go
	modified:   libbeat/processors/add_cloud_metadata/generic_fetcher.go
	modified:   libbeat/processors/add_cloud_metadata/provider_aws_ec2.go
	modified:   libbeat/processors/add_cloud_metadata/provider_azure_vm.go
	modified:   libbeat/processors/add_cloud_metadata/providers.go
	modified:   libbeat/processors/add_kubernetes_metadata/kubernetes.go
	modified:   libbeat/processors/add_kubernetes_metadata/kubernetes_test.go
	modified:   libbeat/processors/add_kubernetes_metadata/matchers.go
	modified:   libbeat/processors/add_kubernetes_metadata/matchers_test.go
	modified:   libbeat/processors/processor.go
	modified:   libbeat/processors/script/javascript/beatevent_v0_test.go
	modified:   libbeat/processors/script/javascript/javascript.go
	modified:   libbeat/processors/script/javascript/module/console/console_test.go
	modified:   libbeat/processors/script/javascript/module/net/net_test.go
	modified:   libbeat/processors/script/javascript/module/path/path_test.go
	modified:   libbeat/processors/script/javascript/module/processor/processor_test.go
	modified:   libbeat/processors/script/javascript/session.go
	modified:   libbeat/processors/script/javascript/session_test.go
	modified:   libbeat/publisher/pipeline/stress/out.go
	modified:   libbeat/publisher/processing/default.go
	modified:   libbeat/publisher/processing/default_test.go
	modified:   libbeat/publisher/queue/diskqueue/benchmark_test.go
	modified:   libbeat/publisher/queue/memqueue/broker.go
	modified:   libbeat/publisher/queue/memqueue/queue_test.go
	modified:   libbeat/publisher/queue/memqueue/runloop_test.go
	modified:   libbeat/reader/multiline/multiline_test.go
	modified:   libbeat/reader/parser/parser_test.go
	modified:   libbeat/reader/readfile/bench_test.go
	modified:   libbeat/reader/readfile/encode.go
	modified:   libbeat/reader/readfile/encode_test.go
	modified:   libbeat/reader/readfile/line.go
	modified:   libbeat/reader/readfile/line_test.go
	modified:   libbeat/template/load.go
	modified:   libbeat/template/load_integration_test.go
	modified:   libbeat/template/template.go
	modified:   libbeat/template/template_test.go
	modified:   libbeat/tests/compose/compose.go
	modified:   libbeat/tests/compose/project.go
	modified:   libbeat/tests/compose/wrapper.go
	modified:   libbeat/tests/system/template/template.go
	modified:   metricbeat/autodiscover/builder/hints/metrics.go
	modified:   metricbeat/mb/module/configuration.go
	modified:   packetbeat/beater/packetbeat.go
	modified:   winlogbeat/beater/winlogbeat.go
	modified:   x-pack/dockerlogbeat/pipelinemanager/selector.go
	modified:   x-pack/filebeat/input/awss3/s3_objects.go
	modified:   x-pack/filebeat/input/azureblobstorage/input.go
	modified:   x-pack/filebeat/input/azureeventhub/config.go
	modified:   x-pack/filebeat/input/azureeventhub/input.go
	modified:   x-pack/filebeat/input/cel/config.go
	modified:   x-pack/filebeat/input/cel/input_manager.go
	modified:   x-pack/filebeat/input/gcs/input.go
	modified:   x-pack/filebeat/input/httpjson/input_cursor.go
	modified:   x-pack/filebeat/input/o365audit/input.go
	modified:   x-pack/filebeat/input/salesforce/input_manager.go
	modified:   x-pack/filebeat/input/streaming/config.go
	modified:   x-pack/filebeat/input/streaming/input_manager.go
	modified:   x-pack/filebeat/input/unifiedlogs/input.go
	modified:   x-pack/filebeat/module/cisco/ios/pipeline_test.go
	modified:   x-pack/libbeat/autodiscover/providers/aws/ec2/provider.go
	modified:   x-pack/libbeat/autodiscover/providers/aws/elb/provider.go
	modified:   x-pack/libbeat/autodiscover/providers/aws/elb/provider_test.go
	modified:   x-pack/libbeat/autodiscover/providers/nomad/nomad.go
	modified:   x-pack/libbeat/autodiscover/providers/nomad/nomad_test.go
	modified:   x-pack/libbeat/cmd/instance/beat.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   filebeat/input/filestream/config.go
	both modified:   filebeat/input/filestream/filestream_test.go
	both modified:   filebeat/input/filestream/input.go
	both modified:   libbeat/cfgfile/reload_test.go
	both modified:   libbeat/otelbeat/oteltranslate/outputs/elasticsearch/config_otel_test.go
	both modified:   x-pack/libbeat/outputs/otelconsumer/otelconsumer.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 khushijain21 and removed request for a team July 18, 2025 11:34
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jul 18, 2025
@mergify mergify bot requested review from andrzej-stencel, michalpristas and rubenruizdegauna and removed request for a team July 18, 2025 11:34
@github-actions github-actions bot added Team:obs-ds-hosted-services Label for the Observability Hosted Services team Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team Team:Obs-InfraObs Label for the Observability Infrastructure Monitoring team Team:Security-Linux Platform Linux Platform Team in Security Solution Team:Security-Service Integrations Security Service Integrations Team Team:Security-Windows Platform Windows Platform Team in Security Solution Team:Security-Deployment and Devices Deployment and Devices Team in Security Solution labels Jul 18, 2025
@elasticmachine
Copy link
Collaborator

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

@elasticmachine
Copy link
Collaborator

Pinging @elastic/obs-ds-hosted-services (Team:obs-ds-hosted-services)

@elasticmachine
Copy link
Collaborator

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 Jul 18, 2025
@elasticmachine
Copy link
Collaborator

Pinging @elastic/sec-linux-platform (Team:Security-Linux Platform)

@elasticmachine
Copy link
Collaborator

Pinging @elastic/sec-windows-platform (Team:Security-Windows Platform)

@elasticmachine
Copy link
Collaborator

Pinging @elastic/security-service-integrations (Team:Security-Service Integrations)

@elasticmachine
Copy link
Collaborator

Pinging @elastic/sec-deployment-and-devices (Team:Security-Deployment and Devices)

@khushijain21 khushijain21 enabled auto-merge (squash) July 18, 2025 12:57
Copy link
Contributor Author

mergify bot commented Jul 21, 2025

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

Copy link
Contributor Author

mergify bot commented Jul 28, 2025

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

Copy link
Contributor Author

mergify bot commented Jul 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-45285 upstream/mergify/bp/8.19/pr-45285
git merge upstream/8.19
git push upstream mergify/bp/8.19/pr-45285

@khushijain21 khushijain21 merged commit b6ab5c5 into 8.19 Jul 30, 2025
242 of 247 checks passed
@khushijain21 khushijain21 deleted the mergify/bp/8.19/pr-45285 branch July 30, 2025 06:25
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-Control-Plane Label for the Agent Control Plane team Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team Team:obs-ds-hosted-services Label for the Observability Hosted Services team Team:Obs-InfraObs Label for the Observability Infrastructure Monitoring team Team:Security-Deployment and Devices Deployment and Devices Team in Security Solution Team:Security-Linux Platform Linux Platform Team in Security Solution Team:Security-Service Integrations Security Service Integrations Team Team:Security-Windows Platform Windows Platform Team in Security Solution

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants