Skip to content

Commit 2fa6df8

Browse files
[configgrpc] Add ToServerContext (#9624)
Adds a new function, `ToServerContext` which does what `ToServer` does, but takes a `context.Context`. After the next release we'll deprecate `ToServerContext` and rename it to `ToServer`. Related to #9490 --------- Co-authored-by: Dmitrii Anoshin <[email protected]>
1 parent 6affda6 commit 2fa6df8

File tree

4 files changed

+56
-5
lines changed

4 files changed

+56
-5
lines changed

.chloggen/configgrpc-add-context.yaml

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: deprecation
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
7+
component: configgrpc
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Deprecates `ToServer`. Use `ToServerContext` instead.
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [9624]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# Optional: The change log or logs in which this entry should be included.
21+
# e.g. '[user]' or '[user, api]'
22+
# Include 'user' if the change is relevant to end users.
23+
# Include 'api' if there is a change to a library API.
24+
# Default: '[user]'
25+
change_logs: [api]

config/configgrpc/configgrpc.go

+7
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,14 @@ func validateBalancerName(balancerName string) bool {
267267
return balancer.Get(balancerName) != nil
268268
}
269269

270+
// ToServer returns a grpc.Server for the configuration
271+
// Deprecated: [0.96.0] Use ToServerContext instead.
270272
func (gss *ServerConfig) ToServer(host component.Host, settings component.TelemetrySettings, extraOpts ...grpc.ServerOption) (*grpc.Server, error) {
273+
return gss.ToServerContext(context.Background(), host, settings, extraOpts...)
274+
}
275+
276+
// ToServerContext returns a grpc.Server for the configuration
277+
func (gss *ServerConfig) ToServerContext(_ context.Context, host component.Host, settings component.TelemetrySettings, extraOpts ...grpc.ServerOption) (*grpc.Server, error) {
271278
opts, err := gss.toServerOption(host, settings)
272279
if err != nil {
273280
return nil, err

config/configgrpc/configgrpc_test.go

+23-4
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,25 @@ func TestAllGrpcServerSettingsExceptAuth(t *testing.T) {
224224
}
225225

226226
func TestGrpcServerAuthSettings(t *testing.T) {
227+
gss := &ServerConfig{
228+
NetAddr: confignet.AddrConfig{
229+
Endpoint: "0.0.0.0:1234",
230+
},
231+
}
232+
gss.Auth = &configauth.Authentication{
233+
AuthenticatorID: mockID,
234+
}
235+
host := &mockHost{
236+
ext: map[component.ID]component.Component{
237+
mockID: auth.NewServer(),
238+
},
239+
}
240+
srv, err := gss.ToServerContext(context.Background(), host, componenttest.NewNopTelemetrySettings())
241+
assert.NoError(t, err)
242+
assert.NotNil(t, srv)
243+
}
244+
245+
func TestGrpcServerAuthSettings_Deprecated(t *testing.T) {
227246
gss := &ServerConfig{
228247
NetAddr: confignet.AddrConfig{
229248
Endpoint: "0.0.0.0:1234",
@@ -481,7 +500,7 @@ func TestGRPCServerSettingsError(t *testing.T) {
481500
}
482501
for _, test := range tests {
483502
t.Run(test.err, func(t *testing.T) {
484-
_, err := test.settings.ToServer(componenttest.NewNopHost(), componenttest.NewNopTelemetrySettings())
503+
_, err := test.settings.ToServerContext(context.Background(), componenttest.NewNopHost(), componenttest.NewNopTelemetrySettings())
485504
assert.Regexp(t, test.err, err)
486505
})
487506
}
@@ -618,7 +637,7 @@ func TestHttpReception(t *testing.T) {
618637
}
619638
ln, err := gss.NetAddr.Listen(context.Background())
620639
assert.NoError(t, err)
621-
s, err := gss.ToServer(componenttest.NewNopHost(), componenttest.NewNopTelemetrySettings())
640+
s, err := gss.ToServerContext(context.Background(), componenttest.NewNopHost(), componenttest.NewNopTelemetrySettings())
622641
assert.NoError(t, err)
623642
ptraceotlp.RegisterGRPCServer(s, &grpcTraceServer{})
624643

@@ -665,7 +684,7 @@ func TestReceiveOnUnixDomainSocket(t *testing.T) {
665684
}
666685
ln, err := gss.NetAddr.Listen(context.Background())
667686
assert.NoError(t, err)
668-
srv, err := gss.ToServer(componenttest.NewNopHost(), componenttest.NewNopTelemetrySettings())
687+
srv, err := gss.ToServerContext(context.Background(), componenttest.NewNopHost(), componenttest.NewNopTelemetrySettings())
669688
assert.NoError(t, err)
670689
ptraceotlp.RegisterGRPCServer(srv, &grpcTraceServer{})
671690

@@ -859,7 +878,7 @@ func TestClientInfoInterceptors(t *testing.T) {
859878
Transport: "tcp",
860879
},
861880
}
862-
srv, err := gss.ToServer(componenttest.NewNopHost(), componenttest.NewNopTelemetrySettings())
881+
srv, err := gss.ToServerContext(context.Background(), componenttest.NewNopHost(), componenttest.NewNopTelemetrySettings())
863882
require.NoError(t, err)
864883
ptraceotlp.RegisterGRPCServer(srv, mock)
865884

receiver/otlpreceiver/otlp.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func (r *otlpReceiver) startGRPCServer(host component.Host) error {
8383
}
8484

8585
var err error
86-
if r.serverGRPC, err = r.cfg.GRPC.ToServer(host, r.settings.TelemetrySettings); err != nil {
86+
if r.serverGRPC, err = r.cfg.GRPC.ToServerContext(context.Background(), host, r.settings.TelemetrySettings); err != nil {
8787
return err
8888
}
8989

0 commit comments

Comments
 (0)