Add pod uid to span attributes (#27741)

Author: robdrynkin

ydb/library/actors/wilson/wilson_uploader.cpp

@@ -45,14 +45,16 @@ namespace NWilson {
                 TMonotonic ExpirationTimestamp;
             };
 
-            TBatch(ui64 maxSpansInBatch, ui64 maxBytesInBatch, TString serviceName)
+            TBatch(ui64 maxSpansInBatch, ui64 maxBytesInBatch, const TMap<TString, TString>& attributes)
                 : MaxSpansInBatch(maxSpansInBatch)
                 , MaxBytesInBatch(maxBytesInBatch)
             {
                 auto *rspan = Request.add_resource_spans();
-                auto *serviceNameAttr = rspan->mutable_resource()->add_attributes();
-                serviceNameAttr->set_key("service.name");
-                serviceNameAttr->mutable_value()->set_string_value(std::move(serviceName));
+                for (const auto& [key, value] : attributes) {
+                    auto *attr = rspan->mutable_resource()->add_attributes();
+                    attr->set_key(key);
+                    attr->mutable_value()->set_string_value(value);
+                }
                 ScopeSpans = rspan->add_scope_spans();
             }
 
@@ -107,7 +109,7 @@ namespace NWilson {
             bool WakeupScheduled = false;
 
             TString CollectorUrl;
-            TString ServiceName;
+            const TMap<TString, TString> SpanAttributes;
             TMap<TString, TString> Headers;
 
             TRegisterMonPageCallback RegisterMonPage;
@@ -147,11 +149,11 @@ namespace NWilson {
                 , MaxSpanTimeInQueue(TDuration::Seconds(params.SpanExportTimeoutSeconds))
                 , MaxExportInflight(params.MaxExportRequestsInflight)
                 , CollectorUrl(std::move(params.CollectorUrl))
-                , ServiceName(std::move(params.ServiceName))
+                , SpanAttributes(GetSpanAttributes(params.ServiceName))
                 , Headers(params.Headers)
                 , RegisterMonPage(params.RegisterMonPage)
                 , GrpcSigner(std::move(params.GrpcSigner))
-                , CurrentBatch(MaxSpansInBatch, MaxBytesInBatch, ServiceName)
+                , CurrentBatch(MaxSpansInBatch, MaxBytesInBatch, SpanAttributes)
                 , DroppedSpansCounter(params.Counters ? params.Counters->GetCounter("WilsonUploaderDroppedSpans", true) : MakeIntrusive<NMonitoring::TCounterForPtr>(true))
                 , SentSpansCounter(params.Counters ? params.Counters->GetCounter("WilsonUploaderSentSpans", true) : MakeIntrusive<NMonitoring::TCounterForPtr>(true))
                 , SentBytesCounter(params.Counters ? params.Counters->GetCounter("WilsonUploaderSentBytes", true) : MakeIntrusive<NMonitoring::TCounterForPtr>(true))
@@ -165,6 +167,15 @@ namespace NWilson {
 
             static constexpr char ActorName[] = "WILSON_UPLOADER_ACTOR";
 
+            static TMap<TString, TString> GetSpanAttributes(const TString& serviceName) {
+                TMap<TString, TString> attributes;
+                attributes["service.name"] = serviceName;
+                if (TString podUid = getenv("POD_UID")) {
+                    attributes["k8s.pod.uid"] = podUid;
+                }
+                return attributes;
+            }
+
             void Bootstrap() {
                 Become(&TThis::StateWork);
 
@@ -265,7 +276,7 @@ namespace NWilson {
                     return;
                 }
                 BatchQueue.push(std::move(CurrentBatch).Complete());
-                CurrentBatch = TBatch(MaxSpansInBatch, MaxBytesInBatch, ServiceName);
+                CurrentBatch = TBatch(MaxSpansInBatch, MaxBytesInBatch, SpanAttributes);
             }
 
             void TryToSend() {
@@ -462,7 +473,10 @@ namespace NWilson {
                         str << "MaxSpanTimeInQueue# " << MaxSpanTimeInQueue << '\n';
                         str << "MaxExportInflight# " << MaxExportInflight << '\n';
                         str << "CollectorUrl# " << CollectorUrl << '\n';
-                        str << "ServiceName# " << ServiceName << '\n';
+                        str << "SpanAttributes# " << '\n';
+                        for (const auto& [key, value] : SpanAttributes) {
+                            str << '\t' << key << ": " << value << '\n';
+                        }
                         str << "Headers# " << '\n';
                         for (const auto& [key, value] : Headers) {
                             str << '\t' << key << ": " << value << '\n';