Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion cmd/configschema/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ require (
github.com/grobie/gomemcache v0.0.0-20230213081705-239240bbc445 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
github.com/haimrubinstein/go-syslog/v3 v3.0.0 // indirect
github.com/haimrubinstein/go-syslog/v3 v3.0.3 // indirect
github.com/hashicorp/consul/api v1.27.0 // indirect
github.com/hashicorp/cronexpr v1.1.2 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
Expand Down
5 changes: 2 additions & 3 deletions cmd/configschema/go.sum

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

2 changes: 1 addition & 1 deletion extension/jaegerremotesampling/internal/grpc.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ func (s *SamplingGRPCServer) Start(ctx context.Context, host component.Host) err
healthServer.SetServingStatus("jaeger.api_v2.SamplingManager", grpc_health_v1.HealthCheckResponse_SERVING)
grpc_health_v1.RegisterHealthServer(server, healthServer)

listener, err := s.settings.ToListenerContext(ctx)
listener, err := s.settings.NetAddr.Listen(ctx)
if err != nil {
return fmt.Errorf("failed to listen on gRPC port: %w", err)
}
Expand Down
2 changes: 1 addition & 1 deletion receiver/jaegerreceiver/trace_receiver.go
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ func (jr *jReceiver) startCollector(ctx context.Context, host component.Host) er
return fmt.Errorf("failed to build the options for the Jaeger gRPC Collector: %w", err)
}

ln, err := jr.config.GRPCServerConfig.ToListenerContext(ctx)
ln, err := jr.config.GRPCServerConfig.NetAddr.Listen(ctx)
if err != nil {
return fmt.Errorf("failed to bind to gRPC address %q: %w", jr.config.GRPCServerConfig.NetAddr, err)
}
Expand Down
2 changes: 1 addition & 1 deletion receiver/lokireceiver/loki.go
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ func (r *lokiReceiver) startHTTPServer() error {

func (r *lokiReceiver) startGRPCServer(ctx context.Context) error {
r.settings.Logger.Info("Starting GRPC server", zap.String("endpoint", r.conf.GRPC.NetAddr.Endpoint))
listener, err := r.conf.GRPC.ToListenerContext(ctx)
listener, err := r.conf.GRPC.NetAddr.Listen(ctx)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion receiver/otelarrowreceiver/otelarrow.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ func newOTelArrowReceiver(cfg *Config, set receiver.CreateSettings) (*otelArrowR
func (r *otelArrowReceiver) startGRPCServer(cfg configgrpc.ServerConfig, _ component.Host) error {
r.settings.Logger.Info("Starting GRPC server", zap.String("endpoint", cfg.NetAddr.Endpoint))

gln, err := cfg.ToListenerContext(context.Background())
gln, err := cfg.NetAddr.Listen(context.Background())
if err != nil {
return err
}
Expand Down