Move component working directory management to coordinator by swiatekm · Pull Request #10857 · elastic/elastic-agent

swiatekm · 2025-10-27T16:25:57Z

What does this PR do?

It makes the coordinator responsible for creating and removing the working directories of components. Until now, CommandRuntime and ServiceRuntime did this on their own, whereas the OtelManager didn't do it at all. We move the logic for creating and removing the directories into the component module itself, and call it from the Coordinator. The new logic is as follows.

When we generate a new component model, we ensure each component has a working directory.
When we get a STOPPED state for a component AND that component is not present in the component model, we delete its working directory.

The condition that the component must not be present in the current model fixes an issue where the working directory would be deleted when the component was being moved between runtimes.

Why is it important?

Currently, the Otel runtime does not remove the working directories at all. The behavior should be the same no matter where the component runs.
If a component is moved from the process runtime to the otel runtime, its working directory is incorrectly deleted. This causes filestream to re-ingest all logs, for example.

Note that I've included an integration test from #10544, which specifically checks point 2 from above.

Checklist

I have read and understood the pull request guidelines of this project.
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/fragments using the changelog tool
I have added an integration test or an E2E test

How to test this PR locally

Related issues

internal/pkg/agent/application/coordinator/coordinator.go

pkg/component/runtime/manager_fake_input_test.go

testing/integration/ess/beat_receivers_test.go

cmacknz · 2025-10-28T21:15:25Z

Did a first pass and this looks good, want to see CI pass before approving and take a second look with fresher eyes tomorrow (some else approving also covers this).

There is also the requirement that we don't change the run directory names from what they were before this change, which I double checked manually to confirm it is the same.

elasticmachine · 2025-10-29T07:44:48Z

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

testing/integration/ess/endpoint_security_test.go

blakerouse

This change looks good to me. My only comment is really on the changelog.

changelog/fragments/1761679059-move-component-workdir-coordinator.yaml

testing/integration/ess/beat_receivers_test.go

elasticmachine · 2025-10-30T13:41:42Z

💚 Build Succeeded

Buildkite Build
Commit: 31e0394

History

💚 Build #29590 succeeded f720a07
💔 Build #29499 failed 5230db6
💔 Build #29452 failed 5ac04a9

cc @swiatekm

blakerouse

Thanks for updating the changelog.

* Move component setup and teardown code to the Component struct * Move teardown to coordinator * Integration test to check data re-ingest when switching runtimes * Add integration test for component working dirs * Check workdir creation time in tests * Fix linter warnings * Fix a minor issue in endpoint integration tests * Add changelog entry * Completely remove workdir handling from command runtime * Fix changelog summary * Use fleet in the integration test --------- Co-authored-by: Lee E. Hinman <lee.e.hinman@elastic.co> (cherry picked from commit 41fd24f)

…10925) * Move component setup and teardown code to the Component struct * Move teardown to coordinator * Integration test to check data re-ingest when switching runtimes * Add integration test for component working dirs * Check workdir creation time in tests * Fix linter warnings * Fix a minor issue in endpoint integration tests * Add changelog entry * Completely remove workdir handling from command runtime * Fix changelog summary * Use fleet in the integration test --------- (cherry picked from commit 41fd24f) Co-authored-by: Mikołaj Świątek <mail@mikolajswiatek.com> Co-authored-by: Lee E. Hinman <lee.e.hinman@elastic.co>

…to coordinator (#10924) * Move component working directory management to coordinator (#10857) * Move component setup and teardown code to the Component struct * Move teardown to coordinator * Integration test to check data re-ingest when switching runtimes * Add integration test for component working dirs * Check workdir creation time in tests * Fix linter warnings * Fix a minor issue in endpoint integration tests * Add changelog entry * Completely remove workdir handling from command runtime * Fix changelog summary * Use fleet in the integration test --------- Co-authored-by: Lee E. Hinman <lee.e.hinman@elastic.co> (cherry picked from commit 41fd24f) * Fix imports --------- Co-authored-by: Mikołaj Świątek <mail@mikolajswiatek.com> Co-authored-by: Lee E. Hinman <lee.e.hinman@elastic.co>

…0857) * Move component setup and teardown code to the Component struct * Move teardown to coordinator * Integration test to check data re-ingest when switching runtimes * Add integration test for component working dirs * Check workdir creation time in tests * Fix linter warnings * Fix a minor issue in endpoint integration tests * Add changelog entry * Completely remove workdir handling from command runtime * Fix changelog summary * Use fleet in the integration test --------- Co-authored-by: Lee E. Hinman <lee.e.hinman@elastic.co>

