From ea8d4bb00f060287c2f5f8139a464a932366dfbf Mon Sep 17 00:00:00 2001
From: Eliott Bouhana <eliott.bouhana@datadoghq.com>
Date: Fri, 7 Feb 2025 15:45:56 +0100
Subject: [PATCH] try again to make sure all tests passes

Signed-off-by: Eliott Bouhana <eliott.bouhana@datadoghq.com>
---
 ddtrace/tracer/dynamic_config.go           | 3 +--
 ddtrace/tracer/telemetry_test.go           | 9 ++-------
 internal/telemetry/telemetrytest/record.go | 8 +++++---
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/ddtrace/tracer/dynamic_config.go b/ddtrace/tracer/dynamic_config.go
index 78a14afb647..e0bb4928edb 100644
--- a/ddtrace/tracer/dynamic_config.go
+++ b/ddtrace/tracer/dynamic_config.go
@@ -80,10 +80,9 @@ func (dc *dynamicConfig[T]) handleRC(val *T) bool {
 func (dc *dynamicConfig[T]) toTelemetry() telemetry.Configuration {
 	dc.RLock()
 	defer dc.RUnlock()
-	value := telemetry.SanitizeConfigValue(dc.current)
 	return telemetry.Configuration{
 		Name:   dc.cfgName,
-		Value:  value,
+		Value:  dc.current,
 		Origin: dc.cfgOrigin,
 	}
 }
diff --git a/ddtrace/tracer/telemetry_test.go b/ddtrace/tracer/telemetry_test.go
index ff02bed359e..b77f305f3a2 100644
--- a/ddtrace/tracer/telemetry_test.go
+++ b/ddtrace/tracer/telemetry_test.go
@@ -117,13 +117,8 @@ func TestTelemetryEnabled(t *testing.T) {
 		defer globalconfig.SetServiceName("")
 		defer Stop()
 
-		assert.True(t, telemetryClient.Started)
-		var cfgs []telemetry.Configuration
-		for _, c := range telemetryClient.Configuration {
-			c.Value = telemetry.SanitizeConfigValue(c.Value)
-		}
-		telemetrytest.CheckConfig(t, cfgs, "trace_sample_rules", "[]")
-		telemetrytest.CheckConfig(t, cfgs, "span_sample_rules", "[]")
+		telemetrytest.CheckConfig(t, telemetryClient.Configuration, "trace_sample_rules", "[]")
+		telemetrytest.CheckConfig(t, telemetryClient.Configuration, "span_sample_rules", "[]")
 	})
 
 	t.Run("profiler start, tracer start", func(t *testing.T) {
diff --git a/internal/telemetry/telemetrytest/record.go b/internal/telemetry/telemetrytest/record.go
index 0e6a95361be..daee5f3e4a4 100644
--- a/internal/telemetry/telemetrytest/record.go
+++ b/internal/telemetry/telemetrytest/record.go
@@ -157,14 +157,15 @@ func (r *RecordClient) ProductStartError(product telemetry.Namespace, _ error) {
 }
 
 func (r *RecordClient) RegisterAppConfig(key string, value any, origin telemetry.Origin) {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-	r.Configuration = append(r.Configuration, telemetry.Configuration{Name: key, Value: value, Origin: origin})
+	r.RegisterAppConfigs(telemetry.Configuration{Name: key, Value: value, Origin: origin})
 }
 
 func (r *RecordClient) RegisterAppConfigs(kvs ...telemetry.Configuration) {
 	r.mu.Lock()
 	defer r.mu.Unlock()
+	for i := range kvs {
+		kvs[i].Value = telemetry.SanitizeConfigValue(kvs[i].Value)
+	}
 	r.Configuration = append(r.Configuration, kvs...)
 }
 
@@ -189,6 +190,7 @@ func (r *RecordClient) AppStop() {
 }
 
 func CheckConfig(t *testing.T, cfgs []telemetry.Configuration, key string, value any) {
+	t.Helper()
 	for _, c := range cfgs {
 		if c.Name == key && reflect.DeepEqual(c.Value, value) {
 			return