Skip to content

[main][Automation] Update elastic/beats to afc53c0479ac#9874

Merged
ycombinator merged 9 commits intomainfrom
updatecli_main_updatecli-update-beats-main
Sep 12, 2025
Merged

[main][Automation] Update elastic/beats to afc53c0479ac#9874
ycombinator merged 9 commits intomainfrom
updatecli_main_updatecli-update-beats-main

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

@github-actions github-actions bot commented Sep 11, 2025 •
edited
Loading

What

Update elastic/beats to the latest version on branch main.

Changeset

Bump beats

Update to elastic/beats@afc53c0479ac

ran shell command ".ci/scripts/update-beats.sh afc53c0479ac"

GitHub Action workflow link
Updatecli logo

Created automatically by Updatecli

Options:

Most of Updatecli configuration is done via its manifest(s).

  • If you close this pull request, Updatecli will automatically reopen it, the next time it runs.
  • If you close this pull request and delete the base branch, Updatecli will automatically recreate it, erasing all previous commits made.

Feel free to report any issues at github.com/updatecli/updatecli.
If you find this tool useful, do not hesitate to star our GitHub repository as a sign of appreciation, and/or to tell us directly on our chat!

@github-actions github-actions bot requested a review from a team as a code owner September 11, 2025 00:28
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Sep 11, 2025

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

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Sep 11, 2025

This pull request does not have a backport label. Could you fix it @github-actions[bot]? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-./d./d is the label that automatically backports to the 8./d branch. /d is the digit
  • backport-active-all is the label that automatically backports to all active branches.
  • backport-active-8 is the label that automatically backports to all active minor branches for the 8 major.
  • backport-active-9 is the label that automatically backports to all active minor branches for the 9 major.

@mauri870
Copy link
Copy Markdown
Member

mauri870 commented Sep 11, 2025

The failures are caused by this change in beats elastic/beats#45242. I'm working on fixing the tests now.

@mauri870 mauri870 self-assigned this Sep 11, 2025
@github-actions github-actions bot changed the title [main][Automation] Update elastic/beats to 8ee768567d41 [main][Automation] Update elastic/beats to afc53c0479ac Sep 12, 2025
@mauri870
Copy link
Copy Markdown
Member

mauri870 commented Sep 12, 2025

THere is still one error up:

    beat_receivers_test.go:391:
        	Error Trace:	C:/buildkite-agent/builds/bk-agent-prod-gcp-1757647380544879068/elastic/elastic-agent/testing/integration/ess/otel_test.go:1667
        	            				C:/buildkite-agent/builds/bk-agent-prod-gcp-1757647380544879068/elastic/elastic-agent/testing/integration/ess/beat_receivers_test.go:391
        	Error:      	Should be zero, but was   mapstr.M{
        	            	  	"agent.name": string("bk-agent-prod-gcp-1757647380544879068"),
        	            	+ 	"agent.otelcol": []any{
        	            	+ 		map[string]any{
        	            	+ 			"component.id": string("filebeatreceiver/_agent-component/filestream-monitoring"),
        	            	+ 		},
        	            	+ 		map[string]any{"component.kind": string("receiver")},
        	            	+ 	},
        	            	  	"agent.type":       string("filebeat"),
        	            	  	"cloud.account.id": string("elastic-ci-prod"),
        	            	  	... // 37 identical entries
        	            	  }
        	Test:       	TestClassicAndReceiverAgentMonitoring

I'm not entirely sure what the problem is, since I'm flattening both maps before comparing like in other tests. Setting up integration tests to check.

This was referenced Sep 12, 2025
Closed
Closed
@mauri870
Copy link
Copy Markdown
Member

mauri870 commented Sep 12, 2025

More issues:

