Maximo/hotfix patch 3.26.2 (#7518)

## Summary of changes
Trying to release fixes for telemetry and Statsd:

- #7503
- #7507
- #7512

---------

Co-authored-by: Ganesh Jangir <[email protected]>
Co-authored-by: Tony Redondo <[email protected]>

Author: 3 people

tracer/build/_build/Build.Shared.Steps.cs

@@ -166,7 +166,15 @@ partial class Build
             var buildDirectory = NativeBuildDirectory + "_" + finalArchs.Replace(';', '_');
             EnsureExistingDirectory(buildDirectory);
 
-            var envVariables = new Dictionary<string, string> { ["CMAKE_OSX_ARCHITECTURES"] = finalArchs };
+            var envVariables = new Dictionary<string, string>
+            {
+                ["HOME"] = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
+                ["PATH"] = Environment.GetEnvironmentVariable("PATH"),
+                ["CMAKE_OSX_ARCHITECTURES"] = finalArchs,
+                ["CMAKE_MAKE_PROGRAM"] = "make",
+                ["CMAKE_CXX_COMPILER"] = "clang++",
+                ["CMAKE_C_COMPILER"] = "clang",
+            };
 
             // Build native
             CMake.Value(

tracer/build/_build/Build.Steps.cs

@@ -356,8 +356,12 @@ bool RequiresThoroughTesting()
 
             var envVariables = new Dictionary<string, string>
             {
+                ["HOME"] = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
+                ["PATH"] = Environment.GetEnvironmentVariable("PATH"),
                 ["CMAKE_OSX_ARCHITECTURES"] = finalArchs,
-                ["PATH"] = Environment.GetEnvironmentVariable("PATH")
+                ["CMAKE_MAKE_PROGRAM"] = "make",
+                ["CMAKE_CXX_COMPILER"] = "clang++",
+                ["CMAKE_C_COMPILER"] = "clang",
             };
 
             // Build native

tracer/src/Datadog.Trace/RuntimeMetrics/AzureAppServicePerformanceCounters.cs

@@ -6,6 +6,7 @@
 #if NETFRAMEWORK
 
 using System;
+using System.Threading;
 using Datadog.Trace.Logging;
 using Datadog.Trace.Util;
 using Datadog.Trace.Vendors.Newtonsoft.Json;
@@ -19,7 +20,7 @@ internal class AzureAppServicePerformanceCounters : IRuntimeMetricsListener
         private const string GarbageCollectionMetrics = $"{MetricsNames.Gen0HeapSize}, {MetricsNames.Gen1HeapSize}, {MetricsNames.Gen2HeapSize}, {MetricsNames.LohSize}, {MetricsNames.Gen0CollectionsCount}, {MetricsNames.Gen1CollectionsCount}, {MetricsNames.Gen2CollectionsCount}";
 
         private static readonly IDatadogLogger Log = DatadogLogging.GetLoggerFor<AzureAppServicePerformanceCounters>();
-        private readonly IDogStatsd _statsd;
+        private IDogStatsd _statsd;
 
         private int? _previousGen0Count;
         private int? _previousGen1Count;
@@ -70,6 +71,11 @@ public void Refresh()
             Log.Debug("Sent the following metrics to the DD agent: {Metrics}", GarbageCollectionMetrics);
         }
 
+        public void UpdateStatsd(IDogStatsd statsd)
+        {
+            Interlocked.Exchange(ref _statsd, statsd);
+        }
+
         private class PerformanceCountersValue
         {
             [JsonProperty("gen0HeapSize")]

tracer/src/Datadog.Trace/RuntimeMetrics/IRuntimeMetricsListener.cs

@@ -4,11 +4,14 @@
 // </copyright>
 
 using System;
+using Datadog.Trace.Vendors.StatsdClient;
 
 namespace Datadog.Trace.RuntimeMetrics
 {
     internal interface IRuntimeMetricsListener : IDisposable
     {
         void Refresh();
+
+        void UpdateStatsd(IDogStatsd statsd);
     }
 }

tracer/src/Datadog.Trace/RuntimeMetrics/MemoryMappedCounters.cs

@@ -8,6 +8,7 @@
 using System;
 using System.IO.MemoryMappedFiles;
 using System.Runtime.InteropServices;
+using System.Threading;
 using Datadog.Trace.Logging;
 using Datadog.Trace.Util;
 using Datadog.Trace.Vendors.StatsdClient;
@@ -20,9 +21,10 @@ internal class MemoryMappedCounters : IRuntimeMetricsListener
 
         private static readonly IDatadogLogger Log = DatadogLogging.GetLoggerFor<MemoryMappedCounters>();
 
-        private readonly IDogStatsd _statsd;
         private readonly int _processId;
 
+        private IDogStatsd _statsd;
+
         private int? _previousGen0Count;
         private int? _previousGen1Count;
         private int? _previousGen2Count;
@@ -172,6 +174,11 @@ public void Refresh()
             Log.Debug("Sent the following metrics to the DD agent: {Metrics}", GarbageCollectionMetrics);
         }
 
+        public void UpdateStatsd(IDogStatsd statsd)
+        {
+            Interlocked.Exchange(ref _statsd, statsd);
+        }
+
         [StructLayout(LayoutKind.Sequential)]
         private readonly struct TRICOUNT
         {

tracer/src/Datadog.Trace/RuntimeMetrics/PerformanceCountersListener.cs

@@ -7,6 +7,7 @@
 using System;
 using System.Diagnostics;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using Datadog.Trace.Logging;
 using Datadog.Trace.Util;
@@ -23,10 +24,11 @@ internal class PerformanceCountersListener : IRuntimeMetricsListener
 
         private static readonly IDatadogLogger Log = DatadogLogging.GetLoggerFor<PerformanceCountersListener>();
 
-        private readonly IDogStatsd _statsd;
         private readonly string _processName;
         private readonly int _processId;
 
+        private IDogStatsd _statsd;
+
         private string _instanceName;
         private PerformanceCounterCategory _memoryCategory;
         private bool _fullInstanceName;
@@ -114,6 +116,11 @@ public void Refresh()
             Log.Debug("Sent the following metrics to the DD agent: {Metrics}", GarbageCollectionMetrics);
         }
 
+        public void UpdateStatsd(IDogStatsd statsd)
+        {
+            Interlocked.Exchange(ref _statsd, statsd);
+        }
+
         protected virtual void InitializePerformanceCounters()
         {
             try

tracer/src/Datadog.Trace/RuntimeMetrics/RuntimeEventListener.cs

@@ -37,12 +37,12 @@ internal class RuntimeEventListener : EventListener, IRuntimeMetricsListener
 
         private static readonly IReadOnlyDictionary<string, string> MetricsMapping;
 
-        private readonly IDogStatsd _statsd;
-
         private readonly Timing _contentionTime = new Timing();
 
         private readonly string _delayInSeconds;
 
+        private IDogStatsd _statsd;
+
         private long _contentionCount;
 
         private DateTime? _gcStart;
@@ -81,6 +81,11 @@ public void Refresh()
             Log.Debug("Sent the following metrics to the DD agent: {Metrics}", ThreadStatsMetrics);
         }
 
+        public void UpdateStatsd(IDogStatsd statsd)
+        {
+            Interlocked.Exchange(ref _statsd, statsd);
+        }
+
         protected override void OnEventWritten(EventWrittenEventArgs eventData)
         {
             if (_statsd == null)

tracer/src/Datadog.Trace/RuntimeMetrics/RuntimeMetricsWriter.cs

@@ -161,6 +161,7 @@ public void Dispose()
         internal void UpdateStatsd(IDogStatsd statsd)
         {
             Interlocked.Exchange(ref _statsd, statsd);
+            _listener?.UpdateStatsd(statsd);
         }
 
         internal void PushEvents()

tracer/src/Datadog.Trace/TracerManagerFactory.cs

@@ -408,7 +408,7 @@ internal static IApi GetApi(TracerSettings settings, IDogStatsd statsd, Action<D
                     {
                         telemetryClientConfiguration = new TelemetryClientConfiguration
                         {
-                            Interval = (ulong)telemetrySettings.HeartbeatInterval.Milliseconds,
+                            Interval = (ulong)telemetrySettings.HeartbeatInterval.TotalMilliseconds,
                             RuntimeId = new CharSlice(Tracer.RuntimeId),
                             DebugEnabled = telemetrySettings.DebugEnabled
                         };

tracer/test/Datadog.Trace.Tests/RuntimeMetrics/RuntimeEventListenerTests.cs

@@ -115,6 +115,51 @@ public void PushEventCounters()
                 counter.Dispose();
             }
         }
+
+        [Fact]
+        public void UpdateStatsdOnReinitialization()
+        {
+            // Arrange - Create ASP.NET Core EventSource and counters (similar to PushEventCounters test)
+            var eventSource = new EventSource("Microsoft.AspNetCore.Hosting");
+            var mutex = new ManualResetEventSlim();
+
+            Func<double> callback = () =>
+            {
+                mutex.Set();
+                return 0.0;
+            };
+
+            var counters = new List<DiagnosticCounter>
+            {
+                new PollingCounter("current-requests", eventSource, () => 1.0),
+                new PollingCounter("total-requests", eventSource, () => 4.0),
+                new PollingCounter("total-connections", eventSource, () => 32.0),
+                // This counter sets the mutex, so it needs to be created last
+                new PollingCounter("Dummy", eventSource, callback)
+            };
+
+            var originalStatsd = new Mock<IDogStatsd>();
+            var newStatsd = new Mock<IDogStatsd>();
+
+            using var listener = new RuntimeEventListener(originalStatsd.Object, TimeSpan.FromSeconds(1));
+            using var writer = new RuntimeMetricsWriter(originalStatsd.Object, TimeSpan.FromSeconds(1), false);
+
+            mutex.Wait();
+
+            writer.UpdateStatsd(newStatsd.Object);
+
+            mutex.Reset();
+            mutex.Wait();
+
+            newStatsd.Verify(s => s.Gauge(MetricsNames.AspNetCoreCurrentRequests, 1.0, 1, null), Times.AtLeastOnce);
+            newStatsd.Verify(s => s.Gauge(MetricsNames.AspNetCoreTotalRequests, 4.0, 1, null), Times.AtLeastOnce);
+            newStatsd.Verify(s => s.Gauge(MetricsNames.AspNetCoreTotalConnections, 32.0, 1, null), Times.AtLeastOnce);
+
+            foreach (var counter in counters)
+            {
+                counter.Dispose();
+            }
+        }
     }
 }
 #endif