Skip to content

Commit c50eac9

Browse files
serbel324serbel324
committed
Revert "Create separate trace id for BlobStorage requests and link them to original traces (#6444)"
This reverts commit c2e94d8.
1 parent 43842c1 commit c50eac9

20 files changed

+79
-208
lines changed

‎ydb/core/base/blobstorage.cpp

Lines changed: 0 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
#include "blobstorage.h"
2-
#include <ydb/library/actors/wilson/wilson_span.h>
3-
#include <ydb/library/wilson_ids/wilson.h>
42

53
namespace NKikimr {
64

@@ -46,49 +44,13 @@ bool operator<(const TPDiskCategory x, const TPDiskCategory y) {
4644
return std::make_tuple(x.Type(), x.Kind()) < std::make_tuple(y.Type(), y.Kind());
4745
}
4846

49-
void TEvBlobStorage::TEvPut::ToSpan(NWilson::TSpan& span) const {
50-
span
51-
.Attribute("Id", Id.ToString())
52-
.Attribute("PutHandleClass", NKikimrBlobStorage::EPutHandleClass_Name(HandleClass));
53-
}
54-
5547
std::unique_ptr<TEvBlobStorage::TEvPutResult> TEvBlobStorage::TEvPut::MakeErrorResponse(
5648
NKikimrProto::EReplyStatus status, const TString& errorReason, TGroupId groupId) {
5749
auto res = std::make_unique<TEvPutResult>(status, Id, TStorageStatusFlags(), groupId, 0.0f);
5850
res->ErrorReason = errorReason;
5951
return res;
6052
}
6153

62-
void TEvBlobStorage::TEvGet::ToSpan(NWilson::TSpan& span) const {
63-
i64 totalSize = 0;
64-
for (ui32 i = 0; i < QuerySize; ++i) {
65-
const auto& q = Queries[i];
66-
if (q.Shift < q.Id.BlobSize()) {
67-
totalSize += Min<size_t>(q.Id.BlobSize() - q.Shift, q.Size ? q.Size : Max<size_t>());
68-
}
69-
}
70-
71-
span
72-
.Attribute("TotalSize", totalSize)
73-
.Attribute("GetHandleClass", NKikimrBlobStorage::EGetHandleClass_Name(GetHandleClass))
74-
.Attribute("MustRestoreFirst", MustRestoreFirst)
75-
.Attribute("IsIndexOnly", IsIndexOnly);
76-
77-
if (span.GetTraceId().GetVerbosity() >= TWilson::DsProxyInternals) {
78-
NWilson::TArrayValue queries;
79-
queries.reserve(QuerySize);
80-
for (ui32 i = 0; i < QuerySize; ++i) {
81-
const auto& q = Queries[i];
82-
queries.emplace_back(NWilson::TKeyValueList{{
83-
{"Id", q.Id.ToString()},
84-
{"Shift", q.Shift},
85-
{"Size", q.Size},
86-
}});
87-
}
88-
span.Attribute("Queries", std::move(queries));
89-
}
90-
}
91-
9254
std::unique_ptr<TEvBlobStorage::TEvGetResult> TEvBlobStorage::TEvGet::MakeErrorResponse(
9355
NKikimrProto::EReplyStatus status, const TString& errorReason, TGroupId groupId) {
9456
auto res = std::make_unique<TEvGetResult>(status, QuerySize, groupId);
@@ -105,128 +67,55 @@ std::unique_ptr<TEvBlobStorage::TEvGetResult> TEvBlobStorage::TEvGet::MakeErrorR
10567
return res;
10668
}
10769

108-
void TEvBlobStorage::TEvBlock::ToSpan(NWilson::TSpan& span) const {
109-
span
110-
.Attribute("TabletId", ::ToString(TabletId))
111-
.Attribute("Generation", Generation);
112-
}
113-
11470
std::unique_ptr<TEvBlobStorage::TEvBlockResult> TEvBlobStorage::TEvBlock::MakeErrorResponse(
11571
NKikimrProto::EReplyStatus status, const TString& errorReason, TGroupId /*groupId*/) {
11672
auto res = std::make_unique<TEvBlockResult>(status);
11773
res->ErrorReason = errorReason;
11874
return res;
11975
}
12076

121-
void TEvBlobStorage::TEvPatch::ToSpan(NWilson::TSpan& span) const {
122-
span
123-
.Attribute("OriginalGroupId", OriginalGroupId)
124-
.Attribute("OriginalId", OriginalId.ToString())
125-
.Attribute("PatchedId", PatchedId.ToString());
126-
}
127-
12877
std::unique_ptr<TEvBlobStorage::TEvPatchResult> TEvBlobStorage::TEvPatch::MakeErrorResponse(
12978
NKikimrProto::EReplyStatus status, const TString& errorReason, TGroupId groupId) {
13079
auto res = std::make_unique<TEvPatchResult>(status, PatchedId, TStorageStatusFlags(), groupId, 0.0f);
13180
res->ErrorReason = errorReason;
13281
return res;
13382
}
13483

135-
void TEvBlobStorage::TEvInplacePatch::ToSpan(NWilson::TSpan& /*span*/) const {
136-
}
137-
13884
std::unique_ptr<TEvBlobStorage::TEvInplacePatchResult> TEvBlobStorage::TEvInplacePatch::MakeErrorResponse(
13985
NKikimrProto::EReplyStatus status, const TString& errorReason) {
14086
auto res = std::make_unique<TEvInplacePatchResult>(status, PatchedId, TStorageStatusFlags(), 0.0f);
14187
res->ErrorReason = errorReason;
14288
return res;
14389
}
14490

145-
void TEvBlobStorage::TEvDiscover::ToSpan(NWilson::TSpan& span) const {
146-
span
147-
.Attribute("TabletId", ::ToString(TabletId))
148-
.Attribute("ReadBody", ReadBody);
149-
}
150-
15191
std::unique_ptr<TEvBlobStorage::TEvDiscoverResult> TEvBlobStorage::TEvDiscover::MakeErrorResponse(
15292
NKikimrProto::EReplyStatus status, const TString& errorReason, TGroupId/*groupId*/) {
15393
auto res = std::make_unique<TEvDiscoverResult>(status, MinGeneration, 0);
15494
res->ErrorReason = errorReason;
15595
return res;
15696
}
15797

158-
void TEvBlobStorage::TEvRange::ToSpan(NWilson::TSpan& span) const {
159-
span
160-
.Attribute("TabletId", ::ToString(TabletId))
161-
.Attribute("From", From.ToString())
162-
.Attribute("To", To.ToString())
163-
.Attribute("MustRestoreFirst", MustRestoreFirst)
164-
.Attribute("IsIndexOnly", IsIndexOnly);
165-
}
166-
16798
std::unique_ptr<TEvBlobStorage::TEvRangeResult> TEvBlobStorage::TEvRange::MakeErrorResponse(
16899
NKikimrProto::EReplyStatus status, const TString& errorReason, TGroupId groupId) {
169100
auto res = std::make_unique<TEvRangeResult>(status, From, To, groupId);
170101
res->ErrorReason = errorReason;
171102
return res;
172103
}
173104

174-
void TEvBlobStorage::TEvCollectGarbage::ToSpan(NWilson::TSpan& span) const {
175-
span
176-
.Attribute("TabletId", ::ToString(TabletId))
177-
.Attribute("RecordGeneration", RecordGeneration)
178-
.Attribute("PerGenerationCounter", PerGenerationCounter)
179-
.Attribute("Channel", Channel);
180-
181-
if (Collect) {
182-
span
183-
.Attribute("CollectGeneration", CollectGeneration)
184-
.Attribute("CollectStep", CollectStep);
185-
}
186-
187-
if (span.GetTraceId().GetVerbosity() >= TWilson::DsProxyInternals) {
188-
auto vector = [&](const auto& name, const auto& v) {
189-
if (v) {
190-
NWilson::TArrayValue items;
191-
items.reserve(v->size());
192-
for (const TLogoBlobID& id : *v) {
193-
items.emplace_back(id.ToString());
194-
}
195-
span.Attribute(name, std::move(items));
196-
}
197-
};
198-
vector("Keep", Keep);
199-
vector("DoNotKeep", DoNotKeep);
200-
} else {
201-
if (Keep) {
202-
span.Attribute("NumKeep", static_cast<i64>(Keep->size()));
203-
}
204-
if (DoNotKeep) {
205-
span.Attribute("NumDoNotKeep", static_cast<i64>(DoNotKeep->size()));
206-
}
207-
}
208-
}
209-
210105
std::unique_ptr<TEvBlobStorage::TEvCollectGarbageResult> TEvBlobStorage::TEvCollectGarbage::MakeErrorResponse(
211106
NKikimrProto::EReplyStatus status, const TString& errorReason, TGroupId /*groupId*/) {
212107
auto res = std::make_unique<TEvCollectGarbageResult>(status, TabletId, RecordGeneration, PerGenerationCounter, Channel);
213108
res->ErrorReason = errorReason;
214109
return res;
215110
}
216111

217-
void TEvBlobStorage::TEvStatus::ToSpan(NWilson::TSpan& /*span*/) const
218-
{}
219-
220112
std::unique_ptr<TEvBlobStorage::TEvStatusResult> TEvBlobStorage::TEvStatus::MakeErrorResponse(
221113
NKikimrProto::EReplyStatus status, const TString& errorReason, TGroupId /*groupId*/) {
222114
auto res = std::make_unique<TEvStatusResult>(status, TStorageStatusFlags());
223115
res->ErrorReason = errorReason;
224116
return res;
225117
}
226118

227-
void TEvBlobStorage::TEvAssimilate::ToSpan(NWilson::TSpan& /*span*/) const
228-
{}
229-
230119
std::unique_ptr<TEvBlobStorage::TEvAssimilateResult> TEvBlobStorage::TEvAssimilate::MakeErrorResponse(
231120
NKikimrProto::EReplyStatus status, const TString& errorReason, TGroupId/*groupId*/) {
232121
return std::make_unique<TEvBlobStorage::TEvAssimilateResult>(status, errorReason);

‎ydb/core/base/blobstorage.h

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@
2525

2626
#include <optional>
2727

28-
namespace NWilson {
29-
class TSpan;
30-
} // NWilson
31-
3228
namespace NKikimr {
3329

3430
static constexpr ui32 MaxProtobufSize = 67108000;
@@ -1002,8 +998,6 @@ struct TEvBlobStorage {
1002998
return sizeof(*this) + Buffer.GetSize();
1003999
}
10041000

1005-
void ToSpan(NWilson::TSpan& span) const;
1006-
10071001
std::unique_ptr<TEvPutResult> MakeErrorResponse(NKikimrProto::EReplyStatus status, const TString& errorReason,
10081002
TGroupId groupId);
10091003
};
@@ -1207,8 +1201,6 @@ struct TEvBlobStorage {
12071201
return sizeof(*this) + QuerySize * sizeof(TQuery);
12081202
}
12091203

1210-
void ToSpan(NWilson::TSpan& span) const;
1211-
12121204
std::unique_ptr<TEvGetResult> MakeErrorResponse(NKikimrProto::EReplyStatus status, const TString& errorReason,
12131205
TGroupId groupId);
12141206

@@ -1362,8 +1354,6 @@ struct TEvBlobStorage {
13621354
return sizeof(*this);
13631355
}
13641356

1365-
void ToSpan(NWilson::TSpan& span) const;
1366-
13671357
std::unique_ptr<TEvBlockResult> MakeErrorResponse(NKikimrProto::EReplyStatus status, const TString& errorReason,
13681358
TGroupId groupId);
13691359
};
@@ -1561,8 +1551,6 @@ struct TEvBlobStorage {
15611551
return sizeof(*this) + sizeof(TDiff) * DiffCount;
15621552
}
15631553

1564-
void ToSpan(NWilson::TSpan& span) const;
1565-
15661554
std::unique_ptr<TEvPatchResult> MakeErrorResponse(NKikimrProto::EReplyStatus status,
15671555
const TString& errorReason, TGroupId groupId);
15681556
};
@@ -1653,8 +1641,6 @@ struct TEvBlobStorage {
16531641
return sizeof(*this) + sizeof(TDiff) * DiffCount;
16541642
}
16551643

