* Use CredentialsRefresherEventSource

Author: lukebakken

projects/RabbitMQ.Client.OAuth2/CredentialsRefresher.cs

@@ -73,7 +73,7 @@ public CredentialsRefresher(ICredentialsProvider credentialsProvider,
 
             _refreshTask = Task.Run(RefreshLoopAsync, _linkedCts.Token);
 
-            CredentialsRefresherEventSource.Log.Registered(_credentialsProvider.Name);
+            CredentialsRefresherEventSource.Log.Started(_credentialsProvider.Name);
         }
 
         public Credentials? Credentials => _credentials;
@@ -92,6 +92,7 @@ private async Task RefreshLoopAsync()
                         break;
                     }
 
+                    CredentialsRefresherEventSource.Log.RefreshedCredentials(_credentialsProvider.Name);
                     await _onRefreshed(_credentials, null, _linkedCts.Token)
                         .ConfigureAwait(false);
                 }
@@ -129,9 +130,10 @@ protected virtual void Dispose(bool disposing)
                 if (disposing)
                 {
                     _internalCts.Cancel();
-                    _refreshTask.Wait(); // TODO do we care?
+                    _refreshTask.Wait(TimeSpan.FromSeconds(5));
                     _internalCts.Dispose();
                     _linkedCts.Dispose();
+                    CredentialsRefresherEventSource.Log.Stopped(_credentialsProvider.Name);
                 }
 
                 _disposedValue = true;

projects/RabbitMQ.Client.OAuth2/CredentialsRefresherEventSource.cs

@@ -40,27 +40,15 @@ public class CredentialsRefresherEventSource : EventSource
         public static CredentialsRefresherEventSource Log { get; } = new CredentialsRefresherEventSource();
 
         [Event(1)]
-        public void Registered(string name) => WriteEvent(1, "Registered", name);
+        public void Started(string name) => WriteEvent(1, "Started", name);
 
         [Event(2)]
-        public void Unregistered(string name) => WriteEvent(2, "UnRegistered", name);
+        public void Stopped(string name) => WriteEvent(2, "Stopped", name);
 
         [Event(3)]
 #if NET6_0_OR_GREATER
         [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2026:RequiresUnreferencedCode", Justification = "Parameters to this method are primitive and are trimmer safe")]
 #endif
-        public void ScheduledTimer(string name, double interval) => WriteEvent(3, "ScheduledTimer", name, interval);
-
-        [Event(4)]
-        public void TriggeredTimer(string name) => WriteEvent(4, "TriggeredTimer", name);
-
-        [Event(5)]
-#if NET6_0_OR_GREATER
-        [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2026:RequiresUnreferencedCode", Justification = "Parameters to this method are primitive and are trimmer safe")]
-#endif
-        public void RefreshedCredentials(string name, bool succesfully) => WriteEvent(5, "RefreshedCredentials", name, succesfully);
-
-        [Event(6)]
-        public void AlreadyRegistered(string name) => WriteEvent(6, "AlreadyRegistered", name);
+        public void RefreshedCredentials(string name) => WriteEvent(3, "RefreshedCredentials", name);
     }
 }

projects/RabbitMQ.Client.OAuth2/PublicAPI.Unshipped.txt

@@ -3,13 +3,10 @@ RabbitMQ.Client.OAuth2.CredentialsRefresher.Credentials.get -> RabbitMQ.Client.C
 RabbitMQ.Client.OAuth2.CredentialsRefresher.CredentialsRefresher(RabbitMQ.Client.ICredentialsProvider! credentialsProvider, RabbitMQ.Client.OAuth2.NotifyCredentialsRefreshedAsync! onRefreshed, System.Threading.CancellationToken cancellationToken) -> void
 RabbitMQ.Client.OAuth2.CredentialsRefresher.Dispose() -> void
 RabbitMQ.Client.OAuth2.CredentialsRefresherEventSource
-RabbitMQ.Client.OAuth2.CredentialsRefresherEventSource.AlreadyRegistered(string! name) -> void
 RabbitMQ.Client.OAuth2.CredentialsRefresherEventSource.CredentialsRefresherEventSource() -> void
-RabbitMQ.Client.OAuth2.CredentialsRefresherEventSource.RefreshedCredentials(string! name, bool succesfully) -> void
-RabbitMQ.Client.OAuth2.CredentialsRefresherEventSource.Registered(string! name) -> void
-RabbitMQ.Client.OAuth2.CredentialsRefresherEventSource.ScheduledTimer(string! name, double interval) -> void
-RabbitMQ.Client.OAuth2.CredentialsRefresherEventSource.TriggeredTimer(string! name) -> void
-RabbitMQ.Client.OAuth2.CredentialsRefresherEventSource.Unregistered(string! name) -> void
+RabbitMQ.Client.OAuth2.CredentialsRefresherEventSource.RefreshedCredentials(string! name) -> void
+RabbitMQ.Client.OAuth2.CredentialsRefresherEventSource.Started(string! name) -> void
+RabbitMQ.Client.OAuth2.CredentialsRefresherEventSource.Stopped(string! name) -> void
 RabbitMQ.Client.OAuth2.IOAuth2Client.RefreshTokenAsync(RabbitMQ.Client.OAuth2.IToken! token, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<RabbitMQ.Client.OAuth2.IToken!>!
 RabbitMQ.Client.OAuth2.IOAuth2Client.RequestTokenAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<RabbitMQ.Client.OAuth2.IToken!>!
 RabbitMQ.Client.OAuth2.NotifyCredentialsRefreshedAsync

projects/Test/OAuth2/OAuth2.csproj

@@ -23,6 +23,7 @@
   <ItemGroup>
     <ProjectReference Include="../../RabbitMQ.Client/RabbitMQ.Client.csproj" />
     <ProjectReference Include="../../RabbitMQ.Client.OAuth2/RabbitMQ.Client.OAuth2.csproj" />
+    <ProjectReference Include="../Common/Common.csproj" />
   </ItemGroup>
 
   <ItemGroup>