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.14](backport #4689) Replacing memory limiter processor with extension #4980

Merged
merged 2 commits into from
Jun 21, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 21, 2024

Replaces processor with extensions in order to avoid dropping events when processor hits the limits. Extension puts back-pressure on receivers

Fixes: #4665


This is an automatic backport of pull request #4689 done by Mergify.

(cherry picked from commit 13a4157)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
#	internal/pkg/otel/README.md
@mergify mergify bot requested a review from a team as a code owner June 21, 2024 08:25
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jun 21, 2024
@mergify mergify bot requested review from rdner and faec and removed request for a team June 21, 2024 08:25
Copy link
Contributor Author

mergify bot commented Jun 21, 2024

Cherry-pick of 13a4157 has failed:

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

You are currently cherry-picking commit 13a4157d11.
  (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/components.go
	modified:   otel.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   go.sum
	both modified:   internal/pkg/otel/README.md

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

@michalpristas michalpristas merged commit 1655c00 into 8.14 Jun 21, 2024
13 checks passed
@michalpristas michalpristas deleted the mergify/bp/8.14/pr-4689 branch June 21, 2024 10:04
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