Use IReportEventsObserver instead of obsoleted ILogFormatter

nvborisenko · Jan 22, 2022 · 55e22ad · 55e22ad
1 parent 3874adb
commit 55e22ad
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 15 deletions.
diff --git a/src/ReportPortal.Extensions.SourceBack/ReportPortal.Extensions.SourceBack.csproj b/src/ReportPortal.Extensions.SourceBack/ReportPortal.Extensions.SourceBack.csproj
@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ReportPortal.Shared" Version="3.0.0" />
+    <PackageReference Include="ReportPortal.Shared" Version="3.2.0" />
     <PackageReference Include="System.Reflection.Metadata" Version="1.8.0" />
   </ItemGroup>
 

diff --git a/src/ReportPortal.Extensions.SourceBack/SourceBackFormatter.cs b/src/ReportPortal.Extensions.SourceBack/SourceBackFormatter.cs
@@ -3,6 +3,7 @@
 using ReportPortal.Extensions.SourceBack.Pdb;
 using ReportPortal.Shared.Configuration;
 using ReportPortal.Shared.Extensibility;
+using ReportPortal.Shared.Extensibility.ReportEvents;
 using ReportPortal.Shared.Internal.Logging;
 using System;
 using System.Collections.Generic;
@@ -14,7 +15,7 @@
 
 namespace ReportPortal.Extensions.SourceBack
 {
-    public class SourceBackFormatter : ILogFormatter
+    public class SourceBackFormatter : IReportEventsObserver
     {
         private readonly ITraceLogger _traceLogger = TraceLogManager.Instance.GetLogger<SourceBackFormatter>();
 
@@ -24,15 +25,27 @@ public SourceBackFormatter()
             Config = new ConfigurationBuilder().AddDefaults(configDirectory).Build();
         }
 
-        public int Order => 10;
-
         private IConfiguration Config { get; }
 
-        public bool FormatLog(CreateLogItemRequest logRequest)
+        public void Initialize(IReportEventsSource reportEventsSource)
         {
-            _traceLogger.Verbose("Received a log request to format.");
+            reportEventsSource.OnBeforeLogsSending += ReportEventsSource_OnBeforeLogsSending;
+        }
+
+        private void ReportEventsSource_OnBeforeLogsSending(Shared.Reporter.ILogsReporter logsReporter, Shared.Extensibility.ReportEvents.EventArgs.BeforeLogsSendingEventArgs args)
+        {
+            if (args.CreateLogItemRequests != null)
+            {
+                foreach (var createLogItemRequest in args.CreateLogItemRequests)
+                {
+                    FormatLog(createLogItemRequest);
+                }
+            }
+        }
 
-            var handled = false;
+        public void FormatLog(CreateLogItemRequest logRequest)
+        {
+            _traceLogger.Verbose("Received a log request to format.");
 
             var fullMessageBuilder = Config.GetValue("Extensions:SourceBack:WithMarkdownPrefix", false) ? new StringBuilder("!!!MARKDOWN_MODE!!!") : new StringBuilder();
 
@@ -132,8 +145,6 @@ public bool FormatLog(CreateLogItemRequest logRequest)
                             sectionBuilder.AppendLine($"```{Environment.NewLine}SourceBack error: {exp}{Environment.NewLine}```");
                         }
 
-                        handled = true;
-
                         if (!string.IsNullOrEmpty(sectionBuilder.ToString()))
                         {
                             var sourceFileName = Path.GetFileName(sourcePath);
@@ -162,12 +173,7 @@ public bool FormatLog(CreateLogItemRequest logRequest)
                 }
             }
 
-            if (handled)
-            {
-                logRequest.Text = fullMessageBuilder.ToString();
-            }
-
-            return handled;
+            logRequest.Text = fullMessageBuilder.ToString();
         }
 
         private static readonly object _pdbsLock = new object();