Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Oct 29, 2025

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.

Screenshot 2025-10-27 at 7 35 58 PM
This is an automatic backport of pull request #10856 done by [Mergify](https://mergify.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>
(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
@mergify mergify bot added the backport label Oct 29, 2025
@mergify mergify bot requested a review from a team as a code owner October 29, 2025 16:02
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Oct 29, 2025
@mergify mergify bot requested review from a team as code owners October 29, 2025 16:02
@mergify mergify bot added conflicts There is a conflict in the backported pull request backport labels Oct 29, 2025
@mergify mergify bot removed the request for review from a team October 29, 2025 16:02
@mergify mergify bot requested review from pkoutsovasilis and swiatekm October 29, 2025 16:02
@mergify
Copy link
Contributor Author

mergify bot commented Oct 29, 2025

Cherry-pick of 49af983 has failed:

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

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

Changes to be committed:
	modified:   internal/pkg/otel/samples/linux/profiles_metrics.yml
	modified:   internal/pkg/otel/samples/windows/logs_metrics_traces.yml
	new file:   internal/pkg/otel/samples_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   internal/pkg/otel/samples/windows/managed_otlp/logs_metrics_traces.yml
	deleted by us:   internal/pkg/otel/samples/windows/managed_otlp/platformlogs.yml
	deleted by us:   internal/pkg/otel/samples/windows/managed_otlp/platformlogs_hostmetrics.yml

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

@elasticmachine
Copy link
Collaborator

elasticmachine commented Oct 29, 2025

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport conflicts There is a conflict in the backported pull request skip-changelog

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants