Fix tests

Author: RomainMuller

ddtrace/tracer/telemetry.go

@@ -121,7 +121,7 @@ func startTelemetry(c *config) {
 		}
 		telemetry.GlobalClient.Count(
 			telemetry.NamespaceTracers,
-			"orchestrion_usage", 1,
+			"orchestrion.enabled", 1,
 			tags,
 			false, // Go-specific
 		)

ddtrace/tracer/telemetry_test.go

@@ -154,19 +154,17 @@ func TestTelemetryEnabled(t *testing.T) {
 		telemetryClient := new(telemetrytest.MockClient)
 		defer telemetry.MockGlobalClient(telemetryClient)()
 
-		telemetryClient.On("Count",
-			telemetry.NamespaceTracers,
-			"orchestrion_usage", 1.0,
-			[]string{"k1:v1", "k2:v2"},
-			false,
-		).Return()
-
 		Start(WithOrchestrion(map[string]string{"k1": "v1", "k2": "v2"}))
 		defer Stop()
 
 		telemetry.Check(t, telemetryClient.Configuration, "orchestrion_enabled", true)
 		telemetry.Check(t, telemetryClient.Configuration, "orchestrion_k1", "v1")
 		telemetry.Check(t, telemetryClient.Configuration, "orchestrion_k2", "v2")
-		telemetryClient.AssertExpectations(t)
+		telemetryClient.AssertCalled(t, "Count",
+			telemetry.NamespaceTracers,
+			"orchestrion.enabled", 1.0,
+			[]string{"k1:v1", "k2:v2"},
+			false,
+		)
 	})
 }

internal/telemetry/telemetrytest/telemetrytest.go

@@ -75,13 +75,17 @@ func (c *MockClient) Record(ns telemetry.Namespace, _ telemetry.MetricKind, name
 	_ = c.Called(ns, name, val, tags, common)
 	// record the val for tests that assert based on the value
 	if _, ok := c.Metrics[ns]; !ok {
+		if c.Metrics == nil {
+			c.Metrics = make(map[telemetry.Namespace]map[string]float64)
+		}
 		c.Metrics[ns] = map[string]float64{}
 	}
 	c.Metrics[ns][name] = val
 }
 
 // Count counts the value for the given metric
 func (c *MockClient) Count(ns telemetry.Namespace, name string, val float64, tags []string, common bool) {
+	c.On("Count", ns, name, val, tags, common).Return()
 	_ = c.Called(ns, name, val, tags, common)
 }