From 3a9895a5825f3a98212999b1b04b861cae42cb89 Mon Sep 17 00:00:00 2001 From: david kydd Date: Mon, 4 Nov 2024 17:30:11 +1300 Subject: [PATCH] support for tracing client including tlsconfig with support for nextprotos Signed-off-by: David Kydd --- tracing/tracing.go | 2 +- tracing/tracing_test.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tracing/tracing.go b/tracing/tracing.go index 4fdedf505..ba5669135 100644 --- a/tracing/tracing.go +++ b/tracing/tracing.go @@ -73,7 +73,7 @@ func (m *Manager) ApplyConfig(cfg *config.Config) error { // set, we have to restart the manager to make sure that new TLS // certificates are picked up. var blankTLSConfig config_util.TLSConfig - if reflect.DeepEqual(m.config, cfg.TracingConfig) && m.config.TLSConfig == blankTLSConfig { + if reflect.DeepEqual(m.config, cfg.TracingConfig) && reflect.DeepEqual(m.config.TLSConfig, blankTLSConfig) { return nil } diff --git a/tracing/tracing_test.go b/tracing/tracing_test.go index e735e1a18..9865388ba 100644 --- a/tracing/tracing_test.go +++ b/tracing/tracing_test.go @@ -82,7 +82,8 @@ func TestReinstallingTracerProviderWithTLS(t *testing.T) { Endpoint: "localhost:1234", ClientType: config.TracingClientGRPC, TLSConfig: config_util.TLSConfig{ - CAFile: "testdata/ca.cer", + CAFile: "testdata/ca.cer", + NextProtos: []string{"h2"}, }, }, }