Merge fixes

Author: SammyVimes

ydb/core/tx/datashard/datashard.cpp

@@ -2822,6 +2822,7 @@ void TDataShard::ProposeTransaction(TEvDataShard::TEvProposeTransaction::TPtr &&
         Execute(tx, ctx, tx->GetTraceId());
     }
 }
+
 void TDataShard::ProposeTransaction(NEvents::TDataEvents::TEvWrite::TPtr&& ev, const TActorContext& ctx) {
     auto* msg = ev->Get();
     const auto& record = msg->Record;

ydb/core/tx/datashard/datashard__progress_tx.cpp

@@ -60,7 +60,7 @@ bool TDataShard::TTxProgressTransaction::Execute(TTransactionContext &txc, const
                        << ActiveOp->GetCurrentUnit() << ") at " << Self->TabletID());
             ActiveOp->IncrementInProgress();
 
-            if (ActiveOp->TransactionSpan) {
+            if (ActiveOp->OperationSpan) {
                 if (!txc.Seat.TxSpan) {
                     // If Progress Tx for this operation is being executed the first time,
                     // it won't have a span, because we choose what operation to run in the transaction itself.

ydb/core/tx/datashard/datashard__read_iterator.cpp

@@ -2107,7 +2107,7 @@ class TDataShard::TTxReadViaPipeline : public NTabletFlatExecutor::TTransactionB
 
                 const ui64 tieBreaker = Self->NextTieBreakerIndex++;
                 Op = new TReadOperation(Self, ctx.Now(), tieBreaker, Ev);
-                Op->TransactionSpan = NWilson::TSpan(TWilsonTablet::Tablet, readSpan.GetTraceId(), "ReadIterator.ReadOperation", NWilson::EFlags::AUTO_END);
+                Op->OperationSpan = NWilson::TSpan(TWilsonTablet::Tablet, readSpan.GetTraceId(), "ReadIterator.ReadOperation", NWilson::EFlags::AUTO_END);
 
                 Op->BuildExecutionPlan(false);
                 Self->Pipeline.GetExecutionUnit(Op->GetCurrentUnit()).AddOperation(Op);

ydb/core/tx/datashard/datashard_pipeline.cpp

@@ -1323,7 +1323,7 @@ TActiveTransaction::TPtr TPipeline::BuildOperation(TEvDataShard::TEvProposeTrans
     tx->SetTxBody(rec.GetTxBody());
     tx->SetCookie(ev->Cookie);
     tx->Orbit = std::move(ev->Get()->Orbit);
-    tx->TransactionSpan = NWilson::TSpan(TWilsonTablet::Tablet, std::move(traceId), "ActiveTransaction.Operation", NWilson::EFlags::AUTO_END);
+    tx->OperationSpan = NWilson::TSpan(TWilsonTablet::Tablet, std::move(traceId), "ActiveTransaction.Operation", NWilson::EFlags::AUTO_END);
 
     auto malformed = [&](const TStringBuf txType, const TString& txBody) {
         const TString error = TStringBuilder() << "Malformed " << txType << " tx"

ydb/core/tx/datashard/datashard_pipeline.h

@@ -265,11 +265,11 @@ class TPipeline : TNonCopyable {
     TActiveTransaction::TPtr BuildOperation(TEvDataShard::TEvProposeTransaction::TPtr &ev,
                                     TInstant receivedAt, ui64 tieBreakerIndex,
                                     NTabletFlatExecutor::TTransactionContext &txc,
-                                    const TActorContext &ctx);
+                                    const TActorContext &ctx, NWilson::TTraceId traceId);
     TOperation::TPtr BuildOperation(NEvents::TDataEvents::TEvWrite::TPtr &ev,
                                     TInstant receivedAt, ui64 tieBreakerIndex,
                                     NTabletFlatExecutor::TTransactionContext &txc,
-                                    const TActorContext &ctx, NWilson::TTraceId traceId);
+                                    const TActorContext &ctx);
     void BuildDataTx(TActiveTransaction *tx,
                      TTransactionContext &txc,
                      const TActorContext &ctx);

ydb/core/tx/datashard/operation.h

@@ -807,7 +807,7 @@ class TOperation
     void SetFinishProposeTs() noexcept;
 
     NWilson::TTraceId GetTraceId() const noexcept {
-        return TransactionSpan.GetTraceId();
+        return OperationSpan.GetTraceId();
     }
 
 protected:
@@ -889,7 +889,7 @@ class TOperation
     // Orbit used for tracking operation progress
     NLWTrace::TOrbit Orbit;
 
-    NWilson::TSpan TransactionSpan;
+    NWilson::TSpan OperationSpan;
 };
 
 inline IOutputStream &operator <<(IOutputStream &out,