Merge pull request #64 from nowsprinting/fix/reporter

Not to send body when stack-trace is empty
DeNA · Jun 4, 2024 · 527a80d · 527a80d
2 parents aaf61cf + 4f73527
commit 527a80d
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 23 deletions.
diff --git a/Runtime/Reporters/AbstractReporter.cs b/Runtime/Reporters/AbstractReporter.cs
@@ -3,7 +3,6 @@
 
 using System.Threading;
 using Cysharp.Threading.Tasks;
-using DeNA.Anjin.Settings;
 using UnityEngine;
 
 namespace DeNA.Anjin.Reporters
@@ -16,15 +15,13 @@ public abstract class AbstractReporter : ScriptableObject
         /// <summary>
         /// Post report log message, stacktrace and screenshot
         /// </summary>
-        /// <param name="settings">Autopilot settings</param>
         /// <param name="logString">Log message</param>
         /// <param name="stackTrace">Stack trace</param>
         /// <param name="type">Log message type</param>
         /// <param name="withScreenshot">With screenshot</param>
         /// <param name="cancellationToken">Cancellation token</param>
         /// <returns></returns>
         public abstract UniTask PostReportAsync(
-            AutopilotSettings settings,
             string logString,
             string stackTrace,
             LogType type,

diff --git a/Runtime/Reporters/CompositeReporter.cs b/Runtime/Reporters/CompositeReporter.cs
@@ -5,7 +5,6 @@
 using System.Linq;
 using System.Threading;
 using Cysharp.Threading.Tasks;
-using DeNA.Anjin.Settings;
 using UnityEngine;
 
 namespace DeNA.Anjin.Reporters
@@ -24,7 +23,6 @@ public class CompositeReporter : AbstractReporter
 
         /// <inheritdoc />
         public override async UniTask PostReportAsync(
-            AutopilotSettings settings,
             string logString,
             string stackTrace,
             LogType type,
@@ -36,7 +34,7 @@ await UniTask.WhenAll(
                 reporters
                     .Where(r => r != this && r != null)
                     .Select(
-                        r => r.PostReportAsync(settings, logString, stackTrace, type, withScreenshot, cancellationToken)
+                        r => r.PostReportAsync(logString, stackTrace, type, withScreenshot, cancellationToken)
                     )
             );
         }

diff --git a/Runtime/Reporters/SlackMessageSender.cs b/Runtime/Reporters/SlackMessageSender.cs
@@ -95,7 +95,7 @@ public async UniTask Send(
             if (withScreenshot)
             {
                 var coroutineRunner = new GameObject().AddComponent<CoroutineRunner>();
-                await UniTask.WaitForEndOfFrame(coroutineRunner);
+                await UniTask.WaitForEndOfFrame(coroutineRunner, cancellationToken);
                 Object.Destroy(coroutineRunner);
 
                 var screenshot = ScreenCapture.CaptureScreenshotAsTexture();
@@ -107,16 +107,20 @@ public async UniTask Send(
                     slackToken,
                     slackChannel,
                     withoutAlpha.EncodeToPNG(),
-                    postTitleTask.Ts
+                    postTitleTask.Ts,
+                    cancellationToken
                 );
                 if (!postScreenshotTask.Success)
                 {
                     return;
                 }
             }
 
-            var body = Body(logString, stackTrace);
-            await _slackAPI.Post(slackToken, slackChannel, body, postTitleTask.Ts);
+            if (stackTrace != null && stackTrace.Length > 0)
+            {
+                var body = Body(logString, stackTrace);
+                await _slackAPI.Post(slackToken, slackChannel, body, postTitleTask.Ts, cancellationToken);
+            }
         }
 
 

diff --git a/Runtime/Reporters/SlackReporter.cs b/Runtime/Reporters/SlackReporter.cs
@@ -38,26 +38,25 @@ public class SlackReporter : AbstractReporter
 
         /// <inheritdoc />
         public override async UniTask PostReportAsync(
-            AutopilotSettings settings,
             string logString,
             string stackTrace,
             LogType type,
             bool withScreenshot,
             CancellationToken cancellationToken = default
         )
         {
+            OverwriteByCommandlineArguments();
+
             // NOTE: In _sender.send, switch the execution thread to the main thread, so UniTask.WhenAll is meaningless.
-            foreach (var slackChannel in (string.IsNullOrEmpty(settings.slackChannels)
-                         ? slackChannels
-                         : settings.slackChannels).Split(','))
+            foreach (var slackChannel in slackChannels.Split(','))
             {
                 if (cancellationToken.IsCancellationRequested)
                 {
                     return;
                 }
-                
+
                 await _sender.Send(
-                    string.IsNullOrEmpty(settings.slackToken) ? slackToken : settings.slackToken,
+                    slackToken,
                     slackChannel,
                     mentionSubTeamIDs.Split(','),
                     addHereInSlackMessage,
@@ -68,5 +67,20 @@ await _sender.Send(
                 );
             }
         }
+
+        private void OverwriteByCommandlineArguments()
+        {
+            var args = new Arguments();
+
+            if (args.SlackToken.IsCaptured())
+            {
+                slackToken = args.SlackToken.Value();
+            }
+
+            if (args.SlackChannels.IsCaptured())
+            {
+                slackChannels = args.SlackChannels.Value();
+            }
+        }
     }
 }
diff --git a/Runtime/Settings/AutopilotSettings.cs b/Runtime/Settings/AutopilotSettings.cs
@@ -183,16 +183,12 @@ public void OverrideByCommandLineArguments(Arguments args)
 
             if (args.SlackToken.IsCaptured())
             {
-#pragma warning disable CS0618 // Type or member is obsolete
                 slackToken = args.SlackToken.Value();
-#pragma warning restore CS0618 // Type or member is obsolete
             }
 
             if (args.SlackChannels.IsCaptured())
             {
-#pragma warning disable CS0618 // Type or member is obsolete
                 slackChannels = args.SlackChannels.Value();
-#pragma warning restore CS0618 // Type or member is obsolete
             }
         }
     }

diff --git a/Runtime/Utilities/LogMessageHandler.cs b/Runtime/Utilities/LogMessageHandler.cs
@@ -53,7 +53,7 @@ public async void HandleLog(string logString, string stackTrace, LogType type)
 
             if (_reporter != null)
             {
-                await _reporter.PostReportAsync(_settings, logString, stackTrace, type, true);
+                await _reporter.PostReportAsync(logString, stackTrace, type, true);
             }
 
             var autopilot = Object.FindObjectOfType<Autopilot>();

diff --git a/Tests/Runtime/TestDoubles/SpyReporter.cs b/Tests/Runtime/TestDoubles/SpyReporter.cs
@@ -19,7 +19,6 @@ public class SpyReporter : AbstractReporter
         public List<Dictionary<string, string>> Arguments { get; } = new List<Dictionary<string, string>>();
 
         public override async UniTask PostReportAsync(
-            AutopilotSettings settings,
             string logString,
             string stackTrace,
             LogType type,
@@ -30,7 +29,6 @@ public override async UniTask PostReportAsync(
             Debug.Log("Reporter called");
             Arguments.Add(new Dictionary<string, string>
             {
-                {"settings", settings.ToString()},
                 {"logString", logString},
                 {"stackTrace", stackTrace},
                 {"type", type.ToString()},