call the telemetry client last

Signed-off-by: Eliott Bouhana <[email protected]>
DataDog · Feb 3, 2025 · d0c6e95 · d0c6e95
1 parent 66606bf
commit d0c6e95
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 27 deletions.
diff --git a/ddtrace/tracer/telemetry.go b/ddtrace/tracer/telemetry.go
@@ -34,21 +34,6 @@ func startTelemetry(c *config) {
 		return
 	}
 
-	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)
-	}
 	telemetry.ProductStarted(telemetry.NamespaceTracers)
 	telemetryConfigs := []telemetry.Configuration{
 		{Name: "trace_debug_enabled", Value: c.debug},
@@ -125,4 +110,19 @@ 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)
+	}
 }
diff --git a/profiler/telemetry.go b/profiler/telemetry.go
@@ -25,18 +25,6 @@ func startTelemetry(c *config) {
 		_, ok := c.types[t]
 		return ok
 	}
-	if telemetry.GlobalClient() == nil {
-		client, err := telemetry.NewClient(c.service, c.env, c.version, telemetry.ClientConfig{
-			HTTPClient: c.httpClient,
-			APIKey:     c.apiKey,
-			AgentURL:   c.agentURL,
-		})
-		if err != nil {
-			log.Debug("profiler: failed to create telemetry client: %v", err)
-			return
-		}
-		telemetry.StartApp(client)
-	}
 	telemetry.ProductStarted(telemetry.NamespaceProfilers)
 	telemetry.RegisterAppConfigs(
 		[]telemetry.Configuration{
@@ -64,4 +52,16 @@ func startTelemetry(c *config) {
 			{Name: "flush_on_exit", Value: c.flushOnExit},
 		}...,
 	)
+	if telemetry.GlobalClient() == nil {
+		client, err := telemetry.NewClient(c.service, c.env, c.version, telemetry.ClientConfig{
+			HTTPClient: c.httpClient,
+			APIKey:     c.apiKey,
+			AgentURL:   c.agentURL,
+		})
+		if err != nil {
+			log.Debug("profiler: failed to create telemetry client: %v", err)
+			return
+		}
+		telemetry.StartApp(client)
+	}
 }