Merge branch 'main' into chore/new-unity-structure

Author: bitsandfoxes

CHANGELOG.md

@@ -2,9 +2,21 @@
 
 ## Unreleased
 
+### Dependencies
+
+- Bump Cocoa SDK from v9.12.0 to v9.12.1 ([#2670](https://github.com/getsentry/sentry-unity/pull/2670))
+  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#9121)
+  - [diff](https://github.com/getsentry/sentry-cocoa/compare/9.12.0...9.12.1)
+- Bump Java SDK from v8.40.0 to v8.41.0 ([#2669](https://github.com/getsentry/sentry-unity/pull/2669))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8410)
+  - [diff](https://github.com/getsentry/sentry-java/compare/8.40.0...8.41.0)
+
+## 4.3.1
+
 ### Fixes
 
-- The SDK no longer sends screenshot attachments for events that were dropped during processing (e.g., by `BeforeSend` or sampling) ([#2661](https://github.com/getsentry/sentry-unity/pull/2661))
+- The SDK no longer sends screenshot attachments for events that were dropped during processing (e.g., by `BeforeSend` or sampling). ([#2661](https://github.com/getsentry/sentry-unity/pull/2661))
+- The SDK now forwards `EnableLogs` and `EnableMetrics` to the native layer. ([#2662](https://github.com/getsentry/sentry-unity/pull/2662))
 
 ### Dependencies
 

Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>4.3.0</Version>
+    <Version>4.3.1</Version>
     <LangVersion>12</LangVersion>
     <Nullable>enable</Nullable>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

README.md

@@ -23,7 +23,7 @@ Install the package via the Unity Package Manager using a Git URL to Sentry's SD
 https://github.com/getsentry/unity.git
 ```
 
-To use this specific version of the SDK, append `#4.3.0` to the URL, but note that this will stop Unity from suggesting version updates automatically.
+To use this specific version of the SDK, append `#4.3.1` to the URL, but note that this will stop Unity from suggesting version updates automatically.
 
 ## Documentation
 

modules/sentry-cocoa

@@ -22,7 +22,7 @@ Install the package via the Unity Package Manager using a Git URL to Sentry's SD
 https://github.com/getsentry/unity.git
 ```
 
-To use this specific version of the SDK, append `#4.3.0` to the URL.
+To use this specific version of the SDK, append `#4.3.1` to the URL.
 
 
 ## Source code

modules/sentry-java

@@ -1,6 +1,6 @@
 {
   "name": "io.sentry.unity",
-  "version": "4.3.0",
+  "version": "4.3.1",
   "displayName": "Sentry Unity",
   "description": "Sentry SDK for Unity",
   "unity": "2021.3",

package/README.md

@@ -140,6 +140,16 @@ public void Init(SentryUnityOptions options)
                 androidOptions.Call("setEnableScopeSync", options.NdkScopeSyncEnabled);
                 androidOptions.Call("setNativeSdkName", "sentry.native.android.unity");
 
+                using (var logsOptions = androidOptions.Call<AndroidJavaObject>("getLogs"))
+                {
+                    logsOptions.Call("setEnabled", options.EnableLogs);
+                }
+
+                using (var metricsOptions = androidOptions.Call<AndroidJavaObject>("getMetrics"))
+                {
+                    metricsOptions.Call("setEnabled", options.EnableMetrics);
+                }
+
                 // Options that are not to be set by the user
                 // We're disabling some integrations as to not duplicate event or because the SDK relies on the .NET SDK
                 // implementation of certain feature - i.e. Session Tracking

package/package.json

@@ -93,6 +93,9 @@ is RuntimePlatform.WindowsPlayer or RuntimePlatform.WindowsServer
         }
 #endif
 
+        Logger?.LogDebug("Setting EnableLogs: {0}", options.EnableLogs);
+        sentry_options_set_enable_logs(cOptions, options.EnableLogs ? 1 : 0);
+
         Logger?.LogDebug("Setting EnableMetrics: {0}", options.EnableMetrics);
         sentry_options_set_enable_metrics(cOptions, options.EnableMetrics ? 1 : 0);
 
@@ -169,6 +172,9 @@ internal static string GetDatabasePath(SentryUnityOptions options, IApplication?
     [DllImport(SentryLib)]
     private static extern void sentry_options_set_attach_screenshot(IntPtr options, int attachScreenshot);
 
+    [DllImport(SentryLib)]
+    private static extern void sentry_options_set_enable_logs(IntPtr options, int enable_logs);
+
     [DllImport(SentryLib)]
     private static extern void sentry_options_set_enable_metrics(IntPtr options, int enable_metrics);
 

src/Sentry.Unity.Android/SentryJava.cs

@@ -72,6 +72,12 @@ public static bool Init(SentryUnityOptions options)
         Logger?.LogDebug("Setting CaptureFailedRequests: {0}", options.CaptureFailedRequests);
         OptionsSetInt(cOptions, "enableCaptureFailedRequests", options.CaptureFailedRequests ? 1 : 0);
 
+        Logger?.LogDebug("Setting EnableLogs: {0}", options.EnableLogs);
+        OptionsSetInt(cOptions, "enableLogs", options.EnableLogs ? 1 : 0);
+
+        Logger?.LogDebug("Setting EnableMetrics: {0}", options.EnableMetrics);
+        OptionsSetInt(cOptions, "enableMetrics", options.EnableMetrics ? 1 : 0);
+
         foreach (var range in options.FailedRequestStatusCodes)
         {
             Logger?.LogDebug("Adding FailedRequestStatusCodeRange: {0}-{1}", range.Start, range.End);