swiatekm added bug Something isn't working backport-8.19 Automated backport to the 8.19 branch backport-9.2 Automated backport to the 9.2 branch labels Oct 27, 2025

mergify bot assigned swiatekm Oct 27, 2025

swiatekm force-pushed the feat/coordinator-component-teardown branch from 5ac04a9 to 5230db6 Compare October 28, 2025 11:38

swiatekm commented Oct 28, 2025

View reviewed changes

internal/pkg/agent/application/coordinator/coordinator.go Show resolved Hide resolved

swiatekm force-pushed the feat/coordinator-component-teardown branch 2 times, most recently from 4794d7e to c472e05 Compare October 28, 2025 16:12

swiatekm and others added 8 commits October 28, 2025 20:19

Move component setup and teardown code to the Component struct

b47629a

Move teardown to coordinator

79efdcb

Integration test to check data re-ingest when switching runtimes

6c1da43

Add integration test for component working dirs

fb3f1ed

Check workdir creation time in tests

6f94c0e

Fix linter warnings

9231545

Fix a minor issue in endpoint integration tests

b8df676

Add changelog entry

f7105b6

swiatekm force-pushed the feat/coordinator-component-teardown branch from c7ed40c to f7105b6 Compare October 28, 2025 19:19

swiatekm marked this pull request as ready for review October 28, 2025 19:20

swiatekm requested a review from a team as a code owner October 28, 2025 19:20

swiatekm requested review from blakerouse and pchila October 28, 2025 19:20

swiatekm commented Oct 28, 2025

View reviewed changes

pkg/component/runtime/manager_fake_input_test.go Show resolved Hide resolved

cmacknz reviewed Oct 28, 2025

View reviewed changes

testing/integration/ess/beat_receivers_test.go Show resolved Hide resolved

pierrehilbert added the Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team label Oct 29, 2025

Completely remove workdir handling from command runtime

f720a07

swiatekm commented Oct 29, 2025

View reviewed changes

testing/integration/ess/endpoint_security_test.go Show resolved Hide resolved

swiatekm requested a review from cmacknz October 29, 2025 14:16

blakerouse previously approved these changes Oct 29, 2025

View reviewed changes

changelog/fragments/1761679059-move-component-workdir-coordinator.yaml Outdated Show resolved Hide resolved

cmacknz previously approved these changes Oct 29, 2025

View reviewed changes

leehinman reviewed Oct 29, 2025

View reviewed changes

testing/integration/ess/beat_receivers_test.go Show resolved Hide resolved

swiatekm added 2 commits October 30, 2025 12:26

Fix changelog summary

3b32b3f

Use fleet in the integration test

31e0394

swiatekm dismissed stale reviews from cmacknz and blakerouse via 31e0394 October 30, 2025 11:30

swiatekm requested review from blakerouse, cmacknz and leehinman October 30, 2025 11:30

blakerouse approved these changes Oct 30, 2025

View reviewed changes

swiatekm merged commit 41fd24f into main Oct 30, 2025
21 checks passed

swiatekm deleted the feat/coordinator-component-teardown branch October 30, 2025 14:24

This was referenced Oct 30, 2025

[8.19] (backport #10857) Move component working directory management to coordinator #10924

Merged

[9.2] (backport #10857) Move component working directory management to coordinator #10925

Merged

swiatekm mentioned this pull request Nov 12, 2025

Integration test to check data re-ingest when switching runtimes #10544

Draft

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Move component working directory management to coordinator#10857

Move component working directory management to coordinator#10857
swiatekm merged 11 commits intomainfrom
feat/coordinator-component-teardown

swiatekm commented Oct 27, 2025 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

cmacknz commented Oct 28, 2025

elasticmachine commented Oct 29, 2025

Uh oh!

blakerouse left a comment

Uh oh!

Uh oh!

elasticmachine commented Oct 30, 2025

blakerouse left a comment

Uh oh!

Labels

6 participants

Conversation

swiatekm commented Oct 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Why is it important?

Checklist

How to test this PR locally

Related issues

Uh oh!

Uh oh!

Uh oh!

cmacknz commented Oct 28, 2025

elasticmachine commented Oct 29, 2025

Uh oh!

blakerouse left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

elasticmachine commented Oct 30, 2025

💚 Build Succeeded

History

blakerouse left a comment

Choose a reason for hiding this comment

Uh oh!

Labels

6 participants

swiatekm commented Oct 27, 2025 •

edited

Loading