Skip to content

Commit

Permalink
fix more tests
Browse files Browse the repository at this point in the history
Signed-off-by: Eliott Bouhana <[email protected]>
  • Loading branch information
eliottness committed Jan 31, 2025
1 parent 70e3c56 commit 3069417
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 12 deletions.
5 changes: 2 additions & 3 deletions ddtrace/opentracer/tracer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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())
}
11 changes: 6 additions & 5 deletions ddtrace/tracer/dynamic_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
}

Expand Down
6 changes: 2 additions & 4 deletions profiler/telemetry_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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(
Expand All @@ -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)
})
}

0 comments on commit 3069417

Please sign in to comment.