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.15](backport #40601) [filebeat][streaming] - Added retry functionality to websocket connections #42006

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 12, 2024

Type of change

Please label this PR with one of the following labels, depending on the scope of your change:

  • Enhancement
  • Docs

Proposed commit message

Added retry functionality to websocket connections under the streaming input. Docs & tests have been updated accordingly to support the new functionality.

Checklist

  • My code follows the style guidelines of this project
  • 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.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Disruptive User Impact

None

Author's Checklist

How to test this PR locally

Related issues

Use cases

Screenshots

Logs


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

…tions (#40601)

* added websocket retry logic, added input & config tests and updated docs

* updated changelog

* fixed function name spelling error

* added a retryable error check

* addressed PR comments

* passed metrics to handleConnectionResponse to track errors

* addressed PR suggestions

* updated retry dial signature

(cherry picked from commit 0c3c9c6)

# Conflicts:
#	x-pack/filebeat/input/streaming/websocket.go
@mergify mergify bot requested review from a team as code owners December 12, 2024 08:49
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Dec 12, 2024
@mergify mergify bot requested review from AndersonQ and belimawr and removed request for a team December 12, 2024 08:49
Copy link
Contributor Author

mergify bot commented Dec 12, 2024

Cherry-pick of 0c3c9c6 has failed:

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

You are currently cherry-picking commit 0c3c9c6e65.
  (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:   CHANGELOG.next.asciidoc
	modified:   x-pack/filebeat/docs/inputs/input-websocket.asciidoc
	modified:   x-pack/filebeat/input/websocket/config.go
	modified:   x-pack/filebeat/input/websocket/config_test.go
	modified:   x-pack/filebeat/input/websocket/input_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   x-pack/filebeat/input/streaming/websocket.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

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Dec 12, 2024
@botelastic
Copy link

botelastic bot commented Dec 12, 2024

This pull request doesn't have a Team:<team> label.

@ShourieG ShourieG closed this Dec 12, 2024
@ShourieG ShourieG deleted the mergify/bp/8.15/pr-40601 branch December 12, 2024 08:51
@ShourieG
Copy link
Contributor

ShourieG commented Dec 12, 2024

The structure of the websocket input changed from 8.15 to 8.16 to evolve into a more generic streaming input, hence this backport is not possible without merging the refactor.

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 needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant