-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Add ReusePort config to confighttp #14058
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
base: main
Are you sure you want to change the base?
Changes from all commits
e063074
4285bb8
1073d97
77faf7e
d713c54
6a5a94c
c6f5d60
ebc56b9
f796cc1
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,26 @@ | ||
| # 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. otlpreceiver) | ||
| component: pkg/config/confighttp | ||
|
|
||
| # A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). | ||
| # cspell:ignore REUSEPORT | ||
| note: Added ReusePort option to confighttp.ServerConfig to enable SO_REUSEPORT on supported platforms. | ||
|
|
||
| # One or more tracking issues or pull requests related to the change | ||
| issues: [14046] | ||
|
|
||
| # (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: | ||
|
|
||
| # 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,30 @@ | ||
| // Copyright The OpenTelemetry Authors | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| //go:build !windows | ||
|
|
||
| package confighttp // import "go.opentelemetry.io/collector/config/confighttp" | ||
|
|
||
| import ( | ||
| "net" | ||
| "syscall" | ||
|
|
||
| "golang.org/x/sys/unix" | ||
| ) | ||
|
|
||
| func (sc *ServerConfig) getListenConfig() (net.ListenConfig, error) { | ||
| cfg := net.ListenConfig{} | ||
| if sc.ReusePort { | ||
| cfg.Control = func(_, _ string, c syscall.RawConn) error { | ||
| var controlErr error | ||
| err := c.Control(func(fd uintptr) { | ||
| controlErr = unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_REUSEPORT, 1) | ||
| }) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| return controlErr | ||
| } | ||
| } | ||
|
|
||
| return cfg, nil | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| // Copyright The OpenTelemetry Authors | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| //go:build windows | ||
|
|
||
| package confighttp // import "go.opentelemetry.io/collector/config/confighttp" | ||
|
|
||
| import ( | ||
| "errors" | ||
| "net" | ||
| ) | ||
|
|
||
| func (sc *ServerConfig) getListenConfig() (net.ListenConfig, error) { | ||
| if sc.ReusePort { | ||
| return net.ListenConfig{}, errors.New("ReusePort is not supported on this platform") | ||
| } | ||
|
|
||
| return net.ListenConfig{}, nil | ||
| } | ||
|
Comment on lines
+12
to
+18
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I would also like to have this in Validate and fail during dry-run.
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @bogdandrutu The ServerConfig doesn't have a Validate yet - are you proposing I add one?
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. IMHO, introducing
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
why?
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Yes please, every time we add fields that need to be validated we should validate them and if that needs a Validate func we add it.
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Added @bogdandrutu
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Because that's a separate change that would need its own changelog entry, and having atomic PRs facilitates reviews.
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @dmathieu @bogdandrutu Where are we with this? I've added the Validate for now - IMO it does make sense to have it here so there isn't a period where it isn't validated. Especially with this change being the only thing in the Validate method, bundling make sense here.
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If @bogdandrutu is fine with this, it can go. |
||
Uh oh!
There was an error while loading. Please reload this page.