add namespace to server and peer name across namespaces (#1247)

grafana · Oct 31, 2024 · 882ccc2 · 882ccc2
1 parent bce5cf4
commit 882ccc2
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/pkg/export/otel/traces.go b/pkg/export/otel/traces.go
@@ -562,6 +562,17 @@ func (tr *tracesOTELReceiver) acceptSpan(span *request.Span) bool {
 func traceAttributes(span *request.Span, optionalAttrs map[attr.Name]struct{}) []attribute.KeyValue {
 	var attrs []attribute.KeyValue
 
+	// add namespace to server and peer name across namespaces
+	if span.OtherNamespace != "" && span.OtherNamespace != span.ServiceID.Namespace &&
+		// in Kafka events we never get the client, so we hijack the OtherNamespace for the clientId
+		span.Type != request.EventTypeKafkaServer && span.Type != request.EventTypeKafkaClient {
+		if span.IsClientSpan() {
+			span.HostName = request.SpanHost(span) + "." + span.OtherNamespace
+		} else {
+			span.PeerName = request.SpanPeer(span) + "." + span.OtherNamespace
+		}
+	}
+
 	switch span.Type {
 	case request.EventTypeHTTP:
 		attrs = []attribute.KeyValue{