Skip to content

Commit 5c4a360

Browse files
eliottnesseliottness
committed
fix minor rebasing mistakes
Signed-off-by: Eliott Bouhana <[email protected]>
1 parent b9952a7 commit 5c4a360

File tree

4 files changed

+24
-32
lines changed

4 files changed

+24
-32
lines changed

‎ddtrace/tracer/remote_config_test.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func assertCalled(t *testing.T, client *telemetrytest.RecordClient, cfgs []telem
3333
func TestOnRemoteConfigUpdate(t *testing.T) {
3434
t.Run("RC sampling rate = 0.5 is applied and can be reverted", func(t *testing.T) {
3535
telemetryClient := new(telemetrytest.RecordClient)
36-
defer testTelemetryClient(telemetryClient)()
36+
defer telemetry.MockClient(telemetryClient)()
3737

3838
tracer, _, _, stop := startTestTracer(t, WithService("my-service"), WithEnv("my-env"))
3939
defer stop()
@@ -97,7 +97,7 @@ func TestOnRemoteConfigUpdate(t *testing.T) {
9797

9898
t.Run("DD_TRACE_SAMPLE_RATE=0.1 and RC sampling rate = 0.2", func(t *testing.T) {
9999
telemetryClient := new(telemetrytest.RecordClient)
100-
defer testTelemetryClient(telemetryClient)()
100+
defer telemetry.MockClient(telemetryClient)()
101101

102102
t.Setenv("DD_TRACE_SAMPLE_RATE", "0.1")
103103
tracer, _, _, stop := startTestTracer(t, WithService("my-service"), WithEnv("my-env"))
@@ -134,7 +134,7 @@ func TestOnRemoteConfigUpdate(t *testing.T) {
134134

135135
t.Run("DD_TRACE_SAMPLING_RULES rate=0.1 and RC trace sampling rules rate = 1.0", func(t *testing.T) {
136136
telemetryClient := new(telemetrytest.RecordClient)
137-
defer testTelemetryClient(telemetryClient)()
137+
defer telemetry.MockClient(telemetryClient)()
138138

139139
t.Setenv("DD_TRACE_SAMPLING_RULES", `[{
140140
"service": "my-service",
@@ -191,7 +191,7 @@ func TestOnRemoteConfigUpdate(t *testing.T) {
191191

192192
t.Run("DD_TRACE_SAMPLING_RULES=0.1 and RC rule rate=1.0 and revert", func(t *testing.T) {
193193
telemetryClient := new(telemetrytest.RecordClient)
194-
defer testTelemetryClient(telemetryClient)()
194+
defer telemetry.MockClient(telemetryClient)()
195195

196196
t.Setenv("DD_TRACE_SAMPLING_RULES", `[{
197197
"service": "my-service",
@@ -274,7 +274,7 @@ func TestOnRemoteConfigUpdate(t *testing.T) {
274274

275275
t.Run("RC rule with tags", func(t *testing.T) {
276276
telemetryClient := new(telemetrytest.RecordClient)
277-
defer testTelemetryClient(telemetryClient)()
277+
defer telemetry.MockClient(telemetryClient)()
278278
tracer, _, _, stop := startTestTracer(t, WithService("my-service"), WithEnv("my-env"))
279279
defer stop()
280280

@@ -319,7 +319,7 @@ func TestOnRemoteConfigUpdate(t *testing.T) {
319319
t.Run("RC header tags = X-Test-Header:my-tag-name is applied and can be reverted", func(t *testing.T) {
320320
defer globalconfig.ClearHeaderTags()
321321
telemetryClient := new(telemetrytest.RecordClient)
322-
defer testTelemetryClient(telemetryClient)()
322+
defer telemetry.MockClient(telemetryClient)()
323323

324324
tracer, _, _, stop := startTestTracer(t, WithService("my-service"), WithEnv("my-env"))
325325
defer stop()
@@ -357,7 +357,7 @@ func TestOnRemoteConfigUpdate(t *testing.T) {
357357

358358
t.Run("RC tracing_enabled = false is applied", func(t *testing.T) {
359359
telemetryClient := new(telemetrytest.RecordClient)
360-
defer testTelemetryClient(telemetryClient)()
360+
defer telemetry.MockClient(telemetryClient)()
361361

362362
tr, _, _, stop := startTestTracer(t, WithService("my-service"), WithEnv("my-env"))
363363
defer stop()
@@ -412,7 +412,7 @@ func TestOnRemoteConfigUpdate(t *testing.T) {
412412
func(t *testing.T) {
413413
defer globalconfig.ClearHeaderTags()
414414
telemetryClient := new(telemetrytest.RecordClient)
415-
defer testTelemetryClient(telemetryClient)()
415+
defer telemetry.MockClient(telemetryClient)()
416416

417417
t.Setenv("DD_TRACE_HEADER_TAGS", "X-Test-Header:my-tag-name-from-env")
418418
tracer, _, _, stop := startTestTracer(t, WithService("my-service"), WithEnv("my-env"))
@@ -459,7 +459,7 @@ func TestOnRemoteConfigUpdate(t *testing.T) {
459459
func(t *testing.T) {
460460
defer globalconfig.ClearHeaderTags()
461461
telemetryClient := new(telemetrytest.RecordClient)
462-
defer testTelemetryClient(telemetryClient)()
462+
defer telemetry.MockClient(telemetryClient)()
463463

464464
tracer, _, _, stop := startTestTracer(
465465
t,
@@ -507,7 +507,7 @@ func TestOnRemoteConfigUpdate(t *testing.T) {
507507

508508
t.Run("Invalid payload", func(t *testing.T) {
509509
telemetryClient := new(telemetrytest.RecordClient)
510-
defer testTelemetryClient(telemetryClient)()
510+
defer telemetry.MockClient(telemetryClient)()
511511

512512
tracer, _, _, stop := startTestTracer(t, WithService("my-service"), WithEnv("my-env"))
513513
defer stop()
@@ -531,7 +531,7 @@ func TestOnRemoteConfigUpdate(t *testing.T) {
531531

532532
t.Run("Service mismatch", func(t *testing.T) {
533533
telemetryClient := new(telemetrytest.RecordClient)
534-
defer testTelemetryClient(telemetryClient)()
534+
defer telemetry.MockClient(telemetryClient)()
535535

536536
tracer, _, _, stop := startTestTracer(t, WithServiceName("my-service"), WithEnv("my-env"))
537537
defer stop()
@@ -553,7 +553,7 @@ func TestOnRemoteConfigUpdate(t *testing.T) {
553553

554554
t.Run("Env mismatch", func(t *testing.T) {
555555
telemetryClient := new(telemetrytest.RecordClient)
556-
defer testTelemetryClient(telemetryClient)()
556+
defer telemetry.MockClient(telemetryClient)()
557557

558558
tracer, _, _, stop := startTestTracer(t, WithServiceName("my-service"), WithEnv("my-env"))
559559
defer stop()
@@ -575,7 +575,7 @@ func TestOnRemoteConfigUpdate(t *testing.T) {
575575

576576
t.Run("DD_TAGS=key0:val0,key1:val1, WithGlobalTag=key2:val2 and RC tags = key3:val3,key4:val4", func(t *testing.T) {
577577
telemetryClient := new(telemetrytest.RecordClient)
578-
defer testTelemetryClient(telemetryClient)()
578+
defer telemetry.MockClient(telemetryClient)()
579579

580580
t.Setenv("DD_TAGS", "key0:val0,key1:val1")
581581
tracer, _, _, stop := startTestTracer(
@@ -638,7 +638,7 @@ func TestOnRemoteConfigUpdate(t *testing.T) {
638638
t.Run("Deleted config", func(t *testing.T) {
639639
defer globalconfig.ClearHeaderTags()
640640
telemetryClient := new(telemetrytest.RecordClient)
641-
defer testTelemetryClient(telemetryClient)()
641+
defer telemetry.MockClient(telemetryClient)()
642642

643643
t.Setenv("DD_TRACE_SAMPLE_RATE", "0.1")
644644
t.Setenv("DD_TRACE_HEADER_TAGS", "X-Test-Header:my-tag-from-env")

‎ddtrace/tracer/spancontext_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ func TestPartialFlush(t *testing.T) {
174174
t.Run("WithFlush", func(t *testing.T) {
175175
telemetryClient := new(telemetrytest.RecordClient)
176176
telemetryClient.ProductStarted(telemetry.NamespaceTracers)
177-
defer testTelemetryClient(telemetryClient)()
177+
defer telemetry.MockClient(telemetryClient)()
178178
tracer, transport, flush, stop := startTestTracer(t)
179179
defer stop()
180180

‎ddtrace/tracer/telemetry_test.go

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,10 @@ import (
1717
"github.com/stretchr/testify/assert"
1818
)
1919

20-
func testTelemetryClient(client telemetry.Client) func() {
21-
orig := telemetry.GlobalClient()
22-
telemetry.SwapClient(client)
23-
return func() {
24-
telemetry.SwapClient(orig)
25-
}
26-
}
27-
2820
func TestTelemetryEnabled(t *testing.T) {
2921
t.Run("tracer start", func(t *testing.T) {
3022
telemetryClient := new(telemetrytest.RecordClient)
31-
defer testTelemetryClient(telemetryClient)()
23+
defer telemetry.MockClient(telemetryClient)()
3224

3325
Start(
3426
WithDebugMode(true),
@@ -80,7 +72,7 @@ func TestTelemetryEnabled(t *testing.T) {
8072
rule.Provenance = prov
8173

8274
telemetryClient := new(telemetrytest.RecordClient)
83-
defer testTelemetryClient(telemetryClient)()
75+
defer telemetry.MockClient(telemetryClient)()
8476
Start(WithService("test-serv"),
8577
WithSamplingRules([]SamplingRule{rule}),
8678
)
@@ -105,7 +97,7 @@ func TestTelemetryEnabled(t *testing.T) {
10597
}
10698

10799
telemetryClient := new(telemetrytest.RecordClient)
108-
defer testTelemetryClient(telemetryClient)()
100+
defer telemetry.MockClient(telemetryClient)()
109101
Start(WithService("test-serv"),
110102
WithSamplingRules(rules),
111103
)
@@ -121,7 +113,7 @@ func TestTelemetryEnabled(t *testing.T) {
121113

122114
t.Run("tracer start with empty rules", func(t *testing.T) {
123115
telemetryClient := new(telemetrytest.RecordClient)
124-
defer testTelemetryClient(telemetryClient)()
116+
defer telemetry.MockClient(telemetryClient)()
125117

126118
t.Setenv("DD_TRACE_SAMPLING_RULES", "")
127119
t.Setenv("DD_SPAN_SAMPLING_RULES", "")
@@ -141,7 +133,7 @@ func TestTelemetryEnabled(t *testing.T) {
141133

142134
t.Run("profiler start, tracer start", func(t *testing.T) {
143135
telemetryClient := new(telemetrytest.RecordClient)
144-
defer testTelemetryClient(telemetryClient)()
136+
defer telemetry.MockClient(telemetryClient)()
145137
profiler.Start()
146138
defer profiler.Stop()
147139
Start(
@@ -153,7 +145,7 @@ func TestTelemetryEnabled(t *testing.T) {
153145
})
154146
t.Run("orchestrion telemetry", func(t *testing.T) {
155147
telemetryClient := new(telemetrytest.RecordClient)
156-
defer testTelemetryClient(telemetryClient)()
148+
defer telemetry.MockClient(telemetryClient)()
157149

158150
Start(WithOrchestrion(map[string]string{"k1": "v1", "k2": "v2"}))
159151
defer Stop()

‎internal/civisibility/utils/telemetry/telemetry_distribution.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ func CodeCoverageFiles(value float64) {
8686
telemetry.Distribution(telemetry.NamespaceCIVisibility, "code_coverage.files", nil).Submit(value)
8787
}
8888

89-
// EarlyFlakeDetectionRequestMs records the time it takes to get the response of the early flake detection endpoint request in ms by CI Visibility.
90-
func EarlyFlakeDetectionRequestMs(value float64) {
91-
telemetry.GlobalClient.Record(telemetry.NamespaceCiVisibility, telemetry.MetricKindDist, "early_flake_detection.request_ms", value, nil, true)
89+
// KnownTestsRequestMs records the time it takes to get the response of the known tests endpoint request in ms by CI Visibility.
90+
func KnownTestsRequestMs(value float64) {
91+
telemetry.Distribution(telemetry.NamespaceCIVisibility, "known_tests.request_ms", nil).Submit(value)
9292
}
9393

9494
// KnownTestsResponseBytes records the number of bytes received by the endpoint. Tagged with a boolean flag set to true if response body is compressed.

0 commit comments

Comments
 (0)