chore(faro): prefix measurement values when parsing faro measurements (…

…#6810) * chore(faro): prefix measurement values * changelog * pr: remove duplicated changelog entry * pr: do not convert measurement values to strings * extend unit test --------- Co-authored-by: William Dumont <[email protected]>
grafana · Jun 6, 2024 · 53d022d · 53d022d
1 parent 6ead6f7
commit 53d022d
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -41,6 +41,8 @@ v0.41.0 (2024-05-31)
 
 - Added support for `otelcol` configuration conversion in `grafana-agent convert` and `grafana-agent run` commands. (@rfratto, @erikbaranowski, @tpaschalis, @hainenber)
 
+- Prefix Faro measurement values with `value_` to align with the latest Faro cloud receiver updates. (@codecapitano)
+
 - Added support for `static` configuration conversion of the `traces` subsystem. (@erikbaranowski, @wildum)
 
 - Add automatic conversion for `legacy_positions_file` in component `loki.source.file`. (@mattdurham)

diff --git a/internal/component/faro/receiver/internal/payload/payload.go b/internal/component/faro/receiver/internal/payload/payload.go
@@ -220,7 +220,7 @@ type Measurement struct {
 	Context   MeasurementContext `json:"context,omitempty"`
 }
 
-// KeyVal representation of the exception object
+// KeyVal representation of the measurement object
 func (m Measurement) KeyVal() *KeyVal {
 	kv := NewKeyVal()
 
@@ -238,6 +238,14 @@ func (m Measurement) KeyVal() *KeyVal {
 	}
 	MergeKeyVal(kv, m.Trace.KeyVal())
 	MergeKeyValWithPrefix(kv, KeyValFromMap(m.Context), "context_")
+
+	values := make(map[string]float64, len(m.Values))
+	for key, value := range m.Values {
+		values[key] = value
+	}
+
+	MergeKeyValWithPrefix(kv, KeyValFromFloatMap(values), "value_")
+
 	return kv
 }
 

diff --git a/internal/component/faro/receiver/internal/payload/payload_test.go b/internal/component/faro/receiver/internal/payload/payload_test.go
@@ -139,4 +139,24 @@ func TestUnmarshalPayloadJSON(t *testing.T) {
 			},
 		},
 	}, payload.Measurements)
+
+	kv := payload.Measurements[0].KeyVal()
+	expectedKv := NewKeyVal()
+	expectedKv.Set("kind", "measurement")
+	expectedKv.Set("type", "foobar")
+	expectedKv.Set("ttfb", 14.000000)
+	expectedKv.Set("ttfcp", 22.120000)
+	expectedKv.Set("ttfp", 20.120000)
+	expectedKv.Set("traceID", "abcd")
+	expectedKv.Set("spanID", "def")
+	expectedKv.Set("context_hello", "world")
+	expectedKv.Set("value_ttfb", 14)
+	expectedKv.Set("value_ttfcp", 22.12)
+	expectedKv.Set("value_ttfp", 20.12)
+	expectedPair := kv.Oldest()
+	for pair := kv.Oldest(); pair != nil; pair = pair.Next() {
+		require.Equal(t, expectedPair.Key, pair.Key)
+		require.Equal(t, expectedPair.Value, pair.Value)
+		expectedPair = expectedPair.Next()
+	}
 }
diff --git a/internal/component/faro/receiver/internal/payload/utils.go b/internal/component/faro/receiver/internal/payload/utils.go
@@ -29,6 +29,20 @@ func KeyValFromMap(m map[string]string) *KeyVal {
 	return kv
 }
 
+// KeyValFromMap will instantiate KeyVal from a map[string]float64
+func KeyValFromFloatMap(m map[string]float64) *KeyVal {
+	kv := NewKeyVal()
+	keys := make([]string, 0, len(m))
+	for k := range m {
+		keys = append(keys, k)
+	}
+	sort.Strings(keys)
+	for _, k := range keys {
+		kv.Set(k, m[k])
+	}
+	return kv
+}
+
 // MergeKeyVal will merge source in target
 func MergeKeyVal(target *KeyVal, source *KeyVal) {
 	for el := source.Oldest(); el != nil; el = el.Next() {