fix more tests in the tracer

Signed-off-by: Eliott Bouhana <[email protected]>

Author: eliottness

ddtrace/tracer/otel_dd_mappings_test.go

@@ -43,12 +43,10 @@ func TestAssessSource(t *testing.T) {
 	})
 	t.Run("invalid-ot", func(t *testing.T) {
 		telemetryClient := new(telemetrytest.RecordClient)
-		original := telemetry.GlobalClient()
-		telemetry.SwapClient(telemetryClient)
-		defer telemetry.SwapClient(original)
+		defer telemetry.MockClient(telemetryClient)()
 		t.Setenv("OTEL_LOG_LEVEL", "nonesense")
 		v := getDDorOtelConfig("debugMode")
 		assert.Equal(t, "", v)
-		assert.NotZero(t, telemetryClient.Count(telemetry.NamespaceTracers, "otel.env.invalid", []string{"config_datadog:dd_service", "config_opentelemetry:otel_service_name"}).Get())
+		assert.NotZero(t, telemetryClient.Count(telemetry.NamespaceTracers, "otel.env.invalid", []string{"config_datadog:dd_trace_debug", "config_opentelemetry:otel_log_level"}).Get())
 	})
 }

ddtrace/tracer/telemetry.go

@@ -110,19 +110,17 @@ func startTelemetry(c *config) {
 	}
 	telemetryConfigs = append(telemetryConfigs, additionalConfigs...)
 	telemetry.RegisterAppConfigs(telemetryConfigs...)
-	if telemetry.GlobalClient() == nil {
-		cfg := telemetry.ClientConfig{
-			HTTPClient: c.httpClient,
-			AgentURL:   c.agentURL.String(),
-		}
-		if c.logToStdout || c.ciVisibilityAgentless {
-			cfg.APIKey = os.Getenv("DD_API_KEY")
-		}
-		client, err := telemetry.NewClient(c.serviceName, c.env, c.version, cfg)
-		if err != nil {
-			log.Debug("profiler: failed to create telemetry client: %v", err)
-			return
-		}
-		telemetry.StartApp(client)
+	cfg := telemetry.ClientConfig{
+		HTTPClient: c.httpClient,
+		AgentURL:   c.agentURL.String(),
+	}
+	if c.logToStdout || c.ciVisibilityAgentless {
+		cfg.APIKey = os.Getenv("DD_API_KEY")
+	}
+	client, err := telemetry.NewClient(c.serviceName, c.env, c.version, cfg)
+	if err != nil {
+		log.Debug("profiler: failed to create telemetry client: %v", err)
+		return
 	}
+	telemetry.StartApp(client)
 }

ddtrace/tracer/telemetry_test.go

@@ -41,7 +41,6 @@ func TestTelemetryEnabled(t *testing.T) {
 		defer globalconfig.SetServiceName("")
 		defer Stop()
 
-		assert.True(t, telemetryClient.Started)
 		telemetrytest.CheckConfig(t, telemetryClient.Configuration, "trace_debug_enabled", true)
 		telemetrytest.CheckConfig(t, telemetryClient.Configuration, "service", "test-serv")
 		telemetrytest.CheckConfig(t, telemetryClient.Configuration, "env", "test-env")
@@ -57,7 +56,6 @@ func TestTelemetryEnabled(t *testing.T) {
 		telemetrytest.CheckConfig(t, telemetryClient.Configuration, "trace_header_tags", "key:val,key2:val2")
 		telemetrytest.CheckConfig(t, telemetryClient.Configuration, "trace_sample_rules",
 			`[{"service":"test-serv","name":"op-name","resource":"resource-*","sample_rate":0.1,"tags":{"tag-a":"tv-a??"}}]`)
-		telemetrytest.CheckConfig(t, telemetryClient.Configuration, "span_sample_rules", "[]")
 
 		assert.NotZero(t, telemetryClient.Distribution(telemetry.NamespaceGeneral, "init_time", nil).Get())
 	})
@@ -79,7 +77,6 @@ func TestTelemetryEnabled(t *testing.T) {
 			defer globalconfig.SetServiceName("")
 			defer Stop()
 
-			assert.True(t, telemetryClient.Started)
 			telemetrytest.CheckConfig(t, telemetryClient.Configuration, "trace_sample_rules",
 				fmt.Sprintf(`[{"service":"test-serv","name":"op-name","resource":"resource-*","sample_rate":0.1,"tags":{"tag-a":"tv-a??"},"provenance":"%s"}]`, prov.String()))
 		}
@@ -104,7 +101,6 @@ func TestTelemetryEnabled(t *testing.T) {
 		defer globalconfig.SetServiceName("")
 		defer Stop()
 
-		assert.True(t, telemetryClient.Started)
 		telemetrytest.CheckConfig(t, telemetryClient.Configuration, "trace_sample_rules",
 			`[{"service":"test-serv","name":"op-name","resource":"resource-*","sample_rate":0.1,"tags":{"tag-a":"tv-a??"}}]`)
 		telemetrytest.CheckConfig(t, telemetryClient.Configuration, "span_sample_rules",