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] TBS: fix log formatting (backport #15496) #15498

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 31, 2025

Motivation/summary

Fix a missing colon in logs (typo from #15235 ), and remove "storage" in "configured storage limit reached" message to make way for #15467 to avoid confusion

Checklist

For functional changes, consider:

  • Is it observable through the addition of either logging or metrics?
  • Is its use being published in telemetry to enable product improvement?
  • Have system tests been added to avoid regression?

How to test these changes

Related issues


This is an automatic backport of pull request #15496 done by [Mergify](https://mergify.com).

Fix a missing colon in logs (typo from #15235 ), and remove "storage" in "configured storage limit reached" message to make way for #15467 to avoid confusion

(cherry picked from commit 28068bd)

# Conflicts:
#	x-pack/apm-server/sampling/eventstorage/rw.go
@mergify mergify bot requested a review from a team as a code owner January 31, 2025 11:15
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jan 31, 2025
Copy link
Contributor Author

mergify bot commented Jan 31, 2025

Cherry-pick of 28068bd has failed:

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

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

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   x-pack/apm-server/sampling/eventstorage/rw.go

no changes added to commit (use "git add" and/or "git commit -a")

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 Feb 3, 2025

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

@carsonip
Copy link
Member

carsonip commented Feb 5, 2025

Closing the PR as we do not intend to bring pebble implementation back to 8.x due to migration implications.

@carsonip carsonip closed this Feb 5, 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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant