Skip to content

Use upstream fsnotify/fsevents instead of Elastic fork#47638

Closed
cmacknz wants to merge 3 commits intoelastic:mainfrom
cmacknz:cmacknz/remove-fsevents-fork
Closed

Use upstream fsnotify/fsevents instead of Elastic fork#47638
cmacknz wants to merge 3 commits intoelastic:mainfrom
cmacknz:cmacknz/remove-fsevents-fork

Conversation

@cmacknz
Copy link
Member

@cmacknz cmacknz commented Nov 13, 2025

The changes in the Elastic forks exist upstream.
@cmacknz cmacknz requested a review from andrewkroh November 13, 2025 20:27
@cmacknz cmacknz self-assigned this Nov 13, 2025
@cmacknz cmacknz requested a review from a team as a code owner November 13, 2025 20:27
@cmacknz cmacknz added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Nov 13, 2025
@elasticmachine
Copy link
Contributor

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

@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Nov 13, 2025
@github-actions
Copy link
Contributor

🤖 GitHub comments

Just comment with:

  • run docs-build : Re-trigger the docs validation. (use unformatted text in the comment!)

@mergify
Copy link
Contributor

mergify bot commented Nov 13, 2025

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @cmacknz? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-8./d is the label to automatically backport 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.

@cmacknz cmacknz added the backport-skip Skip notification from the automated backport with mergify label Nov 13, 2025
@cmacknz cmacknz changed the title Use upstream fsnotify/fsnotify and fsnotify/fsevents instead of Elastic forks Use upstream fsnotify/fsevents instead of Elastic fork Nov 13, 2025
@cmacknz
Copy link
Member Author

cmacknz commented Nov 13, 2025

It looks like upstream fsnotify has the pieces to do recursive watches but it doesn't expose an API to enable it, to remove the fsnotify fork we need a replacement for the SetRecursive call below and I couldn't spot one:

if recursive && watcher.SetRecursive() != nil {

Copy link
Member

@kruskall kruskall left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for reference: fsnotify/fsevents#38 has not been upstreamed but it's present in our fork

@cmacknz
Copy link
Member Author

cmacknz commented Nov 14, 2025

Closing, as we are unfortunately still missing changes we need upstream per #47637

@cmacknz cmacknz closed this Nov 14, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Auditbeat backport-skip Skip notification from the automated backport with mergify 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.

Replace use of forked https://github.com/elastic/fsevents with upstream https://github.com/fsnotify/fsevents

6 participants