diff --git a/ddtrace/opentracer/tracer_test.go b/ddtrace/opentracer/tracer_test.go index dfc8574c0e..e0e9c5f14e 100644 --- a/ddtrace/opentracer/tracer_test.go +++ b/ddtrace/opentracer/tracer_test.go @@ -115,12 +115,11 @@ func TestExtractError(t *testing.T) { } func TestSpanTelemetry(t *testing.T) { - telemetryClient := new(telemetrytest.MockClient) + telemetryClient := new(telemetrytest.RecordClient) original := telemetry.GlobalClient() telemetry.SwapClient(telemetryClient) defer telemetry.SwapClient(original) opentracing.SetGlobalTracer(New()) _ = opentracing.StartSpan("opentracing.span") - telemetryClient.AssertCalled(t, "Count", telemetry.NamespaceTracers, "spans_created", 1.0, telemetryTags, true) - telemetryClient.AssertNumberOfCalls(t, "Count", 1) + assert.NotZero(t, telemetryClient.Count(telemetry.NamespaceTracers, "spans_created", telemetryTags).Get()) } diff --git a/ddtrace/tracer/dynamic_config.go b/ddtrace/tracer/dynamic_config.go index 67a3832a4c..78a14afb64 100644 --- a/ddtrace/tracer/dynamic_config.go +++ b/ddtrace/tracer/dynamic_config.go @@ -26,11 +26,12 @@ type dynamicConfig[T any] struct { func newDynamicConfig[T any](name string, val T, apply func(T) bool, equal func(x, y T) bool) dynamicConfig[T] { return dynamicConfig[T]{ - cfgName: name, - current: val, - startup: val, - apply: apply, - equal: equal, + cfgName: name, + current: val, + startup: val, + cfgOrigin: telemetry.OriginDefault, + apply: apply, + equal: equal, } } diff --git a/profiler/telemetry_test.go b/profiler/telemetry_test.go index c88b726ce4..f134a53b31 100644 --- a/profiler/telemetry_test.go +++ b/profiler/telemetry_test.go @@ -26,7 +26,7 @@ func mockGlobalClient(client telemetry.Client) func() { // Test that the profiler sends the correct telemetry information func TestTelemetryEnabled(t *testing.T) { t.Run("tracer start, profiler start", func(t *testing.T) { - telemetryClient := new(telemetrytest.MockClient) + telemetryClient := new(telemetrytest.RecordClient) defer mockGlobalClient(telemetryClient)() tracer.Start() @@ -41,10 +41,9 @@ func TestTelemetryEnabled(t *testing.T) { assert.True(t, telemetryClient.Products[telemetry.NamespaceProfilers]) assert.Contains(t, telemetryClient.Configuration, telemetry.Configuration{Name: "heap_profile_enabled", Value: true}) - telemetryClient.AssertCalled(t, "ProductStarted", telemetry.NamespaceProfilers) }) t.Run("only profiler start", func(t *testing.T) { - telemetryClient := new(telemetrytest.MockClient) + telemetryClient := new(telemetrytest.RecordClient) defer mockGlobalClient(telemetryClient)() Start( WithProfileTypes( @@ -55,6 +54,5 @@ func TestTelemetryEnabled(t *testing.T) { assert.True(t, telemetryClient.Products[telemetry.NamespaceProfilers]) assert.Contains(t, telemetryClient.Configuration, telemetry.Configuration{Name: "heap_profile_enabled", Value: true}) - telemetryClient.AssertCalled(t, "ProductStarted", telemetry.NamespaceProfilers) }) }