Skip to content

Commit ea8d4bb

Browse files
committed
try again to make sure all tests passes
Signed-off-by: Eliott Bouhana <[email protected]>
1 parent b96eb2a commit ea8d4bb

File tree

3 files changed

+8
-12
lines changed

3 files changed

+8
-12
lines changed

ddtrace/tracer/dynamic_config.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,9 @@ func (dc *dynamicConfig[T]) handleRC(val *T) bool {
8080
func (dc *dynamicConfig[T]) toTelemetry() telemetry.Configuration {
8181
dc.RLock()
8282
defer dc.RUnlock()
83-
value := telemetry.SanitizeConfigValue(dc.current)
8483
return telemetry.Configuration{
8584
Name: dc.cfgName,
86-
Value: value,
85+
Value: dc.current,
8786
Origin: dc.cfgOrigin,
8887
}
8988
}

ddtrace/tracer/telemetry_test.go

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,8 @@ func TestTelemetryEnabled(t *testing.T) {
117117
defer globalconfig.SetServiceName("")
118118
defer Stop()
119119

120-
assert.True(t, telemetryClient.Started)
121-
var cfgs []telemetry.Configuration
122-
for _, c := range telemetryClient.Configuration {
123-
c.Value = telemetry.SanitizeConfigValue(c.Value)
124-
}
125-
telemetrytest.CheckConfig(t, cfgs, "trace_sample_rules", "[]")
126-
telemetrytest.CheckConfig(t, cfgs, "span_sample_rules", "[]")
120+
telemetrytest.CheckConfig(t, telemetryClient.Configuration, "trace_sample_rules", "[]")
121+
telemetrytest.CheckConfig(t, telemetryClient.Configuration, "span_sample_rules", "[]")
127122
})
128123

129124
t.Run("profiler start, tracer start", func(t *testing.T) {

internal/telemetry/telemetrytest/record.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,14 +157,15 @@ func (r *RecordClient) ProductStartError(product telemetry.Namespace, _ error) {
157157
}
158158

159159
func (r *RecordClient) RegisterAppConfig(key string, value any, origin telemetry.Origin) {
160-
r.mu.Lock()
161-
defer r.mu.Unlock()
162-
r.Configuration = append(r.Configuration, telemetry.Configuration{Name: key, Value: value, Origin: origin})
160+
r.RegisterAppConfigs(telemetry.Configuration{Name: key, Value: value, Origin: origin})
163161
}
164162

165163
func (r *RecordClient) RegisterAppConfigs(kvs ...telemetry.Configuration) {
166164
r.mu.Lock()
167165
defer r.mu.Unlock()
166+
for i := range kvs {
167+
kvs[i].Value = telemetry.SanitizeConfigValue(kvs[i].Value)
168+
}
168169
r.Configuration = append(r.Configuration, kvs...)
169170
}
170171

@@ -189,6 +190,7 @@ func (r *RecordClient) AppStop() {
189190
}
190191

191192
func CheckConfig(t *testing.T, cfgs []telemetry.Configuration, key string, value any) {
193+
t.Helper()
192194
for _, c := range cfgs {
193195
if c.Name == key && reflect.DeepEqual(c.Value, value) {
194196
return

0 commit comments

Comments
 (0)