From cd4ce84cc4171a634435992f2eaff75b5a02f070 Mon Sep 17 00:00:00 2001
From: Andrew Lock <andrew.lock@datadoghq.com>
Date: Tue, 19 Sep 2023 23:42:10 +0100
Subject: [PATCH] Enable v2 telemetry by default (#4638)

---
 .../Telemetry/TelemetrySettings.cs            | 10 ++--------
 .../Telemetry/TelemetrySettingsTests.cs       | 19 ++-----------------
 2 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/tracer/src/Datadog.Trace/Telemetry/TelemetrySettings.cs b/tracer/src/Datadog.Trace/Telemetry/TelemetrySettings.cs
index 7610641bb29f..33a934d528a3 100644
--- a/tracer/src/Datadog.Trace/Telemetry/TelemetrySettings.cs
+++ b/tracer/src/Datadog.Trace/Telemetry/TelemetrySettings.cs
@@ -144,18 +144,12 @@ public static TelemetrySettings FromSource(IConfigurationSource source, IConfigu
 
             var dependencyCollectionEnabled = config.WithKeys(ConfigurationKeys.Telemetry.DependencyCollectionEnabled).AsBool(true);
 
-            var isRunningInAzureAppService = config
-                                        .WithKeys(ConfigurationKeys.AzureAppService.AzureAppServicesContextKey)
-                                        .AsBool(false);
-
-            // Currently enabled by default in AAS, will be flipped to true for all in later versions as part of the rollout
-            var v2Enabled = config.WithKeys(ConfigurationKeys.Telemetry.V2Enabled).AsBool(defaultValue: isRunningInAzureAppService);
+            var v2Enabled = config.WithKeys(ConfigurationKeys.Telemetry.V2Enabled).AsBool(defaultValue: true);
 
             // For testing purposes only
             var debugEnabled = config.WithKeys(ConfigurationKeys.Telemetry.DebugEnabled).AsBool(false);
 
-            // Currently disabled, will be flipped to true in later versions as part of the rollout
-            // Also, will require v2 enabled
+            // Requires v2 enabled
             bool metricsEnabled;
             if (isServerless)
             {
diff --git a/tracer/test/Datadog.Trace.Tests/Telemetry/TelemetrySettingsTests.cs b/tracer/test/Datadog.Trace.Tests/Telemetry/TelemetrySettingsTests.cs
index f0493b217a7e..8368716c098e 100644
--- a/tracer/test/Datadog.Trace.Tests/Telemetry/TelemetrySettingsTests.cs
+++ b/tracer/test/Datadog.Trace.Tests/Telemetry/TelemetrySettingsTests.cs
@@ -294,29 +294,14 @@ public void HeartbeatInterval(string value, double expected)
             settings.HeartbeatInterval.Should().Be(TimeSpan.FromSeconds(expected));
         }
 
-        [Theory]
-        [InlineData("0", false)]
-        [InlineData(null, false)]
-        [InlineData("", false)]
-        [InlineData("1", true)]
-        public void V2Enabled_DisabledByDefault(string value, bool expected)
-        {
-            var source = CreateConfigurationSource((ConfigurationKeys.Telemetry.V2Enabled, value));
-            var settings = TelemetrySettings.FromSource(source, NullConfigurationTelemetry.Instance, () => true, isServerless: false);
-
-            settings.V2Enabled.Should().Be(expected);
-        }
-
         [Theory]
         [InlineData("0", false)]
         [InlineData(null, true)]
         [InlineData("", true)]
         [InlineData("1", true)]
-        public void V2Enabled_EnabledByDefaultInAas(string value, bool expected)
+        public void V2Enabled_EnabledByDefault(string value, bool expected)
         {
-            var source = CreateConfigurationSource(
-                (ConfigurationKeys.AzureAppService.AzureAppServicesContextKey, "1"),
-                (ConfigurationKeys.Telemetry.V2Enabled, value));
+            var source = CreateConfigurationSource((ConfigurationKeys.Telemetry.V2Enabled, value));
             var settings = TelemetrySettings.FromSource(source, NullConfigurationTelemetry.Instance, () => true, isServerless: false);
 
             settings.V2Enabled.Should().Be(expected);