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

feat: Support for programmatic option configuration #564

Merged
merged 8 commits into from
Feb 16, 2022
Merged
Show file tree
Hide file tree
Changes from 5 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
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## Unreleased

### Features

- Support for programmatic options configuration ([#564](https://github.com/getsentry/sentry-unity/pull/564))

## 0.10.0

### Features
Expand Down
13 changes: 13 additions & 0 deletions src/Sentry.Unity.Editor/ConfigurationWindow/AdvancedTab.cs
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,19 @@ internal static void Display(ScriptableSentryUnityOptions options)
new GUIContent("Windows Native Support", "Whether to enable Native Windows support to " +
"capture errors written in languages such as C and C++."),
options.WindowsNativeSupportEnabled);

EditorGUILayout.Space();
EditorGUI.DrawRect(EditorGUILayout.GetControlRect(false, 1), Color.gray);
EditorGUILayout.Space();

GUILayout.Label("Programmatic Options Configuration", EditorStyles.boldLabel);

options.OptionsConfiguration = EditorGUILayout.ObjectField(
new GUIContent("Options Configuration", "A scriptable object that inherits from " +
"'ScriptableOptionsConfiguration' that allows you to " +
"programmatically modify Sentry options i.e. implement the " +
"'BeforeSend' callback."),
options.OptionsConfiguration, typeof(ScriptableOptionsConfiguration), false) as ScriptableOptionsConfiguration;
}
}
}
11 changes: 11 additions & 0 deletions src/Sentry.Unity.Editor/ScriptableSentryUnityOptionsEditor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,17 @@ public override void OnInspectorGUI()
EditorGUI.DrawRect(EditorGUILayout.GetControlRect(false, 1), Color.gray);
EditorGUILayout.Space();

EditorGUILayout.ObjectField("Options Configuration", options.OptionsConfiguration,
typeof(ScriptableOptionsConfiguration), false);

EditorGUILayout.Space();
EditorGUI.DrawRect(EditorGUILayout.GetControlRect(false, 1), Color.gray);
EditorGUILayout.Space();

EditorGUILayout.Space();
EditorGUI.DrawRect(EditorGUILayout.GetControlRect(false, 1), Color.gray);
EditorGUILayout.Space();

EditorGUILayout.LabelField("Debug", EditorStyles.boldLabel);
EditorGUILayout.Toggle("Enable Debug Output", options.Debug);
EditorGUILayout.Toggle("Only In Editor", options.DebugOnlyInEditor);
Expand Down
9 changes: 9 additions & 0 deletions src/Sentry.Unity/ScriptableOptionsConfiguration.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
using UnityEngine;

namespace Sentry.Unity
{
public abstract class ScriptableOptionsConfiguration : ScriptableObject
{
public abstract void Configure(SentryUnityOptions options);
}
}
12 changes: 10 additions & 2 deletions src/Sentry.Unity/ScriptableSentryUnityOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,20 @@ public static string GetConfigPath(string? notDefaultConfigName = null)
[field: SerializeField] public bool IsEnvironmentUser { get; set; }

[field: SerializeField] public bool EnableOfflineCaching { get; set; }
[field: SerializeField] public int MaxCacheItems { get; set; }

// At least 1 item must be allowed in the cache.
[field: SerializeField] public int MaxCacheItems { get; set; } = 1;
[field: SerializeField] public int InitCacheFlushTimeout { get; set; }
[field: SerializeField] public float? SampleRate { get; set; }
[field: SerializeField] public int ShutdownTimeout { get; set; }
[field: SerializeField] public int MaxQueueItems { get; set; }
// At least 1 item must be allowed in the queue.
[field: SerializeField] public int MaxQueueItems { get; set; } = 1;
bitsandfoxes marked this conversation as resolved.
Show resolved Hide resolved
[field: SerializeField] public bool IosNativeSupportEnabled { get; set; } = true;
[field: SerializeField] public bool AndroidNativeSupportEnabled { get; set; } = true;
[field: SerializeField] public bool WindowsNativeSupportEnabled { get; set; } = true;

[field: SerializeField] public ScriptableOptionsConfiguration? OptionsConfiguration { get; set; }

[field: SerializeField] public bool Debug { get; set; }
[field: SerializeField] public bool DebugOnlyInEditor { get; set; }
[field: SerializeField] public SentryLevel DiagnosticLevel { get; set; }
Expand Down Expand Up @@ -125,6 +130,9 @@ internal static SentryUnityOptions ToSentryUnityOptions(ScriptableSentryUnityOpt
options.DiagnosticLevel = scriptableOptions.DiagnosticLevel;

SentryOptionsUtility.TryAttachLogger(options);

scriptableOptions.OptionsConfiguration?.Configure(options);

return options;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ public void ScriptableSentryUnityOptions_Creation_AllPropertiesPresent()
StringAssert.Contains("IosNativeSupportEnabled", optionsAsString);
StringAssert.Contains("AndroidNativeSupportEnabled", optionsAsString);
StringAssert.Contains("WindowsNativeSupportEnabled", optionsAsString);
StringAssert.Contains("OptionsConfiguration", optionsAsString);
StringAssert.Contains("Debug", optionsAsString);
StringAssert.Contains("DebugOnlyInEditor", optionsAsString);
StringAssert.Contains("DiagnosticLevel", optionsAsString);
Expand Down
24 changes: 24 additions & 0 deletions test/Sentry.Unity.Tests/ScriptableSentryUnityOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using System.IO;
using System.Reflection;
using NUnit.Framework;
using Sentry.Extensibility;
using Sentry.Unity.Json;
using Sentry.Unity.Tests.Stubs;
using UnityEngine;
Expand All @@ -21,6 +22,15 @@ class Fixture
persistentDataPath: "test/persistent/data/path");
}

class TestOptionsConfiguration : ScriptableOptionsConfiguration
{
public bool GotCalled;
public override void Configure(SentryUnityOptions options)
{
GotCalled = true;
}
}

[SetUp]
public void Setup() => _fixture = new Fixture();
private Fixture _fixture = null!;
Expand Down Expand Up @@ -118,6 +128,20 @@ public void ToSentryUnityOptions_ValueMapping_AreEqual(bool isBuilding, bool ena
AssertOptions(expectedOptions, optionsActual);
}

[Test]
[TestCase(true)]
[TestCase(false)]
public void ToSentryUnityOptions_HasOptionsConfiguration_GetsCalled(bool isBuilding)
{
var optionsConfiguration = ScriptableObject.CreateInstance<TestOptionsConfiguration>();
var scriptableOptions = ScriptableObject.CreateInstance<ScriptableSentryUnityOptions>();
scriptableOptions.OptionsConfiguration = optionsConfiguration;

ScriptableSentryUnityOptions.ToSentryUnityOptions(scriptableOptions, isBuilding);

Assert.IsTrue(optionsConfiguration.GotCalled);
}

[Test]
[TestCase(true)]
[TestCase(false)]
Expand Down