Small IPC changes

tracer/src/Datadog.Trace.Trimming/build/Datadog.Trace.Trimming.xml

@@ -803,6 +803,7 @@
       <type fullname="System.Runtime.Serialization.StreamingContext" />
       <type fullname="System.Runtime.Serialization.StreamingContextStates" />
       <type fullname="System.Runtime.Versioning.TargetFrameworkAttribute" />
+      <type fullname="System.Runtime.Versioning.UnsupportedOSPlatformAttribute" />
       <type fullname="System.RuntimeFieldHandle" />
       <type fullname="System.RuntimeMethodHandle" />
       <type fullname="System.RuntimeTypeHandle" />

tracer/src/Datadog.Trace/Ci/Configuration/TestOptimizationSettings.cs

@@ -370,5 +370,41 @@ internal TracerSettings InitializeTracerSettings(CompositeConfigurationSource so
             var newSource = new CompositeConfigurationSource([new DictionaryObjectConfigurationSource(additionalSource), source]);
             return new TracerSettings(newSource, telemetry, new OverrideErrorLog());
         }
+
+        public override string ToString()
+        {
+            var sb = StringBuilderCache.Acquire(StringBuilderCache.MaxBuilderSize);
+            sb.AppendFormat(
+                "{{ Enabled={0}, Agentless={1}, Site={2}, ApiKey={3}, AgentlessUrl={4}, MaximumAgentlessPayloadSize={5}, ProxyHttps={6}, ProxyNoProxy={7}, Logs={8}, CodeCoverageEnabled={9}, CodeCoverageSnkFilePath={10}, CodeCoveragePath={11}, CodeCoverageEnableJitOptimizations={12}, CodeCoverageMode={13}, GitUploadEnabled={14}, TestsSkippingEnabled={15}, IntelligentTestRunnerEnabled={16}, ForceAgentsEvpProxy={17}, InstallDatadogTraceInGac={18}, EarlyFlakeDetectionEnabled={19}, KnownTestsEnabled={20}, RumFlushWaitMillis={21}, TestSessionName='{22}', FlakyRetryEnabled={23}, FlakyRetryCount={24}, TotalFlakyRetryCount={25}, ImpactedTestsDetectionEnabled={26}, TestManagementEnabled={27} }}",
+                Enabled,
+                Agentless,
+                Site,
+                !string.IsNullOrEmpty(ApiKey) ? "<redacted>" : "null",
+                AgentlessUrl,
+                MaximumAgentlessPayloadSize,
+                ProxyHttps,
+                string.Join(", ", ProxyNoProxy ?? []),
+                Logs,
+                CodeCoverageEnabled,
+                CodeCoverageSnkFilePath,
+                CodeCoveragePath,
+                CodeCoverageEnableJitOptimizations,
+                CodeCoverageMode,
+                GitUploadEnabled,
+                TestsSkippingEnabled,
+                IntelligentTestRunnerEnabled,
+                ForceAgentsEvpProxy,
+                InstallDatadogTraceInGac,
+                EarlyFlakeDetectionEnabled,
+                KnownTestsEnabled,
+                RumFlushWaitMillis,
+                TestSessionName,
+                FlakyRetryEnabled,
+                FlakyRetryCount,
+                TotalFlakyRetryCount,
+                ImpactedTestsDetectionEnabled,
+                TestManagementEnabled);
+            return StringBuilderCache.GetStringAndRelease(sb);
+        }
     }
 }

tracer/src/Datadog.Trace/Ci/Ipc/CircularChannel.cs

@@ -19,7 +19,7 @@ internal partial class CircularChannel : IChannel
     private static readonly IDatadogLogger Log = DatadogLogging.GetLoggerFor(typeof(CircularChannel));
 
     private readonly MemoryMappedFile _mmf;
-    private readonly Mutex _mutex;
+    private readonly CrossPlatformLock _mutex;
     private readonly CircularChannelSettings _settings;
 
     private long _disposed;
@@ -72,9 +72,16 @@ public CircularChannel(string fileName, CircularChannelSettings settings)
         }
 
         _disposed = 0;
-        _mutex = new Mutex(
-            initiallyOwned: false,
-            FrameworkDescription.Instance.IsWindows() ? @$"Global\{Path.GetFileNameWithoutExtension(fileName)}" : $"{Path.GetFileNameWithoutExtension(fileName)}");
+        var lockName = Path.GetFileNameWithoutExtension(fileName);
+        Log.Debug("CircularChannel: Initializing with file {FileName} and lock name {LockName}", fileName, lockName);
+        if (CrossPlatformLock.TryOpenExisting(lockName, out var existingLock) && existingLock != null)
+        {
+            _mutex = existingLock;
+        }
+        else
+        {
+            _mutex = new CrossPlatformLock(lockName);
+        }
 
         var hasHandle = _mutex.WaitOne(_settings.MutexTimeout);
         if (!hasHandle)