Clean up tracing

Author: roji

src/libraries/System.Transactions.Local/src/System.Transactions.Local.csproj

@@ -98,15 +98,6 @@
     <Compile Include="System\Transactions\Oletx\OletxTransaction.cs" />
     <Compile Include="System\Transactions\Oletx\OletxTransactionManager.cs" />
     <Compile Include="System\Transactions\Oletx\OletxVolatileEnlistment.cs" />
-    <Compile Include="System\Transactions\Trace\Activity.cs" />
-    <Compile Include="System\Transactions\Trace\DiagnosticStrings.cs" />
-    <Compile Include="System\Transactions\Trace\DiagnosticTraceCode.cs" />
-    <Compile Include="System\Transactions\Trace\DiagnosticTrace.cs" />
-    <Compile Include="System\Transactions\Trace\PlainXmlWriter.cs" />
-    <Compile Include="System\Transactions\Trace\TraceCode.cs" />
-    <Compile Include="System\Transactions\Trace\TraceRecord.cs" />
-    <Compile Include="System\Transactions\Trace\TraceRecords.cs" />
-    <Compile Include="System\Transactions\Trace\TraceXPathNavigator.cs" />
     <Compile Include="System\Transactions\TransactionInterop.cs" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetPlatformIdentifier)' != 'windows'">

src/libraries/System.Transactions.Local/src/System/Transactions/CommittableTransaction.cs

@@ -39,7 +39,7 @@ internal CommittableTransaction(IsolationLevel isoLevel, TimeSpan timeout) : bas
             TransactionsEtwProvider etwLog = TransactionsEtwProvider.Log;
             if (etwLog.IsEnabled())
             {
-                etwLog.TransactionCreated(this, "CommittableTransaction");
+                etwLog.TransactionCreated(TraceSourceType.TraceSourceLtm, TransactionTraceId, "CommittableTransaction");
             }
         }
 

src/libraries/System.Transactions.Local/src/System/Transactions/DependentTransaction.cs

@@ -61,7 +61,7 @@ public void Complete()
 
             if (etwLog.IsEnabled())
             {
-                etwLog.TransactionDependentCloneComplete(this, "DependentTransaction");
+                etwLog.TransactionDependentCloneComplete(TraceSourceType.TraceSourceLtm, TransactionTraceId, "DependentTransaction");
                 etwLog.MethodExit(TraceSourceType.TraceSourceLtm, this);
             }
         }

src/libraries/System.Transactions.Local/src/System/Transactions/DurableEnlistmentState.cs

@@ -96,7 +96,7 @@ internal override void EnterState(InternalEnlistment enlistment)
                 TransactionsEtwProvider etwLog = TransactionsEtwProvider.Log;
                 if (etwLog.IsEnabled())
                 {
-                    etwLog.EnlistmentStatus(enlistment, NotificationCall.Rollback);
+                    etwLog.EnlistmentStatus(TraceSourceType.TraceSourceLtm, enlistment.EnlistmentTraceId, NotificationCall.Rollback);
                 }
 
                 // Send the Rollback notification to the enlistment
@@ -147,7 +147,7 @@ internal override void EnterState(InternalEnlistment enlistment)
                 TransactionsEtwProvider etwLog = TransactionsEtwProvider.Log;
                 if (etwLog.IsEnabled())
                 {
-                    etwLog.EnlistmentStatus(enlistment, NotificationCall.SinglePhaseCommit);
+                    etwLog.EnlistmentStatus(TraceSourceType.TraceSourceLtm, enlistment.EnlistmentTraceId, NotificationCall.SinglePhaseCommit);
                 }
 
                 // Send the Commit notification to the enlistment

src/libraries/System.Transactions.Local/src/System/Transactions/Oletx/DTCTransactionManager.cs

@@ -4,7 +4,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 using System.Globalization;
-using System.Transactions.Diagnostics;
 using System.Transactions.DtcProxyShim;
 
 namespace System.Transactions.Oletx;
@@ -120,9 +119,10 @@ internal static uint AdjustTimeout(TimeSpan timeout)
         catch (OverflowException caughtEx)
         {
             // timeout.TotalMilliseconds might be negative, so let's catch overflow exceptions, just in case.
-            if (DiagnosticTrace.Verbose)
+            TransactionsEtwProvider etwLog = TransactionsEtwProvider.Log;
+            if (etwLog.IsEnabled())
             {
-                ExceptionConsumedTraceRecord.Trace(SR.TraceSourceOletx, caughtEx);
+                etwLog.ExceptionConsumed(TraceSourceType.TraceSourceOleTx, caughtEx);
             }
 
             returnTimeout = uint.MaxValue;

src/libraries/System.Transactions.Local/src/System/Transactions/Oletx/OletxDependentTransaction.cs

@@ -4,7 +4,6 @@
 using System;
 using System.Diagnostics;
 using System.Threading;
-using System.Transactions.Diagnostics;
 
 namespace System.Transactions.Oletx;
 
@@ -25,14 +24,12 @@ internal OletxDependentTransaction(RealOletxTransaction realTransaction, bool de
 
         _volatileEnlistmentContainer = RealOletxTransaction.AddDependentClone(delayCommit);
 
-        if (DiagnosticTrace.Information)
+        TransactionsEtwProvider etwLog = TransactionsEtwProvider.Log;
+        if (etwLog.IsEnabled())
         {
-            DependentCloneCreatedTraceRecord.Trace(
-                SR.TraceSourceOletx,
-                TransactionTraceId,
-                delayCommit
-                    ? DependentCloneOption.BlockCommitUntilComplete
-                    : DependentCloneOption.RollbackIfNotComplete);
+            etwLog.TransactionDependentCloneCreate(TraceSourceType.TraceSourceOleTx, TransactionTraceId, delayCommit
+                ? DependentCloneOption.BlockCommitUntilComplete
+                : DependentCloneOption.RollbackIfNotComplete);
         }
     }
 
@@ -52,9 +49,9 @@ public void Complete()
             throw TransactionException.CreateTransactionCompletedException(DistributedTxId);
         }
 
-        if (DiagnosticTrace.Information)
+        if (etwLog.IsEnabled())
         {
-            DependentCloneCompleteTraceRecord.Trace(SR.TraceSourceOletx, TransactionTraceId);
+            etwLog.TransactionDependentCloneComplete(TraceSourceType.TraceSourceOleTx, TransactionTraceId, "DependentTransaction");
         }
 
         _volatileEnlistmentContainer.DependentCloneCompleted();