[Tracing] Update the default value of DD_TRACE_128_BIT_TRACEID_LOGGING_ENABLED to true

tracer/src/Datadog.Trace/Configuration/ConfigurationKeys.cs

@@ -793,8 +793,11 @@ internal static class FeatureFlags
             /// <summary>
             /// Enables injecting 128-bit trace ids into logs as a hexadecimal string.
             /// If disabled, 128-bit trace ids will be truncated to the lower 64 bits,
-            /// and all trace ids will be injected as decimal strings
-            /// Default value is <c>false</c> (disabled).
+            /// and injected as decimal strings. 64-bit trace ids are
+            /// always injected as decimal strings, regardless of this setting.
+            /// Default value is <c>true</c> (enabled).
+            /// If <see cref="ConfigurationKeys.FeatureFlags.TraceId128BitGenerationEnabled"/> is set to <c>false</c>,
+            /// this setting will also be set to <c>false</c>.
             /// </summary>
             public const string TraceId128BitLoggingEnabled = "DD_TRACE_128_BIT_TRACEID_LOGGING_ENABLED";
 

tracer/src/Datadog.Trace/Configuration/TracerSettings.cs

@@ -664,7 +664,7 @@ _ when x.ToBoolean() is { } boolean => boolean,
                                             .AsBool(true);
             TraceId128BitLoggingEnabled = config
                                          .WithKeys(ConfigurationKeys.FeatureFlags.TraceId128BitLoggingEnabled)
-                                         .AsBool(false);
+                                         .AsBool(TraceId128BitGenerationEnabled);
 
             CommandsCollectionEnabled = config
                                        .WithKeys(ConfigurationKeys.FeatureFlags.CommandsCollectionEnabled)

tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/LogsInjectionTestBase.cs

@@ -97,7 +97,7 @@ public void ValidateLogCorrelation(
             string packageVersion = "",
             bool disableLogCorrelation = false,
             Func<string, bool> additionalInjectedLogFilter = null,
-            bool use128Bits = false)
+            bool use128Bits = true)
         {
             foreach (var test in logFileTestCases)
             {

tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/VersionConflict/ILoggerVersionConflict2xTests.cs

@@ -30,6 +30,13 @@ public ILoggerVersionConflict2xTests(ITestOutputHelper output)
         {
             SetServiceVersion("1.0.0");
             SetEnvironmentVariable("DD_LOGS_INJECTION", "true");
+
+            // When doing log injection for CI, only emit 64-bit trace-ids.
+            // By default, the version conflict results in both 64-bit trace-ids
+            // and 128-bit trace-ids, which complicates the log correlation validation.
+            // If we can remove the netcoreapp2.1 test application, then we can remove this
+            // and start root spans with the automatic tracer so that we always generate 128-bit trace-ids.
+            SetEnvironmentVariable("DD_TRACE_128_BIT_TRACEID_LOGGING_ENABLED", "false");
         }
 
         [SkippableFact]
@@ -58,7 +65,7 @@ public async Task InjectsLogs()
                 var spans = agent.WaitForSpans(1, 2500);
                 spans.Should().HaveCountGreaterOrEqualTo(1);
 
-                ValidateLogCorrelation(spans, _logFiles, expectedCorrelatedTraceCount, expectedCorrelatedSpanCount);
+                ValidateLogCorrelation(spans, _logFiles, expectedCorrelatedTraceCount, expectedCorrelatedSpanCount, use128Bits: false);
             }
         }
     }

tracer/test/Datadog.Trace.ClrProfiler.Managed.Tests/AutoInstrumentation/Logging/ILogger/DatadogLoggingScopeTests.cs

@@ -1,4 +1,4 @@
-// <copyright file="DatadogLoggingScopeTests.cs" company="Datadog">
+// <copyright file="DatadogLoggingScopeTests.cs" company="Datadog">
 // Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2 License.
 // This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2017 Datadog, Inc.
 // </copyright>
@@ -50,7 +50,7 @@ public void OutputsJsonFormattedStringWhenActiveTrace()
 
             var actual = scope.ToString();
 
-            var expected = @$"dd_service:""TestService"", dd_env:""test"", dd_version:""1.2.3"", dd_trace_id:""{spanScope.Span.TraceId}"", dd_span_id:""{spanScope.Span.SpanId}""";
+            var expected = @$"dd_service:""TestService"", dd_env:""test"", dd_version:""1.2.3"", dd_trace_id:""{((Span)spanScope.Span).TraceId128}"", dd_span_id:""{spanScope.Span.SpanId}""";
             actual.Should().Be(expected);
         }
     }

tracer/test/Datadog.Trace.Tests/Configuration/ConfigurationSourceTests.cs

@@ -90,7 +90,7 @@ public ConfigurationSourceTests()
             yield return (s => s.ServiceNameMappings, new string[0]);
 
             yield return (s => s.TraceId128BitGenerationEnabled, true);
-            yield return (s => s.TraceId128BitLoggingEnabled, false);
+            yield return (s => s.TraceId128BitLoggingEnabled, true);
         }
 
         public static IEnumerable<(string Key, string Value, Func<TracerSettings, object> Getter, object Expected)> GetBreakingChangeTestData()

tracer/test/Datadog.Trace.Tests/Configuration/TracerSettingsTests.cs

@@ -1050,10 +1050,13 @@ public void TraceId128BitGenerationEnabled(string value, bool expected)
             var settings = new TracerSettings(source);
 
             settings.TraceId128BitGenerationEnabled.Should().Be(expected);
