Skip to content
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

Jump to bottom

[chore] Switch to use configgrpc ServerConfig's ToServerContext #31815

Merged
merged 1 commit into from Mar 18, 2024
Merged

[chore] Switch to use configgrpc ServerConfig's ToServerContext #31815

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion extension/jaegerremotesampling/internal/grpc.go
View file
Open in desktop
Expand Up @@ -57,7 +57,7 @@ type SamplingGRPCServer struct {
}

func (s *SamplingGRPCServer) Start(ctx context.Context, host component.Host) error {
server, err := s.settings.ToServer(host, s.telemetry)
server, err := s.settings.ToServerContext(ctx, host, s.telemetry)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion receiver/jaegerreceiver/trace_receiver.go
View file
Open in desktop
Expand Up @@ -398,7 +398,7 @@ func (jr *jReceiver) startCollector(ctx context.Context, host component.Host) er

if jr.config.GRPCServerConfig.NetAddr.Endpoint != "" {
var err error
jr.grpc, err = jr.config.GRPCServerConfig.ToServer(host, jr.settings.TelemetrySettings)
jr.grpc, err = jr.config.GRPCServerConfig.ToServerContext(ctx, host, jr.settings.TelemetrySettings)
if err != nil {
return fmt.Errorf("failed to build the options for the Jaeger gRPC Collector: %w", err)
}
Expand Down
2 changes: 1 addition & 1 deletion receiver/lokireceiver/loki.go
View file
Open in desktop
Expand Up @@ -106,7 +106,7 @@ func (r *lokiReceiver) startProtocolsServers(ctx context.Context, host component
}

if r.conf.GRPC != nil {
r.serverGRPC, err = r.conf.GRPC.ToServer(host, r.settings.TelemetrySettings)
r.serverGRPC, err = r.conf.GRPC.ToServerContext(ctx, host, r.settings.TelemetrySettings)
if err != nil {
return fmt.Errorf("failed create grpc server error: %w", err)
}
Expand Down
2 changes: 1 addition & 1 deletion receiver/opencensusreceiver/opencensus.go
View file
Open in desktop
Expand Up @@ -163,7 +163,7 @@ func (ocr *ocReceiver) grpcServer(host component.Host) (*grpc.Server, error) {

if ocr.serverGRPC == nil {
var err error
ocr.serverGRPC, err = ocr.grpcServerSettings.ToServer(host, ocr.settings.TelemetrySettings)
ocr.serverGRPC, err = ocr.grpcServerSettings.ToServerContext(context.Background(), host, ocr.settings.TelemetrySettings)
if err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion receiver/otelarrowreceiver/otelarrow.go
View file
Open in desktop
Expand Up @@ -101,7 +101,7 @@ func (r *otelArrowReceiver) startProtocolServers(host component.Host) error {
if r.netReporter != nil {
serverOpts = append(serverOpts, grpc.StatsHandler(r.netReporter.Handler()))
}
r.serverGRPC, err = r.cfg.GRPC.ToServer(host, r.settings.TelemetrySettings, serverOpts...)
r.serverGRPC, err = r.cfg.GRPC.ToServerContext(context.Background(), host, r.settings.TelemetrySettings, serverOpts...)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion receiver/skywalkingreceiver/skywalking_receiver.go
View file
Open in desktop
Expand Up @@ -160,7 +160,7 @@ func (sr *swReceiver) startCollector(host component.Host) error {

if sr.collectorGRPCEnabled() {
var err error
sr.grpc, err = sr.config.CollectorGRPCServerSettings.ToServer(host, sr.settings.TelemetrySettings)
sr.grpc, err = sr.config.CollectorGRPCServerSettings.ToServerContext(context.Background(), host, sr.settings.TelemetrySettings)
if err != nil {
return fmt.Errorf("failed to build the options for the Skywalking gRPC Collector: %w", err)
}
Expand Down