Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[8.x](backport #4168) Replace most context.TODO calls, comment on other Background and TODOs #4180

Merged
merged 5 commits into from
Dec 10, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 5, 2024

What is the problem this PR solves?

Replace use of context.TODO and context.Background from most use cases

Design Checklist

  • I have ensured my design is stateless and will work when multiple fleet-server instances are behind a load balancer.
  • I have or intend to scale test my changes, ensuring it will work reliably with 100K+ agents connected.
  • I have included fail safe mechanisms to limit the load on fleet-server: rate limiting, circuit breakers, caching, load shedding, etc.

Checklist

  • 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

Related issues

#4168)

(cherry picked from commit cf41f38)

# Conflicts:
#	internal/pkg/config/config.go
#	internal/pkg/server/fleet.go
@mergify mergify bot requested a review from a team as a code owner December 5, 2024 20:51
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Dec 5, 2024
Copy link
Contributor Author

mergify bot commented Dec 5, 2024

Cherry-pick of cf41f38 has failed:

On branch mergify/bp/8.x/pr-4168
Your branch is up to date with 'origin/8.x'.

You are currently cherry-picking commit cf41f38c.
  (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:
	new file:   changelog/fragments/1733164018-Replace-use-of-context.TODO.yaml
	modified:   cmd/fleet/main.go
	modified:   internal/pkg/action/dispatcher.go
	modified:   internal/pkg/api/handleArtifacts.go
	modified:   internal/pkg/api/handleCheckin.go
	modified:   internal/pkg/api/handleFileDelivery.go
	modified:   internal/pkg/api/handleUpload.go
	modified:   internal/pkg/api/metrics.go
	modified:   internal/pkg/api/server.go
	modified:   internal/pkg/bulk/engine.go
	modified:   internal/pkg/cache/cache.go
	modified:   internal/pkg/config/config_test.go
	modified:   internal/pkg/config/env_defaults.go
	modified:   internal/pkg/config/env_defaults_test.go
	modified:   internal/pkg/file/uploader/finalize.go
	modified:   internal/pkg/limit/listener.go
	modified:   internal/pkg/profile/profile.go
	modified:   internal/pkg/server/agent.go
	modified:   internal/pkg/server/fleet_integration_test.go
	modified:   internal/pkg/state/reporter.go
	modified:   internal/pkg/testing/esutil/datastream.go
	modified:   internal/pkg/testing/esutil/esutil.go
	modified:   internal/pkg/testing/esutil/ilm.go
	modified:   internal/pkg/testing/esutil/index.go
	modified:   internal/pkg/testing/esutil/template.go
	modified:   internal/pkg/throttle/throttle.go
	modified:   internal/pkg/throttle/throttle_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   internal/pkg/config/config.go
	both modified:   internal/pkg/server/fleet.go

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

Copy link
Contributor Author

mergify bot commented Dec 9, 2024

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

Copy link
Contributor Author

mergify bot commented Dec 10, 2024

This pull request is now in conflicts. Could you fix it @mergify[bot]? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/8.x/pr-4168 upstream/mergify/bp/8.x/pr-4168
git merge upstream/8.x
git push upstream mergify/bp/8.x/pr-4168

@michel-laterman michel-laterman merged commit 14b40c9 into 8.x Dec 10, 2024
8 checks passed
@michel-laterman michel-laterman deleted the mergify/bp/8.x/pr-4168 branch December 10, 2024 18:59
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant