Skip to content

[chore] convert configgrpc.Keepalive params to configoptional #41342

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.

Sign up for GitHub

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

Merged
mx-psi merged 1 commit into from
Jul 16, 2025
Merged

[chore] convert configgrpc.Keepalive params to configoptional #41342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions internal/otelarrow/test/e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
12 changes: 6 additions & 6 deletions receiver/opencensusreceiver/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
}),
}),
},
},
Expand All @@ -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,
},
}),
}),
},
},
Expand Down
8 changes: 4 additions & 4 deletions receiver/opencensusreceiver/factory_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
}),
}),
},
},
Expand Down
8 changes: 4 additions & 4 deletions receiver/otelarrowreceiver/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
12 changes: 6 additions & 6 deletions receiver/otelarrowreceiver/otelarrow_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
Loading