From 7ee88def4ac7a2686669333ab3c440b421550a74 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Mon, 15 Feb 2021 13:58:59 +0800 Subject: [PATCH] make it possible to use a custom tracer and the default tracer in tests --- integrationtests/self/key_update_test.go | 2 +- integrationtests/self/self_suite_test.go | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/integrationtests/self/key_update_test.go b/integrationtests/self/key_update_test.go index b4521857d..cb682d9f3 100644 --- a/integrationtests/self/key_update_test.go +++ b/integrationtests/self/key_update_test.go @@ -85,7 +85,7 @@ var _ = Describe("Key Update tests", func() { sess, err := quic.DialAddr( fmt.Sprintf("localhost:%d", server.Addr().(*net.UDPAddr).Port), getTLSClientConfig(), - &quic.Config{Tracer: newTracer(func() logging.ConnectionTracer { return &keyUpdateConnTracer{} })}, + getQuicConfig(&quic.Config{Tracer: newTracer(func() logging.ConnectionTracer { return &keyUpdateConnTracer{} })}), ) Expect(err).ToNot(HaveOccurred()) str, err := sess.AcceptUniStream(context.Background()) diff --git a/integrationtests/self/self_suite_test.go b/integrationtests/self/self_suite_test.go index 7aa4a1272..81956cbfa 100644 --- a/integrationtests/self/self_suite_test.go +++ b/integrationtests/self/self_suite_test.go @@ -272,7 +272,11 @@ func getQuicConfig(conf *quic.Config) *quic.Config { } else { conf = conf.Clone() } - conf.Tracer = quicConfigTracer + if conf.Tracer == nil { + conf.Tracer = quicConfigTracer + } else if quicConfigTracer != nil { + conf.Tracer = logging.NewMultiplexedTracer(quicConfigTracer, conf.Tracer) + } return conf }