Merge mistakes

Author: serbel324

ydb/core/blobstorage/dsproxy/dsproxy.h

@@ -718,7 +718,7 @@ struct TBlobStorageGroupMultiPutParameters {
         return maxRestarts;
     }
 };
-IActor* CreateBlobStorageGroupPutRequest(TBlobStorageGroupMultiPutParameters params, NWilson::TTraceId traceId);
+IActor* CreateBlobStorageGroupPutRequest(TBlobStorageGroupMultiPutParameters params);
 
 struct TBlobStorageGroupGetParameters {
     TBlobStorageGroupRequestActor<TEvBlobStorage::TEvGet>::TCommonParameters Common;

ydb/core/blobstorage/dsproxy/dsproxy_block.cpp

@@ -172,7 +172,7 @@ class TBlobStorageGroupBlockRequest : public TBlobStorageGroupRequestActor<TBlob
 IActor* CreateBlobStorageGroupBlockRequest(TBlobStorageGroupBlockParameters params, NWilson::TTraceId traceId) {
     NWilson::TSpan span(TWilson::BlobStorage, std::move(traceId), "DSProxy.Block");
     if (span) {
-        span.Attribute("event", ev->ToString());
+        span.Attribute("event", params.Common.Event->ToString());
     }
     params.Common.Span = std::move(span);
     return new TBlobStorageGroupBlockRequest(params);

ydb/core/blobstorage/dsproxy/dsproxy_get.cpp

@@ -468,7 +468,7 @@ class TBlobStorageGroupGetRequest : public TBlobStorageGroupRequestActor<TBlobSt
 IActor* CreateBlobStorageGroupGetRequest(TBlobStorageGroupGetParameters params, NWilson::TTraceId traceId) {
     NWilson::TSpan span(TWilson::BlobStorage, std::move(traceId), "DSProxy.Get");
     if (span) {
-        span.Attribute("event", ev->ToString());
+        span.Attribute("event", params.Common.Event->ToString());
     }
     params.Common.Span = std::move(span);
     return new TBlobStorageGroupGetRequest(params);

ydb/core/blobstorage/dsproxy/dsproxy_indexrestoreget.cpp

@@ -391,7 +391,7 @@ class TBlobStorageGroupIndexRestoreGetRequest
 IActor* CreateBlobStorageGroupIndexRestoreGetRequest(TBlobStorageGroupRestoreGetParameters params, NWilson::TTraceId traceId) {
     NWilson::TSpan span(TWilson::BlobStorage, std::move(traceId), "DSProxy.IndexRestoreGet");
     if (span) {
-        span.Attribute("event", ev->ToString());
+        span.Attribute("event", params.Common.Event->ToString());
     }
     params.Common.Span = std::move(span);
     return new TBlobStorageGroupIndexRestoreGetRequest(params);

ydb/core/blobstorage/dsproxy/dsproxy_patch.cpp

@@ -1041,7 +1041,7 @@ class TBlobStorageGroupPatchRequest : public TBlobStorageGroupRequestActor<TBlob
 IActor* CreateBlobStorageGroupPatchRequest(TBlobStorageGroupPatchParameters params, NWilson::TTraceId traceId) {
     NWilson::TSpan span(TWilson::BlobStorage, std::move(traceId), "DSProxy.Patch");
     if (span) {
-        span.Attribute("event", ev->ToString());
+        span.Attribute("event", params.Common.Event->ToString());
     }
     params.Common.Span = std::move(span);
     return new TBlobStorageGroupPatchRequest(params);

ydb/core/blobstorage/dsproxy/dsproxy_put.cpp

@@ -752,7 +752,7 @@ class TBlobStorageGroupPutRequest : public TBlobStorageGroupRequestActor<TBlobSt
 IActor* CreateBlobStorageGroupPutRequest(TBlobStorageGroupPutParameters params, NWilson::TTraceId traceId) {
     NWilson::TSpan span(TWilson::BlobStorage, std::move(traceId), "DSProxy.Put");
     if (span) {
-        span.Attribute("event", ev->ToString());
+        span.Attribute("event", params.Common.Event->ToString());
     }
     params.Common.Span = std::move(span);
     return new TBlobStorageGroupPutRequest(params);

ydb/core/blobstorage/dsproxy/dsproxy_request.cpp

@@ -126,12 +126,11 @@ namespace NKikimr {
                             .Now = TActivationContext::Now(),
                             .StoragePoolCounters = StoragePoolCounters,
                             .RestartCounter = ev->Get()->RestartCounter,
-                            .TraceId = std::move(ev->TraceId),
                             .Event = ev->Get(),
                             .ExecutionRelay = ev->Get()->ExecutionRelay,
                             .LatencyQueueKind = kind,
                         },
-                    }),
+                    }, std::move(ev->TraceId)),
                     ev->Get()->Deadline
                 );
             }
@@ -217,7 +216,6 @@ namespace NKikimr {
                         .Now = TActivationContext::Now(),
                         .StoragePoolCounters = StoragePoolCounters,
                         .RestartCounter = ev->Get()->RestartCounter,
-                        .TraceId = std::move(ev->TraceId),
                         .Event = ev->Get(),
                         .ExecutionRelay = ev->Get()->ExecutionRelay,
                         .LatencyQueueKind = kind
@@ -364,11 +362,10 @@ namespace NKikimr {
                         .Now = TActivationContext::Now(),
                         .StoragePoolCounters = StoragePoolCounters,
                         .RestartCounter = ev->Get()->RestartCounter,
-                        .TraceId = std::move(ev->TraceId),
                         .Event = ev->Get(),
                         .ExecutionRelay = ev->Get()->ExecutionRelay
                     }
-                }),
+                }, std::move(ev->TraceId)),
                 ev->Get()->Deadline
             );
         } else {