From 73fdf7e37b62314600c6073cbca5a4ca7404009b Mon Sep 17 00:00:00 2001 From: David Ashpole Date: Tue, 11 Oct 2022 16:22:33 +0000 Subject: [PATCH] Fix bug in which APIServerTracing did not work with some egress selectors Kubernetes-commit: 00bcd6cf01b719d0fddc8331ffecd3de35e8896f --- pkg/server/options/tracing.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkg/server/options/tracing.go b/pkg/server/options/tracing.go index 45976b3ea..1a135e83d 100644 --- a/pkg/server/options/tracing.go +++ b/pkg/server/options/tracing.go @@ -101,11 +101,12 @@ func (o *TracingOptions) ApplyTo(es *egressselector.EgressSelector, c *server.Co if err != nil { return err } - - otelDialer := func(ctx context.Context, addr string) (net.Conn, error) { - return egressDialer(ctx, "tcp", addr) + if egressDialer != nil { + otelDialer := func(ctx context.Context, addr string) (net.Conn, error) { + return egressDialer(ctx, "tcp", addr) + } + opts = append(opts, otlptracegrpc.WithDialOption(grpc.WithContextDialer(otelDialer))) } - opts = append(opts, otlptracegrpc.WithDialOption(grpc.WithContextDialer(otelDialer))) } resourceOpts := []resource.Option{