1656-
void ToSpan(NWilson::TSpan& span) const;
1657-
16581644
std::unique_ptr<TEvInplacePatchResult> MakeErrorResponse(NKikimrProto::EReplyStatus status,
16591645
const TString& errorReason);
16601646
};
@@ -1742,8 +1728,6 @@ struct TEvBlobStorage {
17421728
return sizeof(*this);
17431729
}
17441730

1745-
void ToSpan(NWilson::TSpan& span) const;
1746-
17471731
std::unique_ptr<TEvDiscoverResult> MakeErrorResponse(NKikimrProto::EReplyStatus status, const TString& errorReason,
17481732
TGroupId groupId);
17491733
};
@@ -1849,8 +1833,6 @@ struct TEvBlobStorage {
18491833
return sizeof(*this);
18501834
}
18511835

1852-
void ToSpan(NWilson::TSpan& span) const;
1853-
18541836
std::unique_ptr<TEvRangeResult> MakeErrorResponse(NKikimrProto::EReplyStatus status, const TString& errorReason,
18551837
TGroupId groupId);
18561838
};
@@ -2046,8 +2028,6 @@ struct TEvBlobStorage {
20462028
return sizeof(*this) + ((Keep ? Keep->size() : 0) + (DoNotKeep ? DoNotKeep->size() : 0)) * sizeof(TLogoBlobID);
20472029
}
20482030

2049-
void ToSpan(NWilson::TSpan& span) const;
2050-
20512031
std::unique_ptr<TEvCollectGarbageResult> MakeErrorResponse(NKikimrProto::EReplyStatus status, const TString& errorReason,
20522032
TGroupId groupId);
20532033
};
@@ -2116,8 +2096,6 @@ struct TEvBlobStorage {
21162096
return sizeof(*this);
21172097
}
21182098

2119-
void ToSpan(NWilson::TSpan& span) const;
2120-
21212099
std::unique_ptr<TEvStatusResult> MakeErrorResponse(NKikimrProto::EReplyStatus status, const TString& errorReason,
21222100
TGroupId groupId);
21232101
};
@@ -2193,8 +2171,6 @@ struct TEvBlobStorage {
21932171
return sizeof(*this);
21942172
}
21952173

2196-
void ToSpan(NWilson::TSpan& span) const;
2197-
21982174
std::unique_ptr<TEvAssimilateResult> MakeErrorResponse(NKikimrProto::EReplyStatus status, const TString& errorReason,
21992175
TGroupId groupId);
22002176
};

0 commit comments

Comments
 (0)