Comments resolved

Author: domwst

ydb/core/driver_lib/run/kikimr_services_initializers.cpp

@@ -832,7 +832,13 @@ void TBasicServicesInitializer::InitializeServices(NActors::TActorSystemSetup* s
         if (tracing.HasAuthConfig() && Factories && Factories->WilsonGrpcSignerFactory) {
             grpcSigner = Factories->WilsonGrpcSignerFactory(tracing.GetAuthConfig());
         }
-        auto wilsonUploader = NWilson::CreateWilsonUploader(tracing.GetHost(), tracing.GetPort(), tracing.GetRootCA(), tracing.GetServiceName(), std::move(grpcSigner));
+        auto wilsonUploader = NWilson::WilsonUploaderParams {
+            .Host = tracing.GetHost(),
+            .Port = static_cast<ui16>(tracing.GetPort()),
+            .RootCA = tracing.GetRootCA(),
+            .ServiceName = tracing.GetServiceName(),
+            .GrpcSigner = std::move(grpcSigner),
+        }.CreateUploader();
         setup->LocalServices.emplace_back(
             NWilson::MakeWilsonUploaderId(),
             TActorSetupCmd(wilsonUploader, TMailboxType::ReadAsFilled, appData->BatchPoolId));

ydb/library/actors/wilson/wilson_uploader.cpp

@@ -53,12 +53,12 @@ namespace NWilson {
             bool WakeupScheduled = false;
 
         public:
-            TWilsonUploader(TString host, ui16 port, TString rootCA, TString serviceName, std::unique_ptr<IGrpcSigner> grpcSigner)
-                : Host(std::move(host))
-                , Port(std::move(port))
-                , RootCA(std::move(rootCA))
-                , ServiceName(std::move(serviceName))
-                , GrpcSigner(std::move(grpcSigner))
+            TWilsonUploader(WilsonUploaderParams params)
+                : Host(std::move(params.Host))
+                , Port(std::move(params.Port))
+                , RootCA(std::move(params.RootCA))
+                , ServiceName(std::move(params.ServiceName))
+                , GrpcSigner(std::move(params.GrpcSigner))
             {}
 
             ~TWilsonUploader() {
@@ -196,8 +196,12 @@ namespace NWilson {
 
     } // anonymous
 
-    IActor *CreateWilsonUploader(TString host, ui16 port, TString rootCA, TString serviceName, std::unique_ptr<IGrpcSigner> grpcSigner) {
-        return new TWilsonUploader(std::move(host), port, std::move(rootCA), std::move(serviceName), std::move(grpcSigner));
+    IActor* CreateWilsonUploader(WilsonUploaderParams params) {
+        return new TWilsonUploader(std::move(params));
+    }
+
+    IActor* WilsonUploaderParams::CreateUploader() && {
+        return CreateWilsonUploader(std::move(*this));
     }
 
 } // NWilson

ydb/library/actors/wilson/wilson_uploader.h

@@ -25,6 +25,16 @@ namespace NWilson {
         return NActors::TActorId(0, TStringBuf("WilsonUpload", 12));
     }
 
-    NActors::IActor *CreateWilsonUploader(TString host, ui16 port, TString rootCA, TString serviceName, std::unique_ptr<IGrpcSigner> grpcSigner);
+    struct WilsonUploaderParams {
+        TString Host;
+        ui16 Port;
+        TString RootCA;
+        TString ServiceName;
+        std::unique_ptr<IGrpcSigner> GrpcSigner;
+
+        NActors::IActor* CreateUploader() &&;
+    };
+
+    NActors::IActor* CreateWilsonUploader(WilsonUploaderParams params);
 
 } // NWilson