Skip to content

[chore] update configgrpc references to use configoptional #5280

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 2 commits into from
Jul 9, 2025
Merged

[chore] update configgrpc references to use configoptional #5280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a5666b
[chore] update configgrpc.ServerConfig and configgrpc.ClientConfig to…
jackgopack4 Jul 8, 2025
2c92ac1
[chore] make gotidy
jackgopack4 Jul 8, 2025
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
5 changes: 3 additions & 2 deletions exporter/coralogixexporter/factory_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"go.opentelemetry.io/collector/config/configcompression"
"go.opentelemetry.io/collector/config/configgrpc"
"go.opentelemetry.io/collector/config/configopaque"
"go.opentelemetry.io/collector/config/configoptional"
"go.opentelemetry.io/collector/config/configretry"
"go.opentelemetry.io/collector/config/configtls"
"go.opentelemetry.io/collector/exporter/exporterhelper"
Expand Down Expand Up @@ -104,11 +105,11 @@ func TestCreateTraces(t *testing.T) {
config: &Config{
Traces: configgrpc.ClientConfig{
Endpoint: endpoint,
Keepalive: &configgrpc.KeepaliveClientConfig{
Keepalive: configoptional.Some(configgrpc.KeepaliveClientConfig{
Time: 30 * time.Second,
Timeout: 25 * time.Second,
PermitWithoutStream: true,
},
}),
},
},
},
Expand Down
2 changes: 1 addition & 1 deletion exporter/coralogixexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ require (
go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250708151327-74cb2f311035
go.opentelemetry.io/collector/config/configgrpc v0.129.1-0.20250708151327-74cb2f311035
go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250708151327-74cb2f311035
go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250708151327-74cb2f311035
go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250708151327-74cb2f311035
go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250708151327-74cb2f311035
go.opentelemetry.io/collector/confmap v1.35.1-0.20250708151327-74cb2f311035
Expand Down Expand Up @@ -59,7 +60,6 @@ require (
go.opentelemetry.io/collector/config/configauth v0.129.1-0.20250708151327-74cb2f311035 // indirect
go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250708151327-74cb2f311035 // indirect
go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250708151327-74cb2f311035 // indirect
go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect
go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.129.1-0.20250708151327-74cb2f311035 // indirect
go.opentelemetry.io/collector/consumer/consumertest v0.129.1-0.20250708151327-74cb2f311035 // indirect
go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250708151327-74cb2f311035 // indirect
Expand Down
4 changes: 2 additions & 2 deletions exporter/coralogixexporter/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion exporter/loadbalancingexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ require (
go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250708151327-74cb2f311035 // indirect
go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250708151327-74cb2f311035 // indirect
go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250708151327-74cb2f311035 // indirect
go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect
go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250708151327-74cb2f311035 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.129.1-0.20250708151327-74cb2f311035 // indirect
go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250708151327-74cb2f311035 // indirect
go.opentelemetry.io/collector/confmap/provider/envprovider v1.35.1-0.20250708151327-74cb2f311035 // indirect
Expand Down
4 changes: 2 additions & 2 deletions exporter/loadbalancingexporter/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions exporter/opencensusexporter/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/config/configgrpc"
"go.opentelemetry.io/collector/config/configopaque"
"go.opentelemetry.io/collector/config/configoptional"
"go.opentelemetry.io/collector/config/configretry"
"go.opentelemetry.io/collector/config/configtls"
"go.opentelemetry.io/collector/confmap/confmaptest"
Expand Down Expand Up @@ -64,11 +65,11 @@ func TestLoadConfig(t *testing.T) {
},
Insecure: false,
},
Keepalive: &configgrpc.KeepaliveClientConfig{
Keepalive: configoptional.Some(configgrpc.KeepaliveClientConfig{
Time: 20,
PermitWithoutStream: true,
Timeout: 30,
},
}),
WriteBufferSize: 512 * 1024,
BalancerName: "round_robin",
},
Expand Down
5 changes: 3 additions & 2 deletions exporter/opencensusexporter/factory_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"go.opentelemetry.io/collector/component/componenttest"
"go.opentelemetry.io/collector/config/configgrpc"
"go.opentelemetry.io/collector/config/configopaque"
"go.opentelemetry.io/collector/config/configoptional"
"go.opentelemetry.io/collector/config/configtls"
"go.opentelemetry.io/collector/exporter/exportertest"

Expand Down Expand Up @@ -75,11 +76,11 @@ func TestCreateTraces(t *testing.T) {
config: &Config{
ClientConfig: configgrpc.ClientConfig{
Endpoint: endpoint,
Keepalive: &configgrpc.KeepaliveClientConfig{
Keepalive: configoptional.Some(configgrpc.KeepaliveClientConfig{
Time: 30 * time.Second,
Timeout: 25 * time.Second,
PermitWithoutStream: true,
},
}),
},
NumWorkers: 3,
},
Expand Down
2 changes: 1 addition & 1 deletion exporter/opencensusexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ require (
go.opentelemetry.io/collector/component/componenttest v0.129.1-0.20250708151327-74cb2f311035
go.opentelemetry.io/collector/config/configgrpc v0.129.1-0.20250708151327-74cb2f311035
go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250708151327-74cb2f311035
go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250708151327-74cb2f311035
go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250708151327-74cb2f311035
go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250708151327-74cb2f311035
go.opentelemetry.io/collector/confmap v1.35.1-0.20250708151327-74cb2f311035
Expand Down Expand Up @@ -67,7 +68,6 @@ require (
go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250708151327-74cb2f311035 // indirect
go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250708151327-74cb2f311035 // indirect
go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250708151327-74cb2f311035 // indirect
go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect
go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250708151327-74cb2f311035 // indirect
go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250708151327-74cb2f311035 // indirect
go.opentelemetry.io/collector/exporter/xexporter v0.129.1-0.20250708151327-74cb2f311035 // indirect
Expand Down
4 changes: 2 additions & 2 deletions exporter/opencensusexporter/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions exporter/otelarrowexporter/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (
"go.opentelemetry.io/collector/config/configcompression"
"go.opentelemetry.io/collector/config/configgrpc"
"go.opentelemetry.io/collector/config/configopaque"
"go.opentelemetry.io/collector/config/configoptional"
"go.opentelemetry.io/collector/config/configretry"
"go.opentelemetry.io/collector/config/configtls"
"go.opentelemetry.io/collector/confmap/confmaptest"
Expand Down Expand Up @@ -83,14 +84,14 @@ func TestUnmarshalConfig(t *testing.T) {
},
Insecure: false,
},
Keepalive: &configgrpc.KeepaliveClientConfig{
Keepalive: configoptional.Some(configgrpc.KeepaliveClientConfig{
Time: 20 * time.Second,
PermitWithoutStream: true,
Timeout: 30 * time.Second,
},
}),
WriteBufferSize: 512 * 1024,
BalancerName: "experimental",
Auth: &configauth.Config{AuthenticatorID: component.NewID(component.MustNewType("nop"))},
Auth: configoptional.Some(configauth.Config{AuthenticatorID: component.NewID(component.MustNewType("nop"))}),
},
Arrow: ArrowConfig{
NumStreams: 2,
Expand Down
5 changes: 3 additions & 2 deletions exporter/otelarrowexporter/factory_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
"go.opentelemetry.io/collector/config/configcompression"
"go.opentelemetry.io/collector/config/configgrpc"
"go.opentelemetry.io/collector/config/configopaque"
"go.opentelemetry.io/collector/config/configoptional"
"go.opentelemetry.io/collector/config/configretry"
"go.opentelemetry.io/collector/config/configtls"
"go.opentelemetry.io/collector/exporter/exporterhelper"
Expand Down Expand Up @@ -94,11 +95,11 @@ func TestCreateTraces(t *testing.T) {
config: Config{
ClientConfig: configgrpc.ClientConfig{
Endpoint: endpoint,
Keepalive: &configgrpc.KeepaliveClientConfig{
Keepalive: configoptional.Some(configgrpc.KeepaliveClientConfig{
Time: 30 * time.Second,
Timeout: 25 * time.Second,
PermitWithoutStream: true,
},
}),
},
},
},
Expand Down
2 changes: 1 addition & 1 deletion exporter/otelarrowexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ require (
go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250708151327-74cb2f311035
go.opentelemetry.io/collector/config/configgrpc v0.129.1-0.20250708151327-74cb2f311035
go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250708151327-74cb2f311035
go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250708151327-74cb2f311035
go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250708151327-74cb2f311035
go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250708151327-74cb2f311035
go.opentelemetry.io/collector/confmap v1.35.1-0.20250708151327-74cb2f311035
Expand Down Expand Up @@ -77,7 +78,6 @@ require (
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250708151327-74cb2f311035 // indirect
go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250708151327-74cb2f311035 // indirect
go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect
go.opentelemetry.io/collector/consumer/consumertest v0.129.1-0.20250708151327-74cb2f311035 // indirect
go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250708151327-74cb2f311035 // indirect
go.opentelemetry.io/collector/exporter/xexporter v0.129.1-0.20250708151327-74cb2f311035 // indirect
Expand Down
4 changes: 2 additions & 2 deletions exporter/otelarrowexporter/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions exporter/otelarrowexporter/otelarrow.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,9 @@ func (e *baseExporter) start(ctx context.Context, host component.Host) (err erro
ctx := e.enhanceContext(context.Background())

var perRPCCreds credentials.PerRPCCredentials
if e.config.Auth != nil {
if e.config.Auth.HasValue() {
// Get the auth extension, we'll use it to enrich the request context.
authClient, err := e.config.Auth.GetGRPCClientAuthenticator(ctx, host.GetExtensions())
authClient, err := e.config.Auth.Get().GetGRPCClientAuthenticator(ctx, host.GetExtensions())
if err != nil {
return err
}
Expand Down
9 changes: 5 additions & 4 deletions exporter/otelarrowexporter/otelarrow_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"go.opentelemetry.io/collector/config/configauth"
"go.opentelemetry.io/collector/config/configgrpc"
"go.opentelemetry.io/collector/config/configopaque"
"go.opentelemetry.io/collector/config/configoptional"
"go.opentelemetry.io/collector/config/configtls"
"go.opentelemetry.io/collector/exporter"
"go.opentelemetry.io/collector/exporter/exportertest"
Expand Down Expand Up @@ -315,9 +316,9 @@ func TestSendTraces(t *testing.T) {
Headers: map[string]configopaque.String{
"header": configopaque.String(expectedHeader[0]),
},
Auth: &configauth.Config{
Auth: configoptional.Some(configauth.Config{
AuthenticatorID: authID,
},
}),
}
// This test fails w/ Arrow enabled because the function
// passed to newTestAuthExtension() below requires it the
Expand Down Expand Up @@ -924,9 +925,9 @@ func testSendArrowTraces(t *testing.T, clientWaitForReady, streamServiceAvailabl
Headers: map[string]configopaque.String{
"header": configopaque.String(expectedHeader[0]),
},
Auth: &configauth.Config{
Auth: configoptional.Some(configauth.Config{
AuthenticatorID: authID,
},
}),
}
// Arrow client is enabled, but the server doesn't support it.
cfg.Arrow.NumStreams = 1
Expand Down
2 changes: 1 addition & 1 deletion exporter/stefexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ require (
go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250708151327-74cb2f311035 // indirect
go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250708151327-74cb2f311035 // indirect
go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250708151327-74cb2f311035 // indirect
go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect
go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250708151327-74cb2f311035 // indirect
go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250708151327-74cb2f311035 // indirect
go.opentelemetry.io/collector/consumer/consumertest v0.129.1-0.20250708151327-74cb2f311035 // indirect
go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250708151327-74cb2f311035 // indirect
Expand Down
4 changes: 2 additions & 2 deletions exporter/stefexporter/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion extension/solarwindsapmsettingsextension/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ require (
go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250708151327-74cb2f311035 // indirect
go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250708151327-74cb2f311035 // indirect
go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250708151327-74cb2f311035 // indirect
go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect
go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250708151327-74cb2f311035 // indirect
go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250708151327-74cb2f311035 // indirect
go.opentelemetry.io/collector/extension/extensionauth v1.35.1-0.20250708151327-74cb2f311035 // indirect
go.opentelemetry.io/collector/extension/extensionmiddleware v0.129.1-0.20250708151327-74cb2f311035 // indirect
Expand Down
Loading