NWilson::TTraceId NWilson::TSpan already nullable objects

dcherednik · Dec 20, 2023 · 623f2e5 · 623f2e5
1 parent a656918
commit 623f2e5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 22 deletions.
diff --git a/ydb/core/grpc_services/base/base.h b/ydb/core/grpc_services/base/base.h
@@ -607,7 +607,7 @@ class TRefreshTokenImpl
         return {};
     }
 
-    TMaybe<NWilson::TTraceId> GetWilsonTraceId() const override {
+    NWilson::TTraceId GetWilsonTraceId() const override {
         return {};
     }
 
@@ -830,11 +830,8 @@ class TGRpcRequestBiStreamWrapper
         return GetPeerMetaValues(NYdb::YDB_TRACE_ID_HEADER);
     }
 
-    TMaybe<NWilson::TTraceId> GetWilsonTraceId() const override {
-        if (Span_) {
-            return Span_->GetTraceId();
-        }
-        return {};
+    NWilson::TTraceId GetWilsonTraceId() const override {
+        return Span_.GetTraceId();
     }
 
     const TMaybe<TString> GetSdkBuildInfo() const {
@@ -891,9 +888,7 @@ class TGRpcRequestBiStreamWrapper
     }
 
     void LegacyFinishSpan() override {
-        if (Span_) {
-            Span_->End();
-        }
+        Span_.End();
     }
 
     // IRequestCtxBase
@@ -913,7 +908,7 @@ class TGRpcRequestBiStreamWrapper
     TMaybe<NRpcService::TRlPath> RlPath_;
     bool RlAllowed_;
     IGRpcProxyCounters::TPtr Counters_;
-    TMaybe<NWilson::TSpan> Span_;
+    NWilson::TSpan Span_;
 };
 
 template <typename TDerived>
@@ -1172,11 +1167,8 @@ class TGRpcRequestWrapperImpl
         return GetPeerMetaValues(NYdb::YDB_TRACE_ID_HEADER);
     }
 
-    TMaybe<NWilson::TTraceId> GetWilsonTraceId() const override {
-        if (Span_) {
-            return Span_->GetTraceId();
-        }
-        return {};
+    NWilson::TTraceId GetWilsonTraceId() const override {
+        return Span_.GetTraceId();
     }
 
     const TMaybe<TString> GetSdkBuildInfo() const {
@@ -1351,7 +1343,7 @@ class TGRpcRequestWrapperImpl
     }
 
 protected:
-    TMaybe<NWilson::TSpan> Span_;
+    NWilson::TSpan Span_;
 private:
     TIntrusivePtr<NYdbGrpc::IRequestContextBase> Ctx_;
     TIntrusiveConstPtr<NACLib::TUserToken> InternalToken_;
@@ -1429,9 +1421,7 @@ class TGrpcRequestCall
     { }
 
     void Pass(const IFacilityProvider& facility) override {
-        if (this->Span_) {
-            this->Span_->End();
-        }
+        this->Span_.End();
 
         PassMethod(std::move(std::unique_ptr<TRequestIface>(this)), facility);
     }

diff --git a/ydb/core/grpc_services/base/iface.h b/ydb/core/grpc_services/base/iface.h
@@ -22,7 +22,7 @@ using TAuditLogHook = std::function<void (ui32 status, const TAuditLogParts&)>;
 class IRequestCtxBaseMtSafe {
 public:
     virtual TMaybe<TString> GetTraceId() const = 0;
-    virtual TMaybe<NWilson::TTraceId> GetWilsonTraceId() const = 0;
+    virtual NWilson::TTraceId GetWilsonTraceId() const = 0;
     // Returns client provided database name
     virtual const TMaybe<TString> GetDatabaseName() const = 0;
     // Returns "internal" token (result of ticket parser authentication)

diff --git a/ydb/core/grpc_services/local_rpc/local_rpc.h b/ydb/core/grpc_services/local_rpc/local_rpc.h
@@ -191,8 +191,8 @@ class TLocalRpcCtx : public NGRpcService::IRequestOpCtx {
         return Nothing();
     }
 
-    TMaybe<NWilson::TTraceId> GetWilsonTraceId() const override {
-        return Nothing();
+    NWilson::TTraceId GetWilsonTraceId() const override {
+        return {};
     }
 
     TInstant GetDeadline() const override {