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

feat(config): Add a configuration for the keepalive_timeout #1645

Merged
merged 15 commits into from
Dec 20, 2022

Conversation

klboke
Copy link
Contributor

@klboke klboke commented Nov 29, 2022

Open the keepalive_timeout configuration of relay server, when the IdleConnTimeout of the client is smaller than the keepalive_timeout of the server, the server will actively disconnect, then the client will report some unnecessary errors, expect to open the keepalive_timeout configuration to solve these problems

@klboke klboke requested a review from a team November 29, 2022 10:05
Copy link
Member

@jan-auer jan-auer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for this addition. I'm happy to accept this PR, please see the comments attached.

relay-config/src/config.rs Outdated Show resolved Hide resolved
relay-config/src/config.rs Outdated Show resolved Hide resolved
@klboke
Copy link
Contributor Author

klboke commented Nov 30, 2022

@jan-auer The code has been modified, can you take a look at it?

Copy link
Contributor

@iker-barriocanal iker-barriocanal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a changelog entry.

@klboke
Copy link
Contributor Author

klboke commented Dec 2, 2022

@iker-barriocanal A changelog has been added

@jan-auer
Copy link
Member

jan-auer commented Dec 2, 2022

Thank you @klboke. We're going to merge this PR as soon as #1654 is resolved. Sorry for the delay.

@jan-auer jan-auer enabled auto-merge (squash) December 7, 2022 12:39
@klboke
Copy link
Contributor Author

klboke commented Dec 8, 2022

@jan-auer Did a ci mission fail?

auto-merge was automatically disabled December 9, 2022 03:43

Head branch was pushed to by a user without write access

@klboke klboke requested review from jan-auer and iker-barriocanal and removed request for jan-auer and iker-barriocanal December 13, 2022 15:33
@iker-barriocanal
Copy link
Contributor

Hi @klboke, before we can proceed with this PR we need to wrap up #1686. Thanks for your contribution!

CHANGELOG.md Outdated
@@ -15,6 +15,7 @@
- Add OpenTelemetry Context. ([#1617](https://github.com/getsentry/relay/pull/1617))
- Add `app.in_foreground` and `thread.main` flag to protocol. ([#1578](https://github.com/getsentry/relay/pull/1578))
- Add support for View Hierarchy attachment_type. ([#1642](https://github.com/getsentry/relay/pull/1642))
- Add support for `keepalive_timeout` configuration. ([#1645](https://github.com/getsentry/relay/pull/1645))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you, please, move this CHANGELOG entry to Features in Unreleased section?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@olksdr olksdr enabled auto-merge (squash) December 20, 2022 07:00
@olksdr olksdr merged commit 1b3475a into getsentry:master Dec 20, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants