Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Mar 10, 2025

Proposed commit message

Update elastic-agent-lib version


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

* [otelconsumer]: Add support for conversion of type any

* fix lint

* poc

* first draft

* make update

* remove files from previous commit

* make docs

* add changelgo

* update docs

* make update

* remove it from public facing config

* remove changelog

* update notice

* add test

* fix test

* (chore) Update elastic-agent-lib to v0.18.9

* remove old files

* remove

* remove

(cherry picked from commit 198197d)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
@mergify mergify bot requested a review from a team as a code owner March 10, 2025 14:30
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Mar 10, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Mar 10, 2025

Cherry-pick of 198197d has failed:

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

You are currently cherry-picking commit 198197d02.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   go.sum

no changes added to commit (use "git add" and/or "git commit -a")

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 Mar 10, 2025
@khushijain21 khushijain21 enabled auto-merge (squash) March 10, 2025 14:39
@pierrehilbert pierrehilbert added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Mar 12, 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 Mar 12, 2025
@mauri870 mauri870 removed the conflicts There is a conflict in the backported pull request label Mar 13, 2025
@mauri870
Copy link
Member

Hmmm I thought the CI was failing due to flaky tests, but it seems that 8.17 and 8.16 backports are broken due to the libs bump.

https://buildkite.com/elastic/filebeat/builds/14865#01958fd4-32e6-4710-996d-cfcf2875f38e

It complains about two mapstr.M sharing the same backing map, which shouldn't happen. This is likely a guard to ensure m.Clone() always produce a new map.

I recall seeing similar failures before, but it was fixed in elastic/elastic-agent-libs#283 for v0.18.7. We require v0.18.9 here so this shouldn't happen. It is also weird that all the other backports are not failing on these tests. I'll keep digging.

@mergify
Copy link
Contributor Author

mergify bot commented Mar 17, 2025

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

@mauri870
Copy link
Member

mauri870 commented Mar 17, 2025

I found out why the tests broke with this PR, turns out it is not related to libs but to testify/assert. The bump to v1.10.0 includes a fix for NotSamef to fail if the values passed in are not pointers. This is already fixed in beats main.

@khushijain21 khushijain21 merged commit 5b023fa into 8.17 Mar 17, 2025
144 checks passed
@khushijain21 khushijain21 deleted the mergify/bp/8.17/pr-43106 branch March 17, 2025 20:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport 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