+
+            // Additional behavior: Ensure that TraceId128BitLoggingEnabled is configured to the same value as TraceId128BitGenerationEnabled
+            settings.TraceId128BitLoggingEnabled.Should().Be(expected);
         }
 
         [Theory]
-        [MemberData(nameof(BooleanTestCases), false)]
+        [MemberData(nameof(BooleanTestCases), true)]
         public void TraceId128BitLoggingEnabled(string value, bool expected)
         {
             var source = CreateConfigurationSource((ConfigurationKeys.FeatureFlags.TraceId128BitLoggingEnabled, value));

tracer/test/test-applications/integrations/dependency-libs/LogsInjectionHelper.VersionConflict/LoggingMethods.cs

@@ -17,56 +17,68 @@ public static int RunLoggingProcedure(Action<string> logAction)
         {
             try
             {
-                logAction($"{ExcludeMessagePrefix}Starting manual1 Datadog scope.");
-                using (Tracer.Instance.StartActive("manual1"))
+                logAction($"{ExcludeMessagePrefix}Starting scopes.");
+
+                // Start a trace using the latest automatic tracer so that we
+                // automatically create a 128-bit trace-id and properly set the _dd.p.tid tag.
+                // This is only done to make the testing logic easier, since all of the trace-id's
+                // will have 128-bit trace-id's.
+                //
+                // Note: This is not necessary for real applications, as the backend will still be able to
+                // correlate the 64-bit trace-id's from the manual side and the 128-bit trace-id's
+                // from the automatic side.
+                using (TracerUtils.StartAutomaticTraceHigherAssemblyVersion("automatic0"))
                 {
-                    logAction($"Trace: manual1");
-                    using (TracerUtils.StartAutomaticTraceHigherAssemblyVersion("automatic2"))
+                    using (Tracer.Instance.StartActive("manual1"))
                     {
-                        logAction($"Trace: manual1-automatic2");
-                        using (Tracer.Instance.StartActive("manual3"))
+                        logAction($"Trace: manual1");
+                        using (TracerUtils.StartAutomaticTraceHigherAssemblyVersion("automatic2"))
                         {
-                            logAction($"Trace: manual1-automatic2-manual3");
-                            using (Tracer.Instance.StartActive("manual4"))
+                            logAction($"Trace: manual1-automatic2");
+                            using (Tracer.Instance.StartActive("manual3"))
                             {
-                                logAction($"Trace: manual1-automatic2-manual3-manual4");
-
-                                using (TracerUtils.StartAutomaticTraceHigherAssemblyVersion("automatic5"))
+                                logAction($"Trace: manual1-automatic2-manual3");
+                                using (Tracer.Instance.StartActive("manual4"))
                                 {
-                                    logAction($"Trace: manual1-automatic2-manual3-manual4-automatic5");
-                                }
+                                    logAction($"Trace: manual1-automatic2-manual3-manual4");
 
-                                logAction($"Trace: manual1-automatic2-manual3-manual4");
-                            }
+                                    using (TracerUtils.StartAutomaticTraceHigherAssemblyVersion("automatic5"))
+                                    {
+                                        logAction($"Trace: manual1-automatic2-manual3-manual4-automatic5");
+                                    }
 
-                            logAction($"Trace: manual1-automatic2-manual3");
+                                    logAction($"Trace: manual1-automatic2-manual3-manual4");
+                                }
 
-                            using (TracerUtils.StartAutomaticTraceHigherAssemblyVersion("automatic4"))
-                            {
-                                logAction($"Trace: manual1-automatic2-manual3-automatic4");
-                                using (TracerUtils.StartAutomaticTraceHigherAssemblyVersion("automatic5"))
+                                logAction($"Trace: manual1-automatic2-manual3");
+
+                                using (TracerUtils.StartAutomaticTraceHigherAssemblyVersion("automatic4"))
                                 {
-                                    logAction($"Trace: manual1-automatic2-manual3-automatic4-automatic5");
-                                    using (Tracer.Instance.StartActive("manual6"))
+                                    logAction($"Trace: manual1-automatic2-manual3-automatic4");
+                                    using (TracerUtils.StartAutomaticTraceHigherAssemblyVersion("automatic5"))
                                     {
-                                        logAction($"Trace: manual1-automatic2-manual3-automatic4-automatic5-manual6");
+                                        logAction($"Trace: manual1-automatic2-manual3-automatic4-automatic5");
+                                        using (Tracer.Instance.StartActive("manual6"))
+                                        {
+                                            logAction($"Trace: manual1-automatic2-manual3-automatic4-automatic5-manual6");
+                                        }
+
+                                        logAction($"Trace: manual1-automatic2-manual3-automatic4-automatic5");
                                     }
 
-                                    logAction($"Trace: manual1-automatic2-manual3-automatic4-automatic5");
+                                    logAction($"Trace: manual1-automatic2-manual3-automatic4");
                                 }
 
-                                logAction($"Trace: manual1-automatic2-manual3-automatic4");
+                                logAction($"Trace: manual1-automatic2-manual3");
                             }
-
-                            logAction($"Trace: manual1-automatic2-manual3");
+                            logAction($"Trace: manual1-automatic2");
                         }
-                        logAction($"Trace: manual1-automatic2");
-                    }
 
-                    logAction($"Trace: manual1");
+                        logAction($"Trace: manual1");
+                    }
                 }
 
-                logAction($"{ExcludeMessagePrefix}Exited manual1 Datadog scope.");
+                logAction($"{ExcludeMessagePrefix}Exited scopes.");
             }
             catch (Exception ex)
             {