Skip to content

Commit b923670

Browse files
serbel324serbel324
authored
Merge ea0fa0c into 791adc9 
2 parents 791adc9 + ea0fa0c commit b923670

File tree

4 files changed

+37
-8
lines changed

4 files changed

+37
-8
lines changed

‎ydb/core/blobstorage/dsproxy/dsproxy.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,8 @@ class TBlobStorageGroupRequestActor : public TActor<TBlobStorageGroupRequestActo
228228
ParentSpan.Link(Span.GetTraceId());
229229
Span.Attribute("GroupId", Info->GroupID.GetRawId());
230230
Span.Attribute("RestartCounter", RestartCounter);
231+
Span.Attribute("database", AppData()->TenantName);
232+
Span.Attribute("storagePool", Info->GetStoragePoolName());
231233
params.Common.Event->ToSpan(Span);
232234
}
233235

‎ydb/core/blobstorage/vdisk/skeleton/blobstorage_skeleton.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,8 @@ namespace NKikimr {
491491

492492
bool confirmSyncLogAlso = static_cast<bool>(syncLogMsg);
493493
auto loggedRec = new typename TLoggedRecType<TEvResult>::T(seg, confirmSyncLogAlso,
494-
id, ingress, std::move(buffer), std::move(result), sender, cookie, std::move(info.TraceId), handleClass);
494+
id, ingress, std::move(buffer), std::move(result), sender, cookie, std::move(info.TraceId), handleClass,
495+
SelfVDiskId, Config, VCtx);
495496
intptr_t loggedRecId = LoggedRecsVault.Put(loggedRec);
496497
void *loggedRecCookie = reinterpret_cast<void *>(loggedRecId);
497498
// create log msg
@@ -899,7 +900,8 @@ namespace NKikimr {
899900
// prepare TLoggedRecVPutHuge
900901
auto traceId = ev->TraceId.Clone();
901902
bool confirmSyncLogAlso = static_cast<bool>(syncLogMsg);
902-
intptr_t loggedRecId = LoggedRecsVault.Put(new TLoggedRecVPutHuge(seg, confirmSyncLogAlso, Db->HugeKeeperID, ev));
903+
intptr_t loggedRecId = LoggedRecsVault.Put(new TLoggedRecVPutHuge(seg, confirmSyncLogAlso, Db->HugeKeeperID, ev,
904+
SelfVDiskId, Config, VCtx));
903905
void *loggedRecCookie = reinterpret_cast<void *>(loggedRecId);
904906
// create log msg
905907
auto logMsg = CreateHullUpdate(HullLogCtx, TLogSignature::SignatureHugeLogoBlob, dataToWrite, seg,

‎ydb/core/blobstorage/vdisk/skeleton/skeleton_loggedrec.cpp

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ namespace NKikimr {
2828
const TActorId &recipient,
2929
ui64 recipientCookie,
3030
NWilson::TTraceId traceId,
31-
NKikimrBlobStorage::EPutHandleClass handleClass)
31+
NKikimrBlobStorage::EPutHandleClass handleClass,
32+
const TVDiskID& vdiskId,
33+
const TIntrusivePtr<TVDiskConfig>& config,
34+
const TVDiskContextPtr& vctx)
3235
: ILoggedRec(seg, confirmSyncLogAlso)
3336
, Id(id)
3437
, Ingress(ingress)
@@ -41,6 +44,10 @@ namespace NKikimr {
4144
{
4245
if (Span) {
4346
Span.Attribute("blob_id", id.ToString());
47+
Span.Attribute("group_id", vctx->GroupId.GetRawId());
48+
Span.Attribute("vdisk_id", vdiskId.ToString());
49+
Span.Attribute("storage_pool", config->BaseInfo.StoragePoolName);
50+
Span.Attribute("handle_class", NKikimrBlobStorage::EPutHandleClass_Name(handleClass));
4451
}
4552
}
4653

@@ -75,7 +82,10 @@ namespace NKikimr {
7582
const TActorId &recipient,
7683
ui64 recipientCookie,
7784
NWilson::TTraceId traceId,
78-
NKikimrBlobStorage::EPutHandleClass)
85+
NKikimrBlobStorage::EPutHandleClass handleClass,
86+
const TVDiskID& vdiskId,
87+
const TIntrusivePtr<TVDiskConfig>& config,
88+
const TVDiskContextPtr& vctx)
7989
: ILoggedRec(seg, confirmSyncLogAlso)
8090
, Id(id)
8191
, Ingress(ingress)
@@ -87,6 +97,10 @@ namespace NKikimr {
8797
{
8898
if (Span) {
8999
Span.Attribute("blob_id", Id.ToString());
100+
Span.Attribute("group_id", vctx->GroupId.GetRawId());
101+
Span.Attribute("vdisk_id", vdiskId.ToString());
102+
Span.Attribute("storage_pool", config->BaseInfo.StoragePoolName);
103+
Span.Attribute("handle_class", NKikimrBlobStorage::EPutHandleClass_Name(handleClass));
90104
}
91105
}
92106

@@ -115,14 +129,22 @@ namespace NKikimr {
115129
TLsnSeg seg,
116130
bool confirmSyncLogAlso,
117131
const TActorId &hugeKeeperId,
118-
TEvHullLogHugeBlob::TPtr ev)
132+
TEvHullLogHugeBlob::TPtr ev,
133+
const TVDiskID& vdiskId,
134+
const TIntrusivePtr<TVDiskConfig>& config,
135+
const TVDiskContextPtr& vctx)
119136
: ILoggedRec(seg, confirmSyncLogAlso)
120137
, HugeKeeperId(hugeKeeperId)
121138
, Ev(ev)
122139
, Span(TWilson::VDiskInternals, std::move(Ev->TraceId), "VDisk.Log.PutHuge")
123140
{
124141
if (Span) {
125142
Span.Attribute("blob_id", Ev->Get()->LogoBlobID.ToString());
143+
Span.Attribute("group_id", vctx->GroupId.GetRawId());
144+
Span.Attribute("vdisk_id", vdiskId.ToString());
145+
Span.Attribute("storage_pool", config->BaseInfo.StoragePoolName);
146+
Span.Attribute("handle_class", NKikimrBlobStorage::EPutHandleClass_Name(
147+
Ev->Get()->HandleClass));
126148
}
127149
}
128150

‎ydb/core/blobstorage/vdisk/skeleton/skeleton_loggedrec.h

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ namespace NKikimr {
5050
public:
5151
TLoggedRecVPut(TLsnSeg seg, bool confirmSyncLogAlso, const TLogoBlobID &id, const TIngress &ingress,
5252
TRope &&buffer, std::unique_ptr<TEvBlobStorage::TEvVPutResult> result, const TActorId &recipient,
53-
ui64 recipientCookie, NWilson::TTraceId traceId, NKikimrBlobStorage::EPutHandleClass handleClass);
53+
ui64 recipientCookie, NWilson::TTraceId traceId, NKikimrBlobStorage::EPutHandleClass handleClass,
54+
const TVDiskID& vdiskId, const TIntrusivePtr<TVDiskConfig>& config, const TVDiskContextPtr& vctx);
5455
void Replay(THull &hull, const TActorContext &ctx) override;
5556

5657
NWilson::TTraceId GetTraceId() const;
@@ -73,7 +74,8 @@ namespace NKikimr {
7374
public:
7475
TLoggedRecVMultiPutItem(TLsnSeg seg, bool confirmSyncLogAlso, const TLogoBlobID &id, const TIngress &ingress,
7576
TRope &&buffer, std::unique_ptr<TEvVMultiPutItemResult> result, const TActorId &recipient,
76-
ui64 recipientCookie, NWilson::TTraceId traceId, NKikimrBlobStorage::EPutHandleClass);
77+
ui64 recipientCookie, NWilson::TTraceId traceId, NKikimrBlobStorage::EPutHandleClass handleClass,
78+
const TVDiskID& vdiskId, const TIntrusivePtr<TVDiskConfig>& config, const TVDiskContextPtr& vctx);
7779
void Replay(THull &hull, const TActorContext &ctx) override;
7880

7981
NWilson::TTraceId GetTraceId() const;
@@ -94,7 +96,8 @@ namespace NKikimr {
9496
class TLoggedRecVPutHuge : public ILoggedRec {
9597
public:
9698
TLoggedRecVPutHuge(TLsnSeg seg, bool confirmSyncLogAlso, const TActorId &hugeKeeperId,
97-
TEvHullLogHugeBlob::TPtr ev);
99+
TEvHullLogHugeBlob::TPtr ev, const TVDiskID& vdiskId,
100+
const TIntrusivePtr<TVDiskConfig>& config, const TVDiskContextPtr& vctx);
98101
void Replay(THull &hull, const TActorContext &ctx) override;
99102

100103
private:

0 commit comments

Comments
 (0)