[samples] remove unneeded file_storage and fix a bug by VihasMakwana · Pull Request #10856 · elastic/elastic-agent

VihasMakwana · 2025-10-27T14:05:13Z

What does this PR do?

Remove the file_storage as it's not used anywhere and use flush_timeout.

Also added unit test cases to validate the samples using DryRun.

mergify · 2025-10-27T14:06:11Z

This pull request does not have a backport label. Could you fix it @VihasMakwana? 🙏
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.

cmacknz · 2025-10-27T14:13:16Z

I think #10826 should be addressed here, it doesn't seem like adding a basic unit test that the collector starts is that much work. If it is a lot of work let me know and we can discuss a better strategy to address this.

internal/pkg/otel/samples_test.go

github-actions · 2025-10-29T16:01:39Z

@Mergifyio backport 8.19 9.1 9.2

elasticmachine · 2025-10-29T16:01:45Z

💚 Build Succeeded

Buildkite Build
Commit: 350e5ce

History

💔 Build #29570 failed 0fe57f8
💔 Build #29511 failed 849fea9
💔 Build #29505 failed 0d8c951
💔 Build #29495 failed ba1336c
💚 Build #29442 succeeded e9b81e7

cc @VihasMakwana

mergify · 2025-10-29T16:01:49Z

backport 8.19 9.1 9.2

✅ Backports have been created

Details

#10898 [8.19] (backport #10856) [samples] remove unneeded file_storage and fix a bug has been created for branch 8.19 but encountered conflicts
#10899 [9.1] (backport #10856) [samples] remove unneeded file_storage and fix a bug has been created for branch 9.1 but encountered conflicts
#10900 [9.2] (backport #10856) [samples] remove unneeded file_storage and fix a bug has been created for branch 9.2 but encountered conflicts

* fix: add flush_interval * couple of enhancements * test samples * lint * use observer and t.Setenv * lint * fix profiling * fix unit test race * more time * comment * enable profiling for linux * Add comment * use DryRun to validate the config --------- Co-authored-by: Fabrizio Ferri-Benedetti <algernon@fastmail.com> (cherry picked from commit 49af983) # Conflicts: # internal/pkg/otel/samples/linux/profiles_metrics.yml # internal/pkg/otel/samples/windows/managed_otlp/logs_metrics_traces.yml # internal/pkg/otel/samples/windows/managed_otlp/platformlogs.yml # internal/pkg/otel/samples/windows/managed_otlp/platformlogs_hostmetrics.yml

* fix: add flush_interval * couple of enhancements * test samples * lint * use observer and t.Setenv * lint * fix profiling * fix unit test race * more time * comment * enable profiling for linux * Add comment * use DryRun to validate the config --------- Co-authored-by: Fabrizio Ferri-Benedetti <algernon@fastmail.com> (cherry picked from commit 49af983) # Conflicts: # internal/pkg/otel/samples/windows/managed_otlp/logs_metrics_traces.yml # internal/pkg/otel/samples/windows/managed_otlp/platformlogs.yml # internal/pkg/otel/samples/windows/managed_otlp/platformlogs_hostmetrics.yml

* fix: add flush_interval * couple of enhancements * test samples * lint * use observer and t.Setenv * lint * fix profiling * fix unit test race * more time * comment * enable profiling for linux * Add comment * use DryRun to validate the config --------- Co-authored-by: Fabrizio Ferri-Benedetti <algernon@fastmail.com>

