Skip to content

FIX: Analytics errors on consoles by reverting changes from #1991 #2024

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Oct 10, 2024
Merged

FIX: Analytics errors on consoles by reverting changes from #1991 #2024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ee9be27
Revert #1991 changes to analytics
Pauliusd01 Oct 3, 2024
47a4f25
Update CHANGELOG.md
Pauliusd01 Oct 3, 2024
0feb430
Merge branch 'develop' into isxb-1107-revert-anylitics-changes-from-1991
Pauliusd01 Oct 10, 2024
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
1 change: 1 addition & 0 deletions Packages/com.unity.inputsystem/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ however, it has to be formatted properly to pass verification tests.
### Fixed
- Fixed touch pointers being released twice causing an index out of bounds error. [ISXB-687](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-687)
- Fixed `NullReferenceException` from disconnecting and reconnecting a GXDKGamepad.
- Fixed "AnalyticsResult" errors on consoles [ISXB-1107]

### Added
- Added the display of the device flag `CanRunInBackground` in device debug view.
Expand Down
4 changes: 3 additions & 1 deletion Packages/com.unity.inputsystem/InputSystem/NativeInputRuntime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,7 @@ public Action onProjectChange

public void SendAnalytic(InputAnalytics.IInputAnalytic analytic)
{
#if ENABLE_CLOUD_SERVICES_ANALYTICS
#if (UNITY_EDITOR)
#if (UNITY_2023_2_OR_NEWER)
EditorAnalytics.SendAnalytic(analytic);
Expand All @@ -404,14 +405,15 @@ public void SendAnalytic(InputAnalytics.IInputAnalytic analytic)
EditorAnalytics.SendEventWithLimit(info.Name, analytic);
#endif // UNITY_INPUT_SYSTEM_ENABLE_ANALYTICS || UNITY_2023_1_OR_NEWER
#endif // UNITY_2023_2_OR_NEWER
#elif (ENABLE_CLOUD_SERVICES_ANALYTICS) // Implicitly: !UNITY_EDITOR && UNITY_ANALYTICS
#elif (UNITY_ANALYTICS) // Implicitly: !UNITY_EDITOR
var info = analytic.info;
Analytics.Analytics.RegisterEvent(info.Name, info.MaxEventsPerHour, info.MaxNumberOfElements, InputAnalytics.kVendorKey);
if (analytic.TryGatherData(out var data, out var error))
Analytics.Analytics.SendEvent(info.Name, data);
else
Debug.Log(error); // Non fatal
#endif //UNITY_EDITOR
#endif //ENABLE_CLOUD_SERVICES_ANALYTICS
}

#endif // UNITY_ANALYTICS || UNITY_EDITOR
Expand Down