Skip to content

Add more attributes to DSProxy and VDisk spans #21010

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+37 −8
Open

Add more attributes to DSProxy and VDisk spans #21010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ydb/core/blobstorage/dsproxy/dsproxy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,8 @@ class TBlobStorageGroupRequestActor : public TActor<TBlobStorageGroupRequestActo
ParentSpan.Link(Span.GetTraceId());
Span.Attribute("GroupId", Info->GroupID.GetRawId());
Span.Attribute("RestartCounter", RestartCounter);
Span.Attribute("database", AppData()->TenantName);
Span.Attribute("storagePool", Info->GetStoragePoolName());
params.Common.Event->ToSpan(Span);
}

Expand Down
6 changes: 4 additions & 2 deletions ydb/core/blobstorage/vdisk/skeleton/blobstorage_skeleton.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,8 @@ namespace NKikimr {

bool confirmSyncLogAlso = static_cast<bool>(syncLogMsg);
auto loggedRec = new typename TLoggedRecType<TEvResult>::T(seg, confirmSyncLogAlso,
id, ingress, std::move(buffer), std::move(result), sender, cookie, std::move(info.TraceId), handleClass);
id, ingress, std::move(buffer), std::move(result), sender, cookie, std::move(info.TraceId), handleClass,
SelfVDiskId, Config, VCtx);
intptr_t loggedRecId = LoggedRecsVault.Put(loggedRec);
void *loggedRecCookie = reinterpret_cast<void *>(loggedRecId);
// create log msg
Expand Down Expand Up @@ -899,7 +900,8 @@ namespace NKikimr {
// prepare TLoggedRecVPutHuge
auto traceId = ev->TraceId.Clone();
bool confirmSyncLogAlso = static_cast<bool>(syncLogMsg);
intptr_t loggedRecId = LoggedRecsVault.Put(new TLoggedRecVPutHuge(seg, confirmSyncLogAlso, Db->HugeKeeperID, ev));
intptr_t loggedRecId = LoggedRecsVault.Put(new TLoggedRecVPutHuge(seg, confirmSyncLogAlso, Db->HugeKeeperID, ev,
SelfVDiskId, Config, VCtx));
void *loggedRecCookie = reinterpret_cast<void *>(loggedRecId);
// create log msg
auto logMsg = CreateHullUpdate(HullLogCtx, TLogSignature::SignatureHugeLogoBlob, dataToWrite, seg,
Expand Down
28 changes: 25 additions & 3 deletions ydb/core/blobstorage/vdisk/skeleton/skeleton_loggedrec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@ namespace NKikimr {
const TActorId &recipient,
ui64 recipientCookie,
NWilson::TTraceId traceId,
NKikimrBlobStorage::EPutHandleClass handleClass)
NKikimrBlobStorage::EPutHandleClass handleClass,
const TVDiskID& vdiskId,
const TIntrusivePtr<TVDiskConfig>& config,
const TVDiskContextPtr& vctx)
: ILoggedRec(seg, confirmSyncLogAlso)
, Id(id)
, Ingress(ingress)
Expand All @@ -41,6 +44,10 @@ namespace NKikimr {
{
if (Span) {
Span.Attribute("blob_id", id.ToString());
Span.Attribute("group_id", vctx->GroupId.GetRawId());
Span.Attribute("vdisk_id", vdiskId.ToString());
Span.Attribute("storage_pool", config->BaseInfo.StoragePoolName);
Span.Attribute("handle_class", NKikimrBlobStorage::EPutHandleClass_Name(handleClass));
}
}

Expand Down Expand Up @@ -75,7 +82,10 @@ namespace NKikimr {
const TActorId &recipient,
ui64 recipientCookie,
NWilson::TTraceId traceId,
NKikimrBlobStorage::EPutHandleClass)
NKikimrBlobStorage::EPutHandleClass handleClass,
const TVDiskID& vdiskId,
const TIntrusivePtr<TVDiskConfig>& config,
const TVDiskContextPtr& vctx)
: ILoggedRec(seg, confirmSyncLogAlso)
, Id(id)
, Ingress(ingress)
Expand All @@ -87,6 +97,10 @@ namespace NKikimr {
{
if (Span) {
Span.Attribute("blob_id", Id.ToString());
Span.Attribute("group_id", vctx->GroupId.GetRawId());
Span.Attribute("vdisk_id", vdiskId.ToString());
Span.Attribute("storage_pool", config->BaseInfo.StoragePoolName);
Span.Attribute("handle_class", NKikimrBlobStorage::EPutHandleClass_Name(handleClass));
}
}

Expand Down Expand Up @@ -115,14 +129,22 @@ namespace NKikimr {
TLsnSeg seg,
bool confirmSyncLogAlso,
const TActorId &hugeKeeperId,
TEvHullLogHugeBlob::TPtr ev)
TEvHullLogHugeBlob::TPtr ev,
const TVDiskID& vdiskId,
const TIntrusivePtr<TVDiskConfig>& config,
const TVDiskContextPtr& vctx)
: ILoggedRec(seg, confirmSyncLogAlso)
, HugeKeeperId(hugeKeeperId)
, Ev(ev)
, Span(TWilson::VDiskInternals, std::move(Ev->TraceId), "VDisk.Log.PutHuge")
{
if (Span) {
Span.Attribute("blob_id", Ev->Get()->LogoBlobID.ToString());
Span.Attribute("group_id", vctx->GroupId.GetRawId());
Span.Attribute("vdisk_id", vdiskId.ToString());
Span.Attribute("storage_pool", config->BaseInfo.StoragePoolName);
Span.Attribute("handle_class", NKikimrBlobStorage::EPutHandleClass_Name(
Ev->Get()->HandleClass));
}
}

Expand Down
9 changes: 6 additions & 3 deletions ydb/core/blobstorage/vdisk/skeleton/skeleton_loggedrec.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ namespace NKikimr {
public:
TLoggedRecVPut(TLsnSeg seg, bool confirmSyncLogAlso, const TLogoBlobID &id, const TIngress &ingress,
TRope &&buffer, std::unique_ptr<TEvBlobStorage::TEvVPutResult> result, const TActorId &recipient,
ui64 recipientCookie, NWilson::TTraceId traceId, NKikimrBlobStorage::EPutHandleClass handleClass);
ui64 recipientCookie, NWilson::TTraceId traceId, NKikimrBlobStorage::EPutHandleClass handleClass,
const TVDiskID& vdiskId, const TIntrusivePtr<TVDiskConfig>& config, const TVDiskContextPtr& vctx);
void Replay(THull &hull, const TActorContext &ctx) override;

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

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

private:
Expand Down
Loading