-
Notifications
You must be signed in to change notification settings - Fork 3.4k
[pkg/kafka/configkafka] Add conn_idle_timeout for franz-go clients #45321
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
Changes from 2 commits
81a049d
7c9b052
bd9d86b
b8713e1
25a3af3
51dabed
9052e25
8017afd
f3a280a
26676c1
8f9dbdd
ed5d01d
3571b56
10c4165
eb7ead5
46a5687
70fa49a
b4f4ab0
a977830
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| # Use this changelog template to create an entry for release notes. | ||
|
|
||
| # One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' | ||
| change_type: enhancement | ||
|
|
||
| # The name of the component, or a single word describing the area of concern, (e.g. receiver/filelog) | ||
| component: exporter/kafka | ||
|
|
||
| # A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). | ||
| note: Add `connection_idle_timeout` configuration option to control idle connection timeout. | ||
|
|
||
| # Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. | ||
| issues: [45321] | ||
|
|
||
| # (Optional) One or more lines of additional information to render under the primary note. | ||
| # These lines will be padded with 2 spaces and then inserted directly into the document. | ||
| # Use pipe (|) for multiline entries. | ||
| subtext: | | ||
| Defaults to 4 minutes. It may take up to 2x the configured time before a connection is actually closed. | ||
| This setting is applicable for franz-go, while ignored in sarama because it does not close idle connections. | ||
|
|
||
| # If your change doesn't affect end users or the exported elements of any package, | ||
| # you should instead start your pull request title with [chore] or use the "Skip Changelog" label. | ||
| # Optional: The change log or logs in which this entry should be included. | ||
| # e.g. '[user]' or '[user, api]' | ||
| # Include 'user' if the change is relevant to end users. | ||
| # Include 'api' if there is a change to a library API. | ||
| # Default: '[user]' | ||
| change_logs: [] |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| # Use this changelog template to create an entry for release notes. | ||
|
|
||
| # One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' | ||
| change_type: enhancement | ||
|
|
||
| # The name of the component, or a single word describing the area of concern, (e.g. receiver/filelog) | ||
| component: receiver/kafka | ||
|
|
||
| # A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). | ||
| note: Add `connection_idle_timeout` configuration option to control idle connection timeout. | ||
|
|
||
| # Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. | ||
| issues: [45321] | ||
|
|
||
| # (Optional) One or more lines of additional information to render under the primary note. | ||
| # These lines will be padded with 2 spaces and then inserted directly into the document. | ||
| # Use pipe (|) for multiline entries. | ||
| subtext: | | ||
| Defaults to 4 minutes. It may take up to 2x the configured time before a connection is actually closed. | ||
| This setting is applicable for franz-go, while ignored in sarama because it does not close idle connections. | ||
|
|
||
| # If your change doesn't affect end users or the exported elements of any package, | ||
| # you should instead start your pull request title with [chore] or use the "Skip Changelog" label. | ||
| # Optional: The change log or logs in which this entry should be included. | ||
| # e.g. '[user]' or '[user, api]' | ||
| # Include 'user' if the change is relevant to end users. | ||
| # Include 'api' if there is a change to a library API. | ||
| # Default: '[user]' | ||
| change_logs: [] |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -76,14 +76,21 @@ type ClientConfig struct { | |
| // | ||
| // NOTE: this is experimental and may be removed in a future release. | ||
| UseLeaderEpoch bool `mapstructure:"use_leader_epoch"` | ||
|
|
||
| // ConnectionIdleTimeout specifies the time after which idle connections are closed. | ||
| // | ||
| // Note: It may take up to 2x the configured time before a connection is actually closed. | ||
| // This setting is applicable for franz-go, while ignored in sarama because it does not close idle connections. | ||
| ConnectionIdleTimeout time.Duration `mapstructure:"connection_idle_timeout"` | ||
| } | ||
|
|
||
| func NewDefaultClientConfig() ClientConfig { | ||
| return ClientConfig{ | ||
| Brokers: []string{"localhost:9092"}, | ||
| ClientID: "otel-collector", | ||
| Metadata: NewDefaultMetadataConfig(), | ||
| UseLeaderEpoch: true, | ||
| Brokers: []string{"localhost:9092"}, | ||
| ClientID: "otel-collector", | ||
| Metadata: NewDefaultMetadataConfig(), | ||
| UseLeaderEpoch: true, | ||
| ConnectionIdleTimeout: 4 * time.Minute, | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -96,6 +103,9 @@ func (c ClientConfig) Validate() error { | |
| return fmt.Errorf("invalid protocol version: %w", err) | ||
| } | ||
| } | ||
| if c.ConnectionIdleTimeout <= 0 { | ||
| return fmt.Errorf("connection_idle_timeout (%s) must be positive", c.ConnectionIdleTimeout) | ||
|
||
| } | ||
| return nil | ||
| } | ||
|
|
||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.