Address comments

cmd/tempo-vulture/main.go

@@ -340,7 +340,7 @@ func searchTag(client *util.Client, seed time.Time) (traceMetrics, error) {
 	//  around the seed.
 	start := seed.Add(-30 * time.Minute).Unix()
 	end := seed.Add(30 * time.Minute).Unix()
-	resp, err := client.SearchWithRange(fmt.Sprintf("%s=%s", attr.Key, attr.Value.GetStringValue()), start, end)
+	resp, err := client.SearchWithRange(fmt.Sprintf("%s=%s", attr.Key, util.StringifyAnyValue(attr.Value)), start, end)
 	if err != nil {
 		logger.Error(fmt.Sprintf("failed to search traces with tag %s: %s", attr.Key, err.Error()))
 		tm.requestFailed++

modules/generator/processor/servicegraphs/servicegraphs.go

@@ -12,6 +12,7 @@ import (
 	"github.com/opentracing/opentracing-go"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
+	"github.com/prometheus/prometheus/util/strutil"
 
 	gen "github.com/grafana/tempo/modules/generator/processor"
 	"github.com/grafana/tempo/modules/generator/processor/servicegraphs/store"
@@ -74,7 +75,7 @@ func New(cfg Config, tenant string, registry registry.Registry, logger log.Logge
 	labels := []string{"client", "server"}
 
 	for _, d := range cfg.Dimensions {
-		labels = append(labels, commonUtil.SanitizeLabelName(d))
+		labels = append(labels, strutil.SanitizeLabelName(d))
 	}
 
 	p := &processor{
@@ -204,7 +205,10 @@ func (p *processor) Shutdown(_ context.Context) {
 // Returns true if the edge is completed or expired and should be deleted.
 func (p *processor) collectEdge(e *store.Edge) {
 	if e.IsCompleted() {
-		values := []string{e.ClientService, e.ServerService}
+		values := make([]string, 0, 2+len(p.cfg.Dimensions))
+		values = append(values, e.ClientService)
+		values = append(values, e.ServerService)
+
 		for _, dimension := range p.cfg.Dimensions {
 			values = append(values, e.Dimensions[dimension])
 		}
@@ -222,22 +226,23 @@ func (p *processor) collectEdge(e *store.Edge) {
 	}
 }
 
-func (p *processor) upsertDimensions(m map[string]string, resourceAttr []*v1common.KeyValue, attr []*v1common.KeyValue) {
+func (p *processor) upsertDimensions(m map[string]string, resourceAttr []*v1common.KeyValue, spanAttr []*v1common.KeyValue) {
 	for _, dim := range p.cfg.Dimensions {
-		for _, kv := range resourceAttr {
-			key := kv.Key
-			if key == dim {
-				m[key] = commonUtil.StringifyAnyValue(kv.Value)
-				continue
-			}
+		if v, found := p.findAttrValue(dim, resourceAttr, spanAttr); found {
+			m[dim] = v
 		}
-		for _, kv := range attr {
-			key := kv.Key
-			if key == dim {
-				m[key] = commonUtil.StringifyAnyValue(kv.Value)
+	}
+}
+
+func (p *processor) findAttrValue(key string, attrSlices ...[]*v1common.KeyValue) (string, bool) {
+	for _, attrs := range attrSlices {
+		for _, kv := range attrs {
+			if key == kv.Key {
+				return commonUtil.StringifyAnyValue(kv.Value), true
 			}
 		}
 	}
+	return "", false
 }
 
 func (p *processor) spanFailed(_ *v1.Span) bool {

pkg/util/attributes.go

@@ -1,7 +1,6 @@
 package util
 
 import (
-	"regexp"
 	"strconv"
 
 	v1common "github.com/grafana/tempo/pkg/tempopb/common/v1"
@@ -35,10 +34,3 @@ func StringifyAnyValue(anyValue *v1common.AnyValue) string {
 
 	return ""
 }
-
-var invalidLabelCharRE = regexp.MustCompile(`[^a-zA-Z0-9_]`)
-
-// SanitizeLabelName sanitizes a label name for Prometheus.
-func SanitizeLabelName(name string) string {
-	return invalidLabelCharRE.ReplaceAllString(name, "_")
-}

pkg/util/attributes_test.go

@@ -91,29 +91,3 @@ func TestStringifyAnyValue(t *testing.T) {
 		})
 	}
 }
-
-func TestSanitizeLabelName(t *testing.T) {
-	testCases := []struct {
-		name     string
-		label    string
-		expected string
-	}{
-		{
-			name:     "label with no special characters",
-			label:    "label",
-			expected: "label",
-		},
-		{
-			name:     "label with special characters",
-			label:    "label-with.special/characters",
-			expected: "label_with_special_characters",
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			str := SanitizeLabelName(tc.label)
-			assert.Equal(t, tc.expected, str)
-		})
-	}
-}