Skip to content

Commit

Permalink
[receiver/otlp, component] Add feature gate to switch to localhost de…
Browse files Browse the repository at this point in the history
…faults for server-like components
  • Loading branch information
mx-psi committed Oct 4, 2023
1 parent 73be069 commit 8f14eb0
Show file tree
Hide file tree
Showing 6 changed files with 136 additions and 5 deletions.
26 changes: 26 additions & 0 deletions .chloggen/mx-psi_featuregate-localhost.yaml
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: component

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: "Add `component.UseLocalHostAsDefaultHost` feature gate that changes default endpoints from 0.0.0.0 to localhost"

# One or more tracking issues or pull requests related to the change
issues: [8510]

# (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: |
The only component in this repository affected by this is the OTLP receiver.
# 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: []
40 changes: 40 additions & 0 deletions component/featuregate.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

package component // import "go.opentelemetry.io/collector/component"

import (
"fmt"

"go.uber.org/zap"

"go.opentelemetry.io/collector/featuregate"
)

const useLocalHostAsDefaultHostID = "component.UseLocalHostAsDefaultHost"

// UseLocalHostAsDefaultHostfeatureGate is the feature gate that controls whether
// server-like receivers and extensions such as the OTLP receiver use localhost as the default host for their endpoints.
var UseLocalHostAsDefaultHostfeatureGate = featuregate.GlobalRegistry().MustRegister(
useLocalHostAsDefaultHostID,
featuregate.StageAlpha,
featuregate.WithRegisterDescription("controls whether server-like receivers and extensions such as the OTLP receiver use localhost as the default host for their endpoints"))

// EndpointForPort gets the endpoint for a given port using localhost or 0.0.0.0 depending on the feature gate.
func EndpointForPort(port int) string {
host := "0.0.0.0"
if UseLocalHostAsDefaultHostfeatureGate.IsEnabled() {
host = "localhost"
}
return fmt.Sprintf("%s:%d", host, port)
}

// LogAboutUseLocalHostAsDefault logs about the upcoming change from 0.0.0.0 to localhost on server-like components.
func LogAboutUseLocalHostAsDefault(logger *zap.Logger) {
if !UseLocalHostAsDefaultHostfeatureGate.IsEnabled() {
logger.Info(
"The default endpoint(s) for this component will change in a future version to use localhost instead of 0.0.0.0. Use the feature gate to preview the new default.",
zap.String("feature gate ID", useLocalHostAsDefaultHostID),
)
}

Check warning on line 39 in component/featuregate.go

View check run for this annotation

Codecov / codecov/patch

component/featuregate.go#L33-L39

Added lines #L33 - L39 were not covered by tests
}
57 changes: 57 additions & 0 deletions component/featuregate_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

package component

import (
"testing"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"go.opentelemetry.io/collector/featuregate"
)

func setFeatureGateForTest(t testing.TB, gate *featuregate.Gate, enabled bool) func() {
originalValue := gate.IsEnabled()
require.NoError(t, featuregate.GlobalRegistry().Set(gate.ID(), enabled))
return func() {
require.NoError(t, featuregate.GlobalRegistry().Set(gate.ID(), originalValue))
}
}

func TestEndpointForPort(t *testing.T) {
tests := []struct {
port int
enabled bool
endpoint string
}{
{
port: 4317,
enabled: false,
endpoint: "0.0.0.0:4317",
},
{
port: 4317,
enabled: true,
endpoint: "localhost:4317",
},
{
port: 0,
enabled: false,
endpoint: "0.0.0.0:0",
},
{
port: 0,
enabled: true,
endpoint: "localhost:0",
},
}

for _, tt := range tests {
t.Run(tt.endpoint, func(t *testing.T) {
defer setFeatureGateForTest(t, UseLocalHostAsDefaultHostfeatureGate, tt.enabled)()
assert.Equal(t, EndpointForPort(tt.port), tt.endpoint)
})
}
}
4 changes: 3 additions & 1 deletion receiver/otlpreceiver/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ The following settings are configurable:

- `endpoint` (default = 0.0.0.0:4317 for grpc protocol, 0.0.0.0:4318 http protocol):
host:port to which the receiver is going to receive data. The valid syntax is
described at https://github.com/grpc/grpc/blob/master/doc/naming.md.
described at https://github.com/grpc/grpc/blob/master/doc/naming.md. The
`component.UseLocalHostAsDefaultHost` feature gate changes these to localhost:4317 and
localhost:4318 respectively.

## Advanced Configuration

Expand Down
8 changes: 4 additions & 4 deletions receiver/otlpreceiver/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
const (
typeStr = "otlp"

defaultGRPCEndpoint = "0.0.0.0:4317"
defaultHTTPEndpoint = "0.0.0.0:4318"
grpcPort = 4317
httpPort = 4318

defaultTracesURLPath = "/v1/traces"
defaultMetricsURLPath = "/v1/metrics"
Expand All @@ -42,15 +42,15 @@ func createDefaultConfig() component.Config {
Protocols: Protocols{
GRPC: &configgrpc.GRPCServerSettings{
NetAddr: confignet.NetAddr{
Endpoint: defaultGRPCEndpoint,
Endpoint: component.EndpointForPort(grpcPort),
Transport: "tcp",
},
// We almost write 0 bytes, so no need to tune WriteBufferSize.
ReadBufferSize: 512 * 1024,
},
HTTP: &HTTPConfig{
HTTPServerSettings: &confighttp.HTTPServerSettings{
Endpoint: defaultHTTPEndpoint,
Endpoint: component.EndpointForPort(httpPort),
},
TracesURLPath: defaultTracesURLPath,
MetricsURLPath: defaultMetricsURLPath,
Expand Down
6 changes: 6 additions & 0 deletions receiver/otlpreceiver/otlp.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ import (
"go.opentelemetry.io/collector/receiver/receiverhelper"
)

// onceLogLocalHost is used to log the info log about changing the default once.
var onceLogLocalHost sync.Once

// otlpReceiver is the type that exposes Trace and Metrics reception.
type otlpReceiver struct {
cfg *Config
Expand Down Expand Up @@ -163,6 +166,9 @@ func (r *otlpReceiver) startProtocolServers(host component.Host) error {
// Start runs the trace receiver on the gRPC server. Currently
// it also enables the metrics receiver too.
func (r *otlpReceiver) Start(_ context.Context, host component.Host) error {
onceLogLocalHost.Do(func() {
component.LogAboutUseLocalHostAsDefault(r.settings.Logger)
})
return r.startProtocolServers(host)
}

Expand Down

0 comments on commit 8f14eb0

Please sign in to comment.