Merge branch 'main' into fix/filesystem

bitsandfoxes · bitsandfoxes · commit 88d63f0ba156 · 2024-09-25T14:08:03.000+02:00
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -35,7 +35,7 @@ jobs:
         uses: ./.github/actions/environment
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@8214744c546c1e5c8f03dde8fab3a7353211988d # pin@v2
+        uses: github/codeql-action/init@294a9d92911152fe08befb9ec03e240add280cb3 # pin@v2
         with:
           languages: csharp
 
@@ -46,6 +46,6 @@ jobs:
         run: dotnet build Sentry-CI-CodeQL.slnf --no-restore --nologo
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@8214744c546c1e5c8f03dde8fab3a7353211988d # pin@v2
+        uses: github/codeql-action/analyze@294a9d92911152fe08befb9ec03e240add280cb3 # pin@v2
         with:
           category: '/language:csharp'
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,23 @@
 
 ## Unreleased
 
+### API Changes
+
+- The `SentrySdk.Metrics` module is deprecated and will be removed in the next major release. 
+  Sentry will reject all metrics sent after October 7, 2024.
+  Learn more: https://sentry.zendesk.com/hc/en-us/articles/26369339769883-Upcoming-API-Changes-to-Metrics  ([#3619](https://github.com/getsentry/sentry-dotnet/pull/3619))
+
+### Dependencies
+
+- Bump Native SDK from v0.7.9 to v0.7.10 ([#3623](https://github.com/getsentry/sentry-dotnet/pull/3623))
+  - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0710)
+  - [diff](https://github.com/getsentry/sentry-native/compare/0.7.9...0.7.10)
+- Bump CLI from v2.36.1 to v2.36.2 ([#3624](https://github.com/getsentry/sentry-dotnet/pull/3624))
+  - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2362)
+  - [diff](https://github.com/getsentry/sentry-cli/compare/2.36.1...2.36.2)
+
+## 4.11.0
+
 ### Features
 
 - Added a flag to options `DisableFileWrite` to allow users to opt-out of all file writing operations. Note that toggling this will affect features such as offline caching and auto-session tracking and release health as these rely on some file persistency  ([#3614](https://github.com/getsentry/sentry-dotnet/pull/3614))
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <VersionPrefix>4.10.2</VersionPrefix>
+    <VersionPrefix>4.11.0</VersionPrefix>
     <LangVersion>12</LangVersion>
     <AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -70,7 +70,7 @@
 
   <!-- Set the version and local path for Sentry CLI (downloaded in the restore phase of Sentry.csproj) -->
   <PropertyGroup Condition="'$(SolutionName)' != 'Sentry.Unity'">
-    <SentryCLIVersion>2.36.1</SentryCLIVersion>
+    <SentryCLIVersion>2.36.2</SentryCLIVersion>
     <SentryCLIDirectory>$(MSBuildThisFileDirectory)tools\sentry-cli\$(SentryCLIVersion)\</SentryCLIDirectory>
   </PropertyGroup>
 
diff --git a/modules/Ben.Demystifier b/modules/Ben.Demystifier
@@ -1 +1 @@
-Subproject commit 11a87af226b591b7cdcf9fa2dc09fd401710afea
+Subproject commit ad4c115b2f87646e85956a5555a7313c06f5a065
diff --git a/modules/sentry-native b/modules/sentry-native
@@ -1 +1 @@
-Subproject commit 2a88542eb3136e0e357517c4c9cdb1f3c0453647
+Subproject commit 168d1dd6fec8e50ef0eda6c8b83b3c3935136c20
diff --git a/samples/Sentry.Samples.Console.Metrics/Program.cs b/samples/Sentry.Samples.Console.Metrics/Program.cs
@@ -1,3 +1,4 @@
+#pragma warning disable CS0618 // Obsolete Warning
 using System.Diagnostics.Metrics;
 using System.Text.RegularExpressions;
 
@@ -137,3 +138,4 @@ private static async Task CallSampleApiAsync()
         System.Console.WriteLine($"GET {url} {result.StatusCode}");
     }
 }
+#pragma warning restore CS0618
diff --git a/src/Sentry/Extensibility/HubAdapter.cs b/src/Sentry/Extensibility/HubAdapter.cs
@@ -288,6 +288,9 @@ public Task FlushAsync(TimeSpan timeout)
         => SentrySdk.FlushAsync(timeout);
 
     /// <inheritdoc cref="IMetricAggregator"/>
+    [Obsolete("The SentrySdk.Metrics module is deprecated and will be removed in the next major release. " +
+              "Sentry will reject all metrics sent after October 7, 2024." +
+              "Learn more: https://sentry.zendesk.com/hc/en-us/articles/26369339769883-Upcoming-API-Changes-to-Metrics")]
     public IMetricAggregator Metrics
         => SentrySdk.Metrics;
 
diff --git a/src/Sentry/Internal/Hub.cs b/src/Sentry/Internal/Hub.cs
@@ -659,9 +659,7 @@ public void Dispose()
 
         try
         {
-            Metrics.FlushAsync().ContinueWith(_ =>
-                CurrentClient.FlushAsync(_options.ShutdownTimeout).ConfigureAwait(false).GetAwaiter().GetResult()
-            ).ConfigureAwait(false).GetAwaiter().GetResult();
+            CurrentClient.FlushAsync(_options.ShutdownTimeout).ConfigureAwait(false).GetAwaiter().GetResult();
         }
         catch (Exception e)
         {
diff --git a/src/Sentry/Internal/SystemDiagnosticsMetricsListener.cs b/src/Sentry/Internal/SystemDiagnosticsMetricsListener.cs
@@ -11,11 +11,14 @@ internal class SystemDiagnosticsMetricsListener : IDisposable
 
     internal readonly MeterListener _sentryListener = new();
 
+#pragma warning disable CS0618 // Obsolete Warning
     private SystemDiagnosticsMetricsListener(ExperimentalMetricsOptions metricsOptions)
         : this(metricsOptions, () => SentrySdk.Metrics)
+#pragma warning restore CS0618
     {
     }
 
+
     /// <summary>
     /// Overload for testing purposes - allows us to supply a mock IMetricAggregator
     /// </summary>
diff --git a/src/Sentry/Sentry.csproj b/src/Sentry/Sentry.csproj
@@ -116,13 +116,13 @@
       <_OSArchitecture>$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)</_OSArchitecture>
     </PropertyGroup>
     <ItemGroup>
-      <SentryCLIDownload Condition="'$(CI_PUBLISHING_BUILD)' == 'true' Or ($([MSBuild]::IsOSPlatform('OSX')) And $(_OSArchitecture) == 'Arm64')" Include="sentry-cli-Darwin-arm64" FileHash="b840504663e5e4c9cbc0e71f9d43081cc85504cfd70c1db01e73b170c4467204" />
-      <SentryCLIDownload Condition="'$(CI_PUBLISHING_BUILD)' == 'true' Or ($([MSBuild]::IsOSPlatform('OSX')) And $(_OSArchitecture) == 'X64')" Include="sentry-cli-Darwin-x86_64" FileHash="06efaf6b2c617dbefdb787e0a92ec9a029ef0afbeb808f1865f97e4201d61488" />
-      <SentryCLIDownload Condition="'$(CI_PUBLISHING_BUILD)' == 'true' Or ($([MSBuild]::IsOSPlatform('Linux')) And $(_OSArchitecture) == 'Arm64')" Include="sentry-cli-Linux-aarch64" FileHash="605a94cdc60edce7891457116d2f04ffec3d4f7c21fc51dbcd84eb877f34d50e" />
-      <SentryCLIDownload Condition="'$(CI_PUBLISHING_BUILD)' == 'true' Or ($([MSBuild]::IsOSPlatform('Linux')) And $(_OSArchitecture) == 'X86')" Include="sentry-cli-Linux-i686" FileHash="adad98902ed0e5001c60a2783684417ef147c3229da97812ee18ac75af65e733" />
-      <SentryCLIDownload Condition="'$(CI_PUBLISHING_BUILD)' == 'true' Or ($([MSBuild]::IsOSPlatform('Linux')) And $(_OSArchitecture) == 'X64')" Include="sentry-cli-Linux-x86_64" FileHash="4c3ff70421eecf5c4dbc6d15256a9c7eb28d6804d3e1b6717edf3a1a8b7a05c3" />
-      <SentryCLIDownload Condition="'$(CI_PUBLISHING_BUILD)' == 'true' Or ($([MSBuild]::IsOSPlatform('Windows')) And $(_OSArchitecture) == 'X86')" Include="sentry-cli-Windows-i686.exe" FileHash="b24621e338ef44892a735fb4d65eac8f0193fbbe4a2a20b2f3a89702ccdaad07" />
-      <SentryCLIDownload Condition="'$(CI_PUBLISHING_BUILD)' == 'true' Or ($([MSBuild]::IsOSPlatform('Windows')) And $(_OSArchitecture) != 'X86')" Include="sentry-cli-Windows-x86_64.exe" FileHash="cdb452c61daa25d02a2607ed6411216fc67e6feb0f75693931309c3830cd5543" />
+      <SentryCLIDownload Condition="'$(CI_PUBLISHING_BUILD)' == 'true' Or ($([MSBuild]::IsOSPlatform('OSX')) And $(_OSArchitecture) == 'Arm64')" Include="sentry-cli-Darwin-arm64" FileHash="decbca422a4801e390a034f79da236d3f3c658b7ff765a717e67173c0f7b40de" />
+      <SentryCLIDownload Condition="'$(CI_PUBLISHING_BUILD)' == 'true' Or ($([MSBuild]::IsOSPlatform('OSX')) And $(_OSArchitecture) == 'X64')" Include="sentry-cli-Darwin-x86_64" FileHash="301b46354c428d523c8c87b9c5fac52eb14b3bb7bcde912c58d498e170f1b1e4" />
+      <SentryCLIDownload Condition="'$(CI_PUBLISHING_BUILD)' == 'true' Or ($([MSBuild]::IsOSPlatform('Linux')) And $(_OSArchitecture) == 'Arm64')" Include="sentry-cli-Linux-aarch64" FileHash="bbb704c491eeb46be92877fcc39a712be53388435d256b7e112f76a4a37de91c" />
+      <SentryCLIDownload Condition="'$(CI_PUBLISHING_BUILD)' == 'true' Or ($([MSBuild]::IsOSPlatform('Linux')) And $(_OSArchitecture) == 'X86')" Include="sentry-cli-Linux-i686" FileHash="9aebde0aafc57a598c53c16ebfe0aa57152d948371e69edacccd241d1888166f" />
+      <SentryCLIDownload Condition="'$(CI_PUBLISHING_BUILD)' == 'true' Or ($([MSBuild]::IsOSPlatform('Linux')) And $(_OSArchitecture) == 'X64')" Include="sentry-cli-Linux-x86_64" FileHash="f19511e24fda6c44b62da3fd8d5d7193eada4fa885626b275b930b3cd435435b" />
+      <SentryCLIDownload Condition="'$(CI_PUBLISHING_BUILD)' == 'true' Or ($([MSBuild]::IsOSPlatform('Windows')) And $(_OSArchitecture) == 'X86')" Include="sentry-cli-Windows-i686.exe" FileHash="239c1435b982b0e36e1c6c1665a9512cce5ddea27c5645012d3ac0abc739cc2f" />
+      <SentryCLIDownload Condition="'$(CI_PUBLISHING_BUILD)' == 'true' Or ($([MSBuild]::IsOSPlatform('Windows')) And $(_OSArchitecture) != 'X86')" Include="sentry-cli-Windows-x86_64.exe" FileHash="aeef1303382a528aec0793af1c71f4130f34e3b5b7631a497332f9e5069ba655" />
     </ItemGroup>
 
     <!-- Download the files -->
diff --git a/src/Sentry/SentrySdk.cs b/src/Sentry/SentrySdk.cs
@@ -668,6 +668,9 @@ public static TransactionContext ContinueTrace(
         => CurrentHub.ContinueTrace(traceHeader, baggageHeader, name, operation);
 
     /// <inheritdoc cref="IMetricAggregator"/>
+    [Obsolete("The SentrySdk.Metrics module is deprecated and will be removed in the next major release. " +
+              "Sentry will reject all metrics sent after October 7, 2024." +
+              "Learn more: https://sentry.zendesk.com/hc/en-us/articles/26369339769883-Upcoming-API-Changes-to-Metrics")]
     public static IMetricAggregator Metrics
         => CurrentHub.Metrics;
 
diff --git a/test/Sentry.Tests/ApiApprovalTests.Run.DotNet6_0.verified.txt b/test/Sentry.Tests/ApiApprovalTests.Run.DotNet6_0.verified.txt
@@ -784,6 +784,10 @@ namespace Sentry
     {
         public static bool IsEnabled { get; }
         public static Sentry.SentryId LastEventId { get; }
+        [System.Obsolete("The SentrySdk.Metrics module is deprecated and will be removed in the next major " +
+            "release. Sentry will reject all metrics sent after October 7, 2024.Learn more: h" +
+            "ttps://sentry.zendesk.com/hc/en-us/articles/26369339769883-Upcoming-API-Changes-" +
+            "to-Metrics")]
         public static Sentry.IMetricAggregator Metrics { get; }
         public static void AddBreadcrumb(Sentry.Breadcrumb breadcrumb, Sentry.SentryHint? hint = null) { }
         public static void AddBreadcrumb(string message, string? category = null, string? type = null, System.Collections.Generic.IDictionary<string, string>? data = null, Sentry.BreadcrumbLevel level = 0) { }
@@ -1323,6 +1327,10 @@ namespace Sentry.Extensibility
         public static readonly Sentry.Extensibility.HubAdapter Instance;
         public bool IsEnabled { get; }
         public Sentry.SentryId LastEventId { get; }
+        [System.Obsolete("The SentrySdk.Metrics module is deprecated and will be removed in the next major " +
+            "release. Sentry will reject all metrics sent after October 7, 2024.Learn more: h" +
+            "ttps://sentry.zendesk.com/hc/en-us/articles/26369339769883-Upcoming-API-Changes-" +
+            "to-Metrics")]
         public Sentry.IMetricAggregator Metrics { get; }
         public void AddBreadcrumb(string message, string? category = null, string? type = null, System.Collections.Generic.IDictionary<string, string>? data = null, Sentry.BreadcrumbLevel level = 0) { }
         public void AddBreadcrumb(Sentry.Infrastructure.ISystemClock clock, string message, string? category = null, string? type = null, System.Collections.Generic.IDictionary<string, string>? data = null, Sentry.BreadcrumbLevel level = 0) { }
diff --git a/test/Sentry.Tests/ApiApprovalTests.Run.DotNet7_0.verified.txt b/test/Sentry.Tests/ApiApprovalTests.Run.DotNet7_0.verified.txt
@@ -784,6 +784,10 @@ namespace Sentry
     {
         public static bool IsEnabled { get; }
         public static Sentry.SentryId LastEventId { get; }
+        [System.Obsolete("The SentrySdk.Metrics module is deprecated and will be removed in the next major " +
+            "release. Sentry will reject all metrics sent after October 7, 2024.Learn more: h" +
+            "ttps://sentry.zendesk.com/hc/en-us/articles/26369339769883-Upcoming-API-Changes-" +
+            "to-Metrics")]
         public static Sentry.IMetricAggregator Metrics { get; }
         public static void AddBreadcrumb(Sentry.Breadcrumb breadcrumb, Sentry.SentryHint? hint = null) { }
         public static void AddBreadcrumb(string message, string? category = null, string? type = null, System.Collections.Generic.IDictionary<string, string>? data = null, Sentry.BreadcrumbLevel level = 0) { }
@@ -1323,6 +1327,10 @@ namespace Sentry.Extensibility
         public static readonly Sentry.Extensibility.HubAdapter Instance;
         public bool IsEnabled { get; }
         public Sentry.SentryId LastEventId { get; }
+        [System.Obsolete("The SentrySdk.Metrics module is deprecated and will be removed in the next major " +
+            "release. Sentry will reject all metrics sent after October 7, 2024.Learn more: h" +
+            "ttps://sentry.zendesk.com/hc/en-us/articles/26369339769883-Upcoming-API-Changes-" +
+            "to-Metrics")]
         public Sentry.IMetricAggregator Metrics { get; }
         public void AddBreadcrumb(string message, string? category = null, string? type = null, System.Collections.Generic.IDictionary<string, string>? data = null, Sentry.BreadcrumbLevel level = 0) { }
         public void AddBreadcrumb(Sentry.Infrastructure.ISystemClock clock, string message, string? category = null, string? type = null, System.Collections.Generic.IDictionary<string, string>? data = null, Sentry.BreadcrumbLevel level = 0) { }
diff --git a/test/Sentry.Tests/ApiApprovalTests.Run.DotNet8_0.verified.txt b/test/Sentry.Tests/ApiApprovalTests.Run.DotNet8_0.verified.txt
@@ -786,6 +786,10 @@ namespace Sentry
     {
         public static bool IsEnabled { get; }
         public static Sentry.SentryId LastEventId { get; }
+        [System.Obsolete("The SentrySdk.Metrics module is deprecated and will be removed in the next major " +
+            "release. Sentry will reject all metrics sent after October 7, 2024.Learn more: h" +
+            "ttps://sentry.zendesk.com/hc/en-us/articles/26369339769883-Upcoming-API-Changes-" +
+            "to-Metrics")]
         public static Sentry.IMetricAggregator Metrics { get; }
         public static void AddBreadcrumb(Sentry.Breadcrumb breadcrumb, Sentry.SentryHint? hint = null) { }
         public static void AddBreadcrumb(string message, string? category = null, string? type = null, System.Collections.Generic.IDictionary<string, string>? data = null, Sentry.BreadcrumbLevel level = 0) { }
@@ -1325,6 +1329,10 @@ namespace Sentry.Extensibility
         public static readonly Sentry.Extensibility.HubAdapter Instance;
         public bool IsEnabled { get; }
         public Sentry.SentryId LastEventId { get; }
+        [System.Obsolete("The SentrySdk.Metrics module is deprecated and will be removed in the next major " +
+            "release. Sentry will reject all metrics sent after October 7, 2024.Learn more: h" +
+            "ttps://sentry.zendesk.com/hc/en-us/articles/26369339769883-Upcoming-API-Changes-" +
+            "to-Metrics")]
         public Sentry.IMetricAggregator Metrics { get; }
         public void AddBreadcrumb(string message, string? category = null, string? type = null, System.Collections.Generic.IDictionary<string, string>? data = null, Sentry.BreadcrumbLevel level = 0) { }
         public void AddBreadcrumb(Sentry.Infrastructure.ISystemClock clock, string message, string? category = null, string? type = null, System.Collections.Generic.IDictionary<string, string>? data = null, Sentry.BreadcrumbLevel level = 0) { }
diff --git a/test/Sentry.Tests/ApiApprovalTests.Run.Net4_8.verified.txt b/test/Sentry.Tests/ApiApprovalTests.Run.Net4_8.verified.txt
@@ -781,6 +781,10 @@ namespace Sentry
     {
         public static bool IsEnabled { get; }
         public static Sentry.SentryId LastEventId { get; }
+        [System.Obsolete("The SentrySdk.Metrics module is deprecated and will be removed in the next major " +
+            "release. Sentry will reject all metrics sent after October 7, 2024.Learn more: h" +
+            "ttps://sentry.zendesk.com/hc/en-us/articles/26369339769883-Upcoming-API-Changes-" +
+            "to-Metrics")]
         public static Sentry.IMetricAggregator Metrics { get; }
         public static void AddBreadcrumb(Sentry.Breadcrumb breadcrumb, Sentry.SentryHint? hint = null) { }
         public static void AddBreadcrumb(string message, string? category = null, string? type = null, System.Collections.Generic.IDictionary<string, string>? data = null, Sentry.BreadcrumbLevel level = 0) { }
@@ -1320,6 +1324,10 @@ namespace Sentry.Extensibility
         public static readonly Sentry.Extensibility.HubAdapter Instance;
         public bool IsEnabled { get; }
         public Sentry.SentryId LastEventId { get; }
+        [System.Obsolete("The SentrySdk.Metrics module is deprecated and will be removed in the next major " +
+            "release. Sentry will reject all metrics sent after October 7, 2024.Learn more: h" +
+            "ttps://sentry.zendesk.com/hc/en-us/articles/26369339769883-Upcoming-API-Changes-" +
+            "to-Metrics")]
         public Sentry.IMetricAggregator Metrics { get; }
         public void AddBreadcrumb(string message, string? category = null, string? type = null, System.Collections.Generic.IDictionary<string, string>? data = null, Sentry.BreadcrumbLevel level = 0) { }
         public void AddBreadcrumb(Sentry.Infrastructure.ISystemClock clock, string message, string? category = null, string? type = null, System.Collections.Generic.IDictionary<string, string>? data = null, Sentry.BreadcrumbLevel level = 0) { }

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#pragma warning disable CS0618 // Obsolete Warning`
`1`	`2`	`using System.Diagnostics.Metrics;`
`2`	`3`	`using System.Text.RegularExpressions;`
`3`	`4`
`@@ -137,3 +138,4 @@ private static async Task CallSampleApiAsync()`
`137`	`138`	`System.Console.WriteLine($"GET {url} {result.StatusCode}");`
`138`	`139`	`}`
`139`	`140`	`}`
	`141`	`+#pragma warning restore CS0618`
Original file line number	Diff line number	Diff line change
`@@ -659,9 +659,7 @@ public void Dispose()`
`659`	`659`
`660`	`660`	`try`
`661`	`661`	`{`
`662`		`- Metrics.FlushAsync().ContinueWith(_ =>`
`663`		`- CurrentClient.FlushAsync(_options.ShutdownTimeout).ConfigureAwait(false).GetAwaiter().GetResult()`
`664`		`- ).ConfigureAwait(false).GetAwaiter().GetResult();`
	`662`	`+ CurrentClient.FlushAsync(_options.ShutdownTimeout).ConfigureAwait(false).GetAwaiter().GetResult();`
`665`	`663`	`}`
`666`	`664`	`catch (Exception e)`
`667`	`665`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,11 +11,14 @@ internal class SystemDiagnosticsMetricsListener : IDisposable`
`11`	`11`
`12`	`12`	`internal readonly MeterListener _sentryListener = new();`
`13`	`13`
	`14`	`+#pragma warning disable CS0618 // Obsolete Warning`
`14`	`15`	`private SystemDiagnosticsMetricsListener(ExperimentalMetricsOptions metricsOptions)`
`15`	`16`	`: this(metricsOptions, () => SentrySdk.Metrics)`
	`17`	`+#pragma warning restore CS0618`
`16`	`18`	`{`
`17`	`19`	`}`
`18`	`20`
	`21`	`+`
`19`	`22`	`/// <summary>`
`20`	`23`	`/// Overload for testing purposes - allows us to supply a mock IMetricAggregator`
`21`	`24`	`/// </summary>`