Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix not reported when log from not main thread #21

Merged
merged 4 commits into from
Nov 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions Runtime/Autopilot.cs
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,13 @@ private void Start()

_randomFactory = new RandomFactory(seed);
_logger.Log($"Random seed is {seed}");

// NOTE: Registering logMessageReceived must be placed before DispatchByScene.
// Because some agent can throw an error immediately, so reporter can miss the error if
// registering logMessageReceived is placed after DispatchByScene.
_reporter = new SlackReporter(_settings, new SlackAPI());
_logMessageHandler = new LogMessageHandler(_settings, _reporter);
Application.logMessageReceived += _logMessageHandler.HandleLog;
Application.logMessageReceivedThreaded += _logMessageHandler.HandleLog;

_dispatcher = new AgentDispatcher(_settings, _logger, _randomFactory);
_dispatcher.DispatchByScene(SceneManager.GetActiveScene());
Expand Down Expand Up @@ -116,7 +116,7 @@ public async UniTask TerminateAsync(ExitCode exitCode, string logString = null,

if (_logMessageHandler != null)
{
Application.logMessageReceived -= _logMessageHandler.HandleLog;
Application.logMessageReceivedThreaded -= _logMessageHandler.HandleLog;
}

if (_state.settings != null && !string.IsNullOrEmpty(_state.settings.junitReportPath))
Expand Down Expand Up @@ -150,7 +150,6 @@ public async UniTask TerminateAsync(ExitCode exitCode, string logString = null,
#endif
}


/// <summary>
/// Terminate autopilot
/// </summary>
Expand Down
3 changes: 3 additions & 0 deletions Runtime/Utilities/LogMessageHandler.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright (c) 2023 DeNA Co., Ltd.
// This software is released under the MIT License.

using Cysharp.Threading.Tasks;
using DeNA.Anjin.Reporters;
using DeNA.Anjin.Settings;
using UnityEngine;
Expand Down Expand Up @@ -39,6 +40,8 @@ public async void HandleLog(string logString, string stackTrace, LogType type)
return;
}

// NOTE: HandleLog may called by non-main thread because it subscribe Application.logMessageReceivedThreaded
await UniTask.SwitchToMainThread();
await _reporter.PostReportAsync(logString, stackTrace, type, true);

var autopilot = Object.FindObjectOfType<Autopilot>();
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// Copyright (c) 2023 DeNA Co., Ltd.
// This software is released under the MIT License.

using System;
using System.Threading;
using System.Threading.Tasks;
using UnityEngine;
using UnityEngine.EventSystems;

namespace DeNA.Anjin.TestDoubles
{
/// <summary>
/// A test stub throw errors when clicked
/// </summary>
[AddComponentMenu("")]
public class StubThrowingErrorFromNotMainThreadOnClick : MonoBehaviour, IPointerClickHandler
{
public void OnPointerClick(PointerEventData eventData)
{
Task.Run(
() => Debug.LogException(new Exception($"TEST on thread #{Thread.CurrentThread.ManagedThreadId}"))
);
}
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Tests/TestAssets/StubClickAgentForTests.asset
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ MonoBehaviour:
m_Name: StubClickAgentForTests
m_EditorClassIdentifier:
description:
targetName: ThrowErrorFromMainThreadOnClick
targetName: ThrowErrorFromNotMainThreadOnClick
119 changes: 119 additions & 0 deletions Tests/TestScenes/Error.unity
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,124 @@ MonoBehaviour:
serializedVersion: 2
m_Bits: 4294967295
m_MaxRayIntersections: 0
--- !u!1 &1088446224
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1088446228}
- component: {fileID: 1088446227}
- component: {fileID: 1088446226}
- component: {fileID: 1088446225}
- component: {fileID: 1088446229}
m_Layer: 0
m_Name: ThrowErrorFromNotMainThreadOnClick
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!65 &1088446225
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1088446224}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!23 &1088446226
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1088446224}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &1088446227
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1088446224}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &1088446228
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1088446224}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 1, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1088446229
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1088446224}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c733c26bf53b475ea76992de2fcc418a, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1325883444
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -519,4 +637,5 @@ SceneRoots:
- {fileID: 1025330167}
- {fileID: 1325883446}
- {fileID: 300655197}
- {fileID: 1088446228}
- {fileID: 352512553}