otelconfig_test.go:648: 
        	Error Trace:	/opt/buildkite-agent/builds/bk-agent-prod-aws-1757693587517786885/elastic/elastic-agent/internal/pkg/otel/translate/otelconfig_test.go:648
        	Error:      	Not equal:      	
        	            	Diff:
        	            	--- Expected
        	            	+++ Actual
        	            	@@ -2,8 +2,3 @@
        	            	  (string) (len=9) "exporters": (map[string]interface {}) (len=1) {
        	            	-  (string) (len=38) "elasticsearch/_agent-component/default": (map[string]interface {}) (len=11) {
        	            	-   (string) (len=7) "batcher": (map[string]interface {}) (len=3) {
        	            	-    (string) (len=7) "enabled": (bool) true,
        	            	-    (string) (len=8) "max_size": (int) 1600,
        	            	-    (string) (len=8) "min_size": (int) 0
        	            	-   },
        	            	+  (string) (len=38) "elasticsearch/_agent-component/default": (map[string]interface {}) (len=12) {
        	            	    (string) (len=11) "compression": (string) (len=4) "gzip",
        	            	@@ -22,2 +17,3 @@
        	            	    },
        	            	+   (string) (len=18) "max_conns_per_host": (int) 1,
        	            	    (string) (len=8) "password": (string) (len=8) "password",
        	            	@@ -28,2 +24,14 @@
        	            	     (string) (len=11) "max_retries": (int) 3
        	            	+   },
        	            	+   (string) (len=13) "sending_queue": (map[string]interface {}) (len=6) {
        	            	+    (string) (len=5) "batch": (map[string]interface {}) (len=3) {
        	            	+     (string) (len=8) "max_size": (int) 1600,
        	            	+     (string) (len=8) "min_size": (int) 0,
        	            	+     (string) (len=5) "sizer": (string) (len=5) "items"
        	            	+    },
        	            	+    (string) (len=17) "block_on_overflow": (bool) true,
        	            	+    (string) (len=7) "enabled": (bool) true,
        	            	+    (string) (len=13) "num_consumers": (int) 1,
        	            	+    (string) (len=10) "queue_size": (int) 3200,
        	            	+    (string) (len=15) "wait_for_result": (bool) true
        	            	    },
        	Test:       	TestGetOtelConfig/filestream

We have to change the occurrences of batcher to sending_queue, from elastic/beats#46111.

@mauri870 mauri870 force-pushed the updatecli_main_updatecli-update-beats-main branch from 38e035a to b82c555 Compare September 12, 2025 17:57
@elastic-sonarqube
Copy link
Copy Markdown

elastic-sonarqube bot commented Sep 12, 2025

Quality Gate passed Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
0.0% Duplication on New Code

See analysis details on SonarQube

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Sep 12, 2025

💚 Build Succeeded

History

cc @mauri870

@mauri870
Copy link
Copy Markdown
Member

mauri870 commented Sep 12, 2025

Build is green now, should be ready for review. Thanks!

@ycombinator ycombinator enabled auto-merge (squash) September 12, 2025 21:26
@ycombinator ycombinator merged commit 919f424 into main Sep 12, 2025
23 checks passed
@ycombinator ycombinator deleted the updatecli_main_updatecli-update-beats-main branch September 12, 2025 21:26
v1v added a commit that referenced this pull request Sep 16, 2025
@v1v
Merge remote-tracking branch 'upstream' into test-go-cache
0e10e1e 
* upstream: (26 commits)
  fix: ensure EDOT subprocess shuts down gracefully on agent termination (#9886)
  [main][Automation] Update versions (#9976)
  Add Collector reference docs and automation (#9953)
  [beatreceivers] Integrate beatsauthextension (#9257)
  [main][Automation] Update versions (#9941)
  Update OTel components to v0.132.0/v1.38.0 (#9954)
  Enhancement/5235 wrap errors when marking upgrade (#9366)
  Mount Go build cache into crossbuild container (#9094)
  Liveness agent state (#9673)
  [main][Automation] Bump VM Image version to 1757725254 (#9942)
  Enhancement/5235 correctly wrap errors from copyActionDir and copyRunDirectory (#9349)
  [main][Automation] Update elastic/beats to afc53c0479ac (#9874)
  Add -coverpkg option when running unit test to calculate coverage across packages (#9913)
  Cache binaries downloaded for packaging locally (#9133)
  [main][Automation] Update versions (#9897)
  Disable flaky test TestBeatsReceiverLogs (#9891)
  Allow overriding AGENT_PACKAGE_VERSION and MANIFEST_URL when USE_PACKAGE_VERSION=true (#9864)
  add ingest-docs team as CODEOWNERS for release notes and docset.yml (#9865)
  fix: correct spelling of 'output' in various templates and monitoring code (#9827)
  k8s: Add comment around hostUsers for Universal Profiling deployments (#9847)
  ...
intxgo pushed a commit to intxgo/elastic-agent that referenced this pull request Sep 24, 2025
@github-actions @mauri870 @intxgo
[main][Automation] Update elastic/beats to afc53c0479ac (elastic#9874)
8b1e1fb 
* chore: Update to elastic/beats@8ee768567d41

Made with ❤️️ by updatecli

* ignore event fields only present in receiver documents

* flatten docs in TestClassicAndReceiverAgentMonitoring

* chore: Update to elastic/beats@afc53c0479ac

Made with ❤️️ by updatecli

* add ignoredFields

* mage otel:readme

* revert flatten in TestClassicAndReceiverAgentMonitoring

* ignore agent.otelcol

* fix otel config test with batcher/sending_queue

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Mauri de Souza Meneguzzo <mauri870@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ycombinator ycombinator ycombinator approved these changes

@kaanyalti kaanyalti Awaiting requested review from kaanyalti kaanyalti is a code owner automatically assigned from elastic/elastic-agent-control-plane

@michel-laterman michel-laterman Awaiting requested review from michel-laterman michel-laterman is a code owner automatically assigned from elastic/elastic-agent-control-plane

Assignees

@mauri870 mauri870

Labels

automation skip-changelog Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@elasticmachine @mauri870 @ycombinator