…ws (#10855) * [EDOT][windows] add missing samples for windows (#10728) * add docs and changelog * remove redundant (cherry picked from commit 03a81c0) * add flush_timeout * [samples] remove unneeded file_storage and fix a bug (#10856) * fix: add flush_interval * couple of enhancements * test samples * lint * use observer and t.Setenv * lint * fix profiling * fix unit test race * more time * comment * enable profiling for linux * Add comment * use DryRun to validate the config --------- Co-authored-by: Fabrizio Ferri-Benedetti <algernon@fastmail.com> --------- Co-authored-by: Vihas Makwana <121151420+VihasMakwana@users.noreply.github.com> Co-authored-by: Vihas <vihas.makwana@elastic.co> Co-authored-by: Fabrizio Ferri-Benedetti <algernon@fastmail.com>

* fix: add flush_interval * couple of enhancements * test samples * lint * use observer and t.Setenv * lint * fix profiling * fix unit test race * more time * comment * enable profiling for linux * Add comment * use DryRun to validate the config --------- Co-authored-by: Fabrizio Ferri-Benedetti <algernon@fastmail.com>

VihasMakwana added 2 commits October 27, 2025 19:24

fix: add flush_interval

b2e6e11

couple of enhancements

e9b81e7

VihasMakwana requested review from a team as code owners October 27, 2025 14:05

mergify bot assigned VihasMakwana Oct 27, 2025

VihasMakwana added skip-changelog backport-active-all Automated backport with mergify to all the active branches labels Oct 27, 2025

VihasMakwana requested a review from theletterf October 27, 2025 14:08

This was referenced Oct 27, 2025

[9.2] (backport #10728) [EDOT][windows] add missing samples for windows #10855

Merged

[9.1] (backport #10728) [EDOT][windows] add missing samples for windows #10854

Closed

[8.19] (backport #10728) [EDOT][windows] add missing samples for windows #10852

Closed

test samples

43ba57e

VihasMakwana requested a review from a team as a code owner October 28, 2025 09:51

VihasMakwana requested review from pchila and swiatekm October 28, 2025 09:51

lint

ba1336c

pchila reviewed Oct 28, 2025

View reviewed changes

internal/pkg/otel/samples_test.go Outdated Show resolved Hide resolved

swiatekm reviewed Oct 28, 2025

View reviewed changes

internal/pkg/otel/samples_test.go Outdated Show resolved Hide resolved

internal/pkg/otel/samples_test.go Show resolved Hide resolved

VihasMakwana added 5 commits October 28, 2025 18:50

use observer and t.Setenv

eba6529

lint

0d8c951

fix profiling

849fea9

fix unit test race

1f1aac7

more time

aa3056c

VihasMakwana force-pushed the fix-config-key branch from e672526 to aa3056c Compare October 29, 2025 06:47

VihasMakwana and others added 4 commits October 29, 2025 12:24

comment

0fe57f8

enable profiling for linux

237d0d9

Add comment

0975ae1

use DryRun to validate the config

6aa0277

VihasMakwana force-pushed the fix-config-key branch 2 times, most recently from 310b452 to 6aa0277 Compare October 29, 2025 10:41

swiatekm approved these changes Oct 29, 2025

View reviewed changes

theletterf approved these changes Oct 29, 2025

View reviewed changes

Merge branch 'main' into fix-config-key

350e5ce

theletterf enabled auto-merge (squash) October 29, 2025 13:56

theletterf merged commit 49af983 into elastic:main Oct 29, 2025
21 checks passed

This was referenced Oct 29, 2025

[8.19] (backport #10856) [samples] remove unneeded file_storage and fix a bug #10898

Closed

[9.1] (backport #10856) [samples] remove unneeded file_storage and fix a bug #10899

Closed

mergify bot mentioned this pull request Oct 29, 2025

[9.2] (backport #10856) [samples] remove unneeded file_storage and fix a bug #10900

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[samples] remove unneeded file_storage and fix a bug#10856

[samples] remove unneeded file_storage and fix a bug#10856
theletterf merged 14 commits intoelastic:mainfrom
VihasMakwana:fix-config-key

VihasMakwana commented Oct 27, 2025 •

edited

Loading

mergify bot commented Oct 27, 2025

cmacknz commented Oct 27, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Oct 29, 2025

elasticmachine commented Oct 29, 2025

mergify bot commented Oct 29, 2025 •

edited

Loading

Labels

6 participants

Conversation

VihasMakwana 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?

mergify bot commented Oct 27, 2025

cmacknz commented Oct 27, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Oct 29, 2025

elasticmachine commented Oct 29, 2025

💚 Build Succeeded

History

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

Uh oh!

✅ Backports have been created

Labels

6 participants

VihasMakwana commented Oct 27, 2025 •

edited

Loading

mergify bot commented Oct 29, 2025 •

edited

Loading