Skip to content

[8.18] (backport #17135) TBS: Log pubsub errors at error or warn level#17178

Merged
mergify[bot] merged 3 commits into8.18from
mergify/bp/8.18/pr-17135
Jun 10, 2025
Merged

[8.18] (backport #17135) TBS: Log pubsub errors at error or warn level#17178
mergify[bot] merged 3 commits into8.18from
mergify/bp/8.18/pr-17135

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Jun 10, 2025

Motivation/summary

  • Surface pubsub subscriber errors by logging at Warn level for 429 and Error level for others, instead of Debug level. Do not log context canceled. This may introduce noise to logs, e.g. when ES returns 429, but at worst it will only log one line every search interval (default = 1m/2 = 30s) which is acceptable.
  • Also change publisher logs from debug level to error level.

Checklist

- [ ] Update CHANGELOG.asciidoc to be done on release

  • Documentation has been updated

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

Covered by unit tests

Related issues

Fixes #17117

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

@carsonip @mergify
TBS: Log pubsub errors at error or warn level (#17135)
a506e69 
* Surface pubsub subscriber errors by logging at Warn level for 429 and Error level for others, instead of Debug level. Do not log context canceled. This may introduce noise to logs, e.g. when ES returns 429, but at worst it will only log one line every search interval (default = 1m/2 = 30s) which is acceptable.
* Also change publisher logs from debug level to error level.

(cherry picked from commit 6d41432)

# Conflicts:
#	x-pack/apm-server/sampling/pubsub/checkpoints.go
#	x-pack/apm-server/sampling/pubsub/pubsub.go
#	x-pack/apm-server/sampling/pubsub/pubsub_test.go
@mergify mergify bot added the backport label Jun 10, 2025
@mergify mergify bot requested a review from a team as a code owner June 10, 2025 20:40
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jun 10, 2025
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Jun 10, 2025

Cherry-pick of 6d41432 has failed:

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

You are currently cherry-picking commit 6d414320.
  (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 <file>..." to mark resolution)
	both modified:   x-pack/apm-server/sampling/pubsub/checkpoints.go
	both modified:   x-pack/apm-server/sampling/pubsub/pubsub.go
	both modified:   x-pack/apm-server/sampling/pubsub/pubsub_test.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

@mergify mergify bot mentioned this pull request Jun 10, 2025
Merged
1 task
@mergify mergify bot merged commit c0d7739 into 8.18 Jun 10, 2025
15 checks passed
@mergify mergify bot deleted the mergify/bp/8.18/pr-17135 branch June 10, 2025 21:12
@kruskall kruskall mentioned this pull request Jun 19, 2025
Closed
4 tasks
@endorama
Copy link
Copy Markdown
Contributor

endorama commented Jun 23, 2025

I reviewed the test implementation, it covers the new behavior.

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

Reviewers

@carsonip carsonip carsonip approved these changes

Assignees

@carsonip carsonip

Labels

backport conflicts There is a conflict in the backported pull request test-plan-ok

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@endorama @carsonip