Review fixes

Author: SammyVimes

ydb/core/tx/datashard/datashard.cpp

@@ -2837,7 +2837,8 @@ void TDataShard::ProposeTransaction(NEvents::TDataEvents::TEvWrite::TPtr&& ev, c
         UpdateProposeQueueSize();
     } else {
         // Prepare planned transactions as soon as possible
-        Execute(new TTxWrite(this, std::move(ev), TAppData::TimeProvider->Now(), NextTieBreakerIndex++, /* delayed */ false), ctx);
+        TTxWrite *tx = new TTxWrite(this, std::move(ev), TAppData::TimeProvider->Now(), NextTieBreakerIndex++, /* delayed */ false);
+        Execute(tx, ctx, tx->GetTraceId());
     }
 }
 
@@ -2908,7 +2909,8 @@ void TDataShard::Handle(TEvPrivate::TEvDelayedProposeTransaction::TPtr &ev, cons
                 }
                 case NEvents::TDataEvents::TEvWrite::EventType: {
                     auto event = IEventHandle::Downcast<NEvents::TDataEvents::TEvWrite>(std::move(item.Event));
-                    Execute(new TTxWrite(this, std::move(event), item.ReceivedAt, item.TieBreakerIndex, /* delayed */ true), ctx);
+                    TTxWrite *tx = new TTxWrite(this, std::move(event), item.ReceivedAt, item.TieBreakerIndex, /* delayed */ true);
+                    Execute(tx, ctx, tx->GetTraceId());
                     return;
                 }
                 default:

ydb/core/tx/datashard/datashard__propose_tx_base.cpp

@@ -77,7 +77,7 @@ bool TDataShard::TTxProposeTransactionBase::Execute(NTabletFlatExecutor::TTransa
                 return true;
             }
 
-            TActiveTransaction::TPtr op = Self->Pipeline.BuildOperation(Ev, ReceivedAt, TieBreakerIndex, txc, ctx, ProposeTransactionSpan.GetTraceId());
+            TOperation::TPtr op = Self->Pipeline.BuildOperation(Ev, ReceivedAt, TieBreakerIndex, txc, ctx, ProposeTransactionSpan.GetTraceId());
 
             // Unsuccessful operation parse.
             if (op->IsAborted()) {

ydb/core/tx/datashard/datashard__write.cpp

@@ -18,6 +18,7 @@ TDataShard::TTxWrite::TTxWrite(TDataShard* self, NEvents::TDataEvents::TEvWrite:
     , Acked(!delayed)
     , ProposeTransactionSpan(TWilsonKqp::ProposeTransaction, std::move(Ev->TraceId), "ProposeTransaction", NWilson::EFlags::AUTO_END)
 {
+    ProposeTransactionSpan.Attribute("Shard", std::to_string(self->TabletID()));
 }
 
 bool TDataShard::TTxWrite::Execute(TTransactionContext& txc, const TActorContext& ctx) {
@@ -70,7 +71,7 @@ bool TDataShard::TTxWrite::Execute(TTransactionContext& txc, const TActorContext
                 return true;
             }
 
-            TOperation::TPtr op = Self->Pipeline.BuildOperation(Ev, ReceivedAt, TieBreakerIndex, txc, ctx);
+            TOperation::TPtr op = Self->Pipeline.BuildOperation(Ev, ReceivedAt, TieBreakerIndex, txc, ctx, ProposeTransactionSpan.GetTraceId());
 
             // Unsuccessful operation parse.
             if (op->IsAborted()) {

ydb/core/tx/datashard/datashard_pipeline.cpp

@@ -1303,7 +1303,7 @@ void TPipeline::ForgetTx(ui64 txId) {
     }
 }
 
-TActiveTransaction::TPtr TPipeline::BuildOperation(TEvDataShard::TEvProposeTransaction::TPtr &ev,
+TOperation::TPtr TPipeline::BuildOperation(TEvDataShard::TEvProposeTransaction::TPtr &ev,
                                            TInstant receivedAt, ui64 tieBreakerIndex,
                                            NTabletFlatExecutor::TTransactionContext &txc,
                                            const TActorContext &ctx, NWilson::TTraceId traceId)
@@ -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->OperationSpan = NWilson::TSpan(TWilsonTablet::Tablet, std::move(traceId), "ActiveTransaction.Operation", NWilson::EFlags::AUTO_END);
+    tx->OperationSpan = NWilson::TSpan(TWilsonTablet::Tablet, std::move(traceId), "ActiveTransaction", NWilson::EFlags::AUTO_END);
 
     auto malformed = [&](const TStringBuf txType, const TString& txBody) {
         const TString error = TStringBuilder() << "Malformed " << txType << " tx"
@@ -1557,11 +1557,15 @@ TActiveTransaction::TPtr TPipeline::BuildOperation(TEvDataShard::TEvProposeTrans
     return tx;
 }
 
-TOperation::TPtr TPipeline::BuildOperation(NEvents::TDataEvents::TEvWrite::TPtr& ev, TInstant receivedAt, ui64 tieBreakerIndex, NTabletFlatExecutor::TTransactionContext& txc, const TActorContext& ctx)
+TOperation::TPtr TPipeline::BuildOperation(NEvents::TDataEvents::TEvWrite::TPtr& ev,
+                                           TInstant receivedAt, ui64 tieBreakerIndex,
+                                           NTabletFlatExecutor::TTransactionContext& txc,
+                                           const TActorContext& ctx, NWilson::TTraceId traceId)
 {
     const auto& rec = ev->Get()->Record;
     TBasicOpInfo info(rec.GetTxId(), EOperationKind::DataTx, EvWrite::Convertor::GetProposeFlags(rec.GetTxMode()), 0, receivedAt, tieBreakerIndex);
     auto op = MakeIntrusive<TWriteOperation>(info, ev, Self, txc, ctx);
+    op->OperationSpan = NWilson::TSpan(TWilsonTablet::Tablet, std::move(traceId), "WriteOperation", NWilson::EFlags::AUTO_END);
 
     auto badRequest = [&](const TString& error) {
         op->SetError(NKikimrDataEvents::TEvWriteResult::STATUS_BAD_REQUEST, error);

ydb/core/tx/datashard/datashard_pipeline.h

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

ydb/core/tx/datashard/datashard_txs.h

@@ -102,7 +102,7 @@ class TDataShard::TTxProposeTransactionBase : public NTabletFlatExecutor::TTrans
                            const TActorContext &ctx);
 
 protected:
-    TActiveTransaction::TPtr Op;
+    TOperation::TPtr Op;
     TEvDataShard::TEvProposeTransaction::TPtr Ev;
     const TInstant ReceivedAt;
     const ui64 TieBreakerIndex;
@@ -121,6 +121,10 @@ class TDataShard::TTxWrite: public NTabletFlatExecutor::TTransactionBase<TDataSh
     TTxWrite(TDataShard* ds, NEvents::TDataEvents::TEvWrite::TPtr ev, TInstant receivedAt, ui64 tieBreakerIndex, bool delayed);
     bool Execute(TTransactionContext& txc, const TActorContext& ctx) override;
     void Complete(const TActorContext& ctx) override;
+    
+    NWilson::TTraceId GetTraceId() const noexcept {
+        return ProposeTransactionSpan.GetTraceId();
+    }
 protected:
     TOperation::TPtr Op;
     NEvents::TDataEvents::TEvWrite::TPtr Ev;