Undo an unnecessary struct field type change

Author: swiatekm

config/confighttp/keepalive_test.go

@@ -187,8 +187,7 @@ func TestServerConfigValidate(t *testing.T) {
 			name: "deprecated keep_alives_enabled false only — no conflict",
 			cfg: func() ServerConfig {
 				c := NewDefaultServerConfig()
-				disabled := false
-				c.KeepAlivesEnabled = &disabled
+				c.KeepAlivesEnabled = false
 				return c
 			}(),
 		},
@@ -207,8 +206,7 @@ func TestServerConfigValidate(t *testing.T) {
 			cfg: func() ServerConfig {
 				c := NewDefaultServerConfig()
 				c.Keepalive = configoptional.Some(KeepaliveServerConfig{})
-				disabled := false
-				c.KeepAlivesEnabled = &disabled
+				c.KeepAlivesEnabled = false
 				return c
 			}(),
 			expectError: true,
@@ -305,8 +303,7 @@ func TestServerConfigDeprecatedKeepAlivesDisabled(t *testing.T) {
 	settings := component.TelemetrySettings{Logger: zap.New(core)}
 
 	cfg := NewDefaultServerConfig()
-	disabled := false
-	cfg.KeepAlivesEnabled = &disabled
+	cfg.KeepAlivesEnabled = false
 
 	srv, err := cfg.ToServer(t.Context(), nil, settings, http.NewServeMux())
 	require.NoError(t, err)

config/confighttp/server.go

@@ -101,7 +101,8 @@ type ServerConfig struct {
 	// Deprecated: use Keepalive.IdleTimeout instead.
 	IdleTimeout time.Duration `mapstructure:"idle_timeout,omitempty"`
 	// Deprecated: set Keepalive to None to disable keep-alives.
-	KeepAlivesEnabled *bool `mapstructure:"keep_alives_enabled,omitempty"`
+	// Note: only the false value is meaningful; true is indistinguishable from the default.
+	KeepAlivesEnabled bool `mapstructure:"keep_alives_enabled,omitempty"`
 }
 
 type KeepaliveServerConfig struct {
@@ -128,11 +129,12 @@ func NewDefaultServerConfig() ServerConfig {
 		Keepalive: configoptional.Default(KeepaliveServerConfig{
 			IdleTimeout: 1 * time.Minute,
 		}),
+		KeepAlivesEnabled: true,
 	}
 }
 
 func (sc *ServerConfig) Validate() error {
-	if sc.Keepalive.HasValue() && (sc.IdleTimeout != 0 || sc.KeepAlivesEnabled != nil) {
+	if sc.Keepalive.HasValue() && (sc.IdleTimeout != 0 || !sc.KeepAlivesEnabled) {
 		return errors.New("confighttp.ServerConfig: cannot use deprecated keepalive fields (idle_timeout, keep_alives_enabled) alongside the 'keepalive' section; migrate to the 'keepalive' section")
 	}
 	return nil
@@ -205,7 +207,7 @@ func (sc *ServerConfig) ToServer(ctx context.Context, extensions map[component.I
 	if sc.IdleTimeout != 0 {
 		settings.Logger.Warn("'idle_timeout' is deprecated; use 'keepalive.idle_timeout' instead")
 	}
-	if sc.KeepAlivesEnabled != nil {
+	if !sc.KeepAlivesEnabled {
 		settings.Logger.Warn("'keep_alives_enabled' is deprecated; set keepalive to null (keepalive: null) to disable keep-alives")
 	}
 
@@ -326,7 +328,7 @@ func (sc *ServerConfig) ToServer(ctx context.Context, extensions map[component.I
 
 	// Convert deprecated fields into the canonical Keepalive optional so the
 	// application logic below only has to deal with one struct.
-	if sc.KeepAlivesEnabled != nil && !*sc.KeepAlivesEnabled {
+	if !sc.Keepalive.HasValue() && !sc.KeepAlivesEnabled {
 		sc.Keepalive = configoptional.None[KeepaliveServerConfig]()
 	} else if sc.IdleTimeout != 0 {
 		sc.Keepalive = configoptional.Some(KeepaliveServerConfig{

config/confighttp/server_test.go

@@ -1153,7 +1153,7 @@ func TestServerUnmarshalYAMLComprehensiveConfig(t *testing.T) {
 	require.NoError(t, err)
 
 	// Test server configuration
-	var serverConfig ServerConfig
+	serverConfig := NewDefaultServerConfig()
 	serverSub, err := cm.Sub("server")
 	require.NoError(t, err)
 	require.NoError(t, serverSub.Unmarshal(&serverConfig))

internal/e2e/confighttp_test.go

@@ -31,6 +31,7 @@ func TestConfmapMarshalConfigHTTP(t *testing.T) {
 	require.NoError(t, conf.Marshal(confighttp.NewDefaultServerConfig()))
 	assert.Equal(t, map[string]any{
 		"cors":                nil,
+		"keep_alives_enabled": true,
 		"keepalive":           nil,
 		"read_header_timeout": 60 * time.Second,
 		"tls":                 nil,

receiver/otlpreceiver/config_test.go

@@ -141,7 +141,8 @@ func TestUnmarshalConfig(t *testing.T) {
 							AllowedOrigins: []string{"https://*.test.com", "https://test.com"},
 							MaxAge:         7200,
 						}),
-						Keepalive: configoptional.Some(confighttp.KeepaliveServerConfig{}),
+						Keepalive:         configoptional.Some(confighttp.KeepaliveServerConfig{}),
+						KeepAlivesEnabled: true,
 					},
 					TracesURLPath:  "/traces",
 					MetricsURLPath: "/v2/metrics",
@@ -174,7 +175,8 @@ func TestUnmarshalConfigUnix(t *testing.T) {
 							Endpoint:  "/tmp/http_otlp.sock",
 							Transport: confignet.TransportTypeUnix,
 						},
-						Keepalive: configoptional.Some(confighttp.KeepaliveServerConfig{}),
+						Keepalive:         configoptional.Some(confighttp.KeepaliveServerConfig{}),
+						KeepAlivesEnabled: true,
 					},
 					TracesURLPath:  defaultTracesURLPath,
 					MetricsURLPath: defaultMetricsURLPath,