add namespace to server and peer name across namespaces

grafana · Oct 11, 2024 · b64c0a5 · b64c0a5
1 parent 8c3c9db
commit b64c0a5
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/pkg/transform/k8s.go b/pkg/transform/k8s.go
@@ -90,7 +90,9 @@ func (md *metadataDecorator) nodeLoop(in <-chan []request.Span, out chan<- []req
 }
 
 func (md *metadataDecorator) do(span *request.Span) {
-	if podInfo, ok := md.db.OwnerPodInfo(span.Pid.Namespace); ok {
+	var podInfo *kube.PodInfo
+	var ok bool
+	if podInfo, ok = md.db.OwnerPodInfo(span.Pid.Namespace); ok {
 		md.appendMetadata(span, podInfo)
 	} else {
 		// do not leave the service attributes map as nil
@@ -99,9 +101,15 @@ func (md *metadataDecorator) do(span *request.Span) {
 	// override the peer and host names from Kubernetes metadata, if found
 	if hn := md.db.HostNameForIP(span.Host); hn != "" {
 		span.HostName = hn
+		if span.OtherNamespace != "" && podInfo != nil && podInfo.Namespace != span.OtherNamespace {
+			span.HostName = hn + "." + span.OtherNamespace
+		}
 	}
 	if pn := md.db.HostNameForIP(span.Peer); pn != "" {
 		span.PeerName = pn
+		if span.OtherNamespace != "" && podInfo != nil && podInfo.Namespace != span.OtherNamespace {
+			span.PeerName = pn + "." + span.OtherNamespace
+		}
 	}
 }