From 005bfe2ff01cd070f31275adeb56a7461e3bacb9 Mon Sep 17 00:00:00 2001 From: jackgopack4 Date: Wed, 16 Jul 2025 11:05:32 -0400 Subject: [PATCH] [chore] OTEL-2684 convert configgrpc.Keepalive parameters to configoptional --- internal/otelarrow/test/e2e_test.go | 4 ++-- receiver/opencensusreceiver/config_test.go | 12 ++++++------ receiver/opencensusreceiver/factory_test.go | 8 ++++---- receiver/otelarrowreceiver/config_test.go | 8 ++++---- receiver/otelarrowreceiver/otelarrow_test.go | 12 ++++++------ 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/internal/otelarrow/test/e2e_test.go b/internal/otelarrow/test/e2e_test.go index b996e79d060ce..2f4cab5adb5b0 100644 --- a/internal/otelarrow/test/e2e_test.go +++ b/internal/otelarrow/test/e2e_test.go @@ -614,10 +614,10 @@ func TestIntegrationSelfTracing(t *testing.T) { testIntegrationTraces(ctx, t, params, func(_ *ExpConfig, rcfg *RecvConfig) { rcfg.GRPC.Keepalive = configoptional.Some(configgrpc.KeepaliveServerConfig{ - ServerParameters: &configgrpc.KeepaliveServerParameters{ + ServerParameters: configoptional.Some(configgrpc.KeepaliveServerParameters{ MaxConnectionAge: time.Second, MaxConnectionAgeGrace: 5 * time.Second, - }, + }), }) }, func() GenFunc { return makeTestTraces }, consumerSuccess, multiStreamEnding) } diff --git a/receiver/opencensusreceiver/config_test.go b/receiver/opencensusreceiver/config_test.go index 1799f9427df46..18d7cba0471c8 100644 --- a/receiver/opencensusreceiver/config_test.go +++ b/receiver/opencensusreceiver/config_test.go @@ -53,17 +53,17 @@ func TestLoadConfig(t *testing.T) { }, ReadBufferSize: 512 * 1024, Keepalive: configoptional.Some(configgrpc.KeepaliveServerConfig{ - ServerParameters: &configgrpc.KeepaliveServerParameters{ + ServerParameters: configoptional.Some(configgrpc.KeepaliveServerParameters{ MaxConnectionIdle: 11 * time.Second, MaxConnectionAge: 12 * time.Second, MaxConnectionAgeGrace: 13 * time.Second, Time: 30 * time.Second, Timeout: 5 * time.Second, - }, - EnforcementPolicy: &configgrpc.KeepaliveEnforcementPolicy{ + }), + EnforcementPolicy: configoptional.Some(configgrpc.KeepaliveEnforcementPolicy{ MinTime: 10 * time.Second, PermitWithoutStream: true, - }, + }), }), }, }, @@ -81,9 +81,9 @@ func TestLoadConfig(t *testing.T) { ReadBufferSize: 1024, WriteBufferSize: 1024, Keepalive: configoptional.Some(configgrpc.KeepaliveServerConfig{ - ServerParameters: &configgrpc.KeepaliveServerParameters{ + ServerParameters: configoptional.Some(configgrpc.KeepaliveServerParameters{ MaxConnectionIdle: 10 * time.Second, - }, + }), }), }, }, diff --git a/receiver/opencensusreceiver/factory_test.go b/receiver/opencensusreceiver/factory_test.go index e54c53b4e8850..8b202cbbe56ed 100644 --- a/receiver/opencensusreceiver/factory_test.go +++ b/receiver/opencensusreceiver/factory_test.go @@ -136,13 +136,13 @@ func TestCreateMetrics(t *testing.T) { ServerConfig: configgrpc.ServerConfig{ NetAddr: defaultNetAddr, Keepalive: configoptional.Some(configgrpc.KeepaliveServerConfig{ - ServerParameters: &configgrpc.KeepaliveServerParameters{ + ServerParameters: configoptional.Some(configgrpc.KeepaliveServerParameters{ MaxConnectionAge: 60 * time.Second, - }, - EnforcementPolicy: &configgrpc.KeepaliveEnforcementPolicy{ + }), + EnforcementPolicy: configoptional.Some(configgrpc.KeepaliveEnforcementPolicy{ MinTime: 30 * time.Second, PermitWithoutStream: true, - }, + }), }), }, }, diff --git a/receiver/otelarrowreceiver/config_test.go b/receiver/otelarrowreceiver/config_test.go index b74f27e1818c7..8a293f84f5787 100644 --- a/receiver/otelarrowreceiver/config_test.go +++ b/receiver/otelarrowreceiver/config_test.go @@ -64,17 +64,17 @@ func TestUnmarshalConfig(t *testing.T) { ReadBufferSize: 1024, WriteBufferSize: 1024, Keepalive: configoptional.Some(configgrpc.KeepaliveServerConfig{ - ServerParameters: &configgrpc.KeepaliveServerParameters{ + ServerParameters: configoptional.Some(configgrpc.KeepaliveServerParameters{ MaxConnectionIdle: 11 * time.Second, MaxConnectionAge: 12 * time.Second, MaxConnectionAgeGrace: 13 * time.Second, Time: 30 * time.Second, Timeout: 5 * time.Second, - }, - EnforcementPolicy: &configgrpc.KeepaliveEnforcementPolicy{ + }), + EnforcementPolicy: configoptional.Some(configgrpc.KeepaliveEnforcementPolicy{ MinTime: 10 * time.Second, PermitWithoutStream: true, - }, + }), }), }, Arrow: ArrowConfig{ diff --git a/receiver/otelarrowreceiver/otelarrow_test.go b/receiver/otelarrowreceiver/otelarrow_test.go index 29fa828c3196d..3eebd740e0224 100644 --- a/receiver/otelarrowreceiver/otelarrow_test.go +++ b/receiver/otelarrowreceiver/otelarrow_test.go @@ -357,11 +357,13 @@ func TestOTelArrowShutdown(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) cfg.GRPC.Keepalive = configoptional.Some(configgrpc.KeepaliveServerConfig{ - ServerParameters: &configgrpc.KeepaliveServerParameters{}, + ServerParameters: configoptional.None[configgrpc.KeepaliveServerParameters](), }) if !cooperative { - cfg.GRPC.Keepalive.Get().ServerParameters.MaxConnectionAge = time.Second - cfg.GRPC.Keepalive.Get().ServerParameters.MaxConnectionAgeGrace = 5 * time.Second + cfg.GRPC.Keepalive.Get().ServerParameters = configoptional.Some(configgrpc.KeepaliveServerParameters{ + MaxConnectionAge: time.Second, + MaxConnectionAgeGrace: 5 * time.Second, + }) } cfg.GRPC.NetAddr.Endpoint = endpointGrpc set := receivertest.NewNopSettings(componentmetadata.Type) @@ -856,9 +858,7 @@ func TestOTelArrowHalfOpenShutdown(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - cfg.GRPC.Keepalive = configoptional.Some(configgrpc.KeepaliveServerConfig{ - ServerParameters: &configgrpc.KeepaliveServerParameters{}, - }) + cfg.GRPC.Keepalive = configoptional.None[configgrpc.KeepaliveServerConfig]() // No keepalive parameters are set cfg.GRPC.NetAddr.Endpoint = endpointGrpc set := receivertest.NewNopSettings(componentmetadata.Type)