diff --git a/quic/fizz/client/test/QuicClientTransportTest.cpp b/quic/fizz/client/test/QuicClientTransportTest.cpp index 13d86f2c0..29bf8cb85 100644 --- a/quic/fizz/client/test/QuicClientTransportTest.cpp +++ b/quic/fizz/client/test/QuicClientTransportTest.cpp @@ -257,12 +257,12 @@ class QuicClientTransportIntegrationTest : public TestWithParam { })); transportSettings.zeroRttSourceTokenMatchingPolicy = ZeroRttSourceTokenMatchingPolicy::LIMIT_IF_NO_EXACT_MATCH; + server->setTransportStatsCallbackFactory(std::move(statsFactory)); server->setTransportSettings(transportSettings); server->setQuicServerTransportFactory( std::make_unique()); server->setQuicUDPSocketFactory( std::make_unique()); - server->setTransportStatsCallbackFactory(std::move(statsFactory)); server->setFizzContext(serverCtx); server->setSupportedVersion({getVersion(), MVFST1}); folly::SocketAddress addr("::1", 0); diff --git a/quic/server/QuicServerWorker.cpp b/quic/server/QuicServerWorker.cpp index 0d7a114f6..3768527b9 100644 --- a/quic/server/QuicServerWorker.cpp +++ b/quic/server/QuicServerWorker.cpp @@ -639,6 +639,9 @@ void QuicServerWorker::dispatchPacketData( trans->setCcpDatapath(getCcpReader()->getDatapath()); #endif trans->setCongestionControllerFactory(ccFactory_); + if (statsCallback_) { + trans->setTransportStatsCallback(statsCallback_.get()); + } if (transportSettingsOverrideFn_) { folly::Optional overridenTransportSettings = transportSettingsOverrideFn_( @@ -674,9 +677,6 @@ void QuicServerWorker::dispatchPacketData( static_cast(processId_), workerId_); trans->setServerConnectionIdParams(std::move(serverConnIdParams)); - if (statsCallback_) { - trans->setTransportStatsCallback(statsCallback_.get()); - } trans->accept(); auto result = sourceAddressMap_.emplace(std::make_pair( std::make_pair(client, routingData.destinationConnId), trans)); diff --git a/quic/server/test/QuicServerTest.cpp b/quic/server/test/QuicServerTest.cpp index 5da1a012f..aed334ef6 100644 --- a/quic/server/test/QuicServerTest.cpp +++ b/quic/server/test/QuicServerTest.cpp @@ -153,12 +153,12 @@ class QuicServerWorkerTest : public Test { settings.statelessResetTokenSecret = getRandSecret(); retryTokenSecret_ = getRandSecret(); settings.retryTokenSecret = retryTokenSecret_; + worker_->setTransportStatsCallback(std::move(transportInfoCb)); worker_->setTransportSettings(settings); worker_->setSocket(std::move(sock)); worker_->setWorkerId(42); worker_->setProcessId(ProcessId::ONE); worker_->setHostId(hostId_); - worker_->setTransportStatsCallback(std::move(transportInfoCb)); worker_->setConnectionIdAlgo(std::make_unique()); worker_->setCongestionControllerFactory( std::make_shared());