From 48ea87bfc6e232c05016878a8b89c198dc3e7148 Mon Sep 17 00:00:00 2001
From: Mikayla Toffler <mikayla.toffler@datadoghq.com>
Date: Mon, 16 Sep 2024 16:58:18 -0400
Subject: [PATCH] Report telemetry for 'config consistency' config items

---
 ddtrace/tracer/rules_sampler.go |  4 ++++
 ddtrace/tracer/telemetry.go     | 10 +++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/ddtrace/tracer/rules_sampler.go b/ddtrace/tracer/rules_sampler.go
index 2cd911e3f7..037e393642 100644
--- a/ddtrace/tracer/rules_sampler.go
+++ b/ddtrace/tracer/rules_sampler.go
@@ -19,6 +19,7 @@ import (
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/ext"
 	"gopkg.in/DataDog/dd-trace-go.v1/internal/log"
 	"gopkg.in/DataDog/dd-trace-go.v1/internal/samplernames"
+	"gopkg.in/DataDog/dd-trace-go.v1/internal/telemetry"
 
 	"golang.org/x/time/rate"
 )
@@ -533,6 +534,7 @@ const defaultRateLimit = 100.0
 // The limit is DD_TRACE_RATE_LIMIT if set, `defaultRateLimit` otherwise.
 func newRateLimiter() *rateLimiter {
 	limit := defaultRateLimit
+	origin := telemetry.OriginDefault
 	v := os.Getenv("DD_TRACE_RATE_LIMIT")
 	if v != "" {
 		l, err := strconv.ParseFloat(v, 64)
@@ -542,9 +544,11 @@ func newRateLimiter() *rateLimiter {
 			log.Warn("DD_TRACE_RATE_LIMIT negative, using default value %f", limit)
 		} else {
 			// override the default limit
+			origin = telemetry.OriginEnvVar
 			limit = l
 		}
 	}
+	reportTelemetryOnAppStarted(telemetry.Configuration{Name: "trace_rate_limit", Value: limit, Origin: origin})
 	return &rateLimiter{
 		limiter:  rate.NewLimiter(rate.Limit(limit), int(math.Ceil(limit))),
 		prevTime: time.Now(),
diff --git a/ddtrace/tracer/telemetry.go b/ddtrace/tracer/telemetry.go
index 3f9a7d2f33..3fa70b4e92 100644
--- a/ddtrace/tracer/telemetry.go
+++ b/ddtrace/tracer/telemetry.go
@@ -12,6 +12,12 @@ import (
 	"gopkg.in/DataDog/dd-trace-go.v1/internal/telemetry"
 )
 
+var additionalConfigs []telemetry.Configuration
+
+func reportTelemetryOnAppStarted(c telemetry.Configuration) {
+	additionalConfigs = append(additionalConfigs, c)
+}
+
 // startTelemetry starts the global instrumentation telemetry client with tracer data
 // unless instrumentation telemetry is disabled via the DD_INSTRUMENTATION_TELEMETRY_ENABLED
 // env var.
@@ -44,7 +50,8 @@ func startTelemetry(c *config) {
 		{Name: "service", Value: c.serviceName},
 		{Name: "universal_version", Value: c.universalVersion},
 		{Name: "env", Value: c.env},
-		{Name: "agent_url", Value: c.agentURL.String()},
+		{Name: "version", Value: c.version},
+		{Name: "trace_agent_url", Value: c.agentURL.String()},
 		{Name: "agent_hostname", Value: c.hostname},
 		{Name: "runtime_metrics_enabled", Value: c.runtimeMetrics},
 		{Name: "dogstatsd_addr", Value: c.dogstatsdAddr},
@@ -102,5 +109,6 @@ func startTelemetry(c *config) {
 			telemetryConfigs = append(telemetryConfigs, telemetry.Configuration{Name: "orchestrion_" + k, Value: v})
 		}
 	}
+	telemetryConfigs = append(telemetryConfigs, additionalConfigs...)
 	telemetry.GlobalClient.ProductChange(telemetry.NamespaceTracers, true, telemetryConfigs)
 }