ref!: remove Experimental from Metrics API (#5023)

* ref!: remove Experimental from Metrics API

* Changelog

---------

Co-authored-by: James Crosswell <jamescrosswell@users.noreply.github.com>

Author: Flash0ver

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+### Features
+
+- GA release for Sentry Metrics ([#5023](https://github.com/getsentry/sentry-dotnet/pull/5023))
+ 
 ## 6.2.0
 
 ### Features

Directory.Build.props

@@ -13,7 +13,6 @@
 
     <!-- Ignore our own diagnostic ids - these are meant to be external warnings only -->
     <NoWarn>$(NoWarn);SENTRY0001</NoWarn>
-    <NoWarn>$(NoWarn);SENTRYTRACECONNECTEDMETRICS</NoWarn> <!--https://github.com/getsentry/sentry-dotnet/discussions/4838-->
 
     <!-- Allow references to unsigned assemblies (like MAUI) from signed projects -->
     <NoWarn>$(NoWarn);CS8002</NoWarn>

samples/Sentry.Samples.Console.Basic/Program.cs

@@ -54,8 +54,8 @@
         return log.Level is SentryLogLevel.Info ? null : log;
     });
 
-    // Sentry (trace-connected) Metrics via SentrySdk.Experimental.Metrics are enabled by default.
-    options.Experimental.SetBeforeSendMetric(static metric =>
+    // Sentry (trace-connected) Metrics via SentrySdk.Metrics are enabled by default.
+    options.SetBeforeSendMetric(static metric =>
     {
         if (metric.TryGetValue(out int integer) && integer < 0)
         {
@@ -104,13 +104,13 @@ async Task FirstFunction()
     SentrySdk.Logger.LogInfo("HTTP Request completed.");
 
     // Counter-Metric prevented from being sent to Sentry via "BeforeSendMetric" callback
-    SentrySdk.Experimental.Metrics.EmitCounter("sentry.samples.console.basic.ignore", -1);
+    SentrySdk.Metrics.EmitCounter("sentry.samples.console.basic.ignore", -1);
 
     // Counter-Metric modified before sending it to Sentry via "BeforeSendMetric" callback
-    SentrySdk.Experimental.Metrics.EmitCounter("sentry.samples.console.basic.http_requests_completed", 1);
+    SentrySdk.Metrics.EmitCounter("sentry.samples.console.basic.http_requests_completed", 1);
 
     // Distribution-Metric sent as is (see "BeforeSendMetric" callback)
-    SentrySdk.Experimental.Metrics.EmitDistribution("sentry.samples.console.basic.http_request_duration", stopwatch.Elapsed.TotalSeconds, MeasurementUnit.Duration.Second,
+    SentrySdk.Metrics.EmitDistribution("sentry.samples.console.basic.http_request_duration", stopwatch.Elapsed.TotalSeconds, MeasurementUnit.Duration.Second,
         [new KeyValuePair<string, object>("http.request.method", HttpMethod.Get.Method), new KeyValuePair<string, object>("http.response.status_code", (int)HttpStatusCode.OK)]);
 }
 

src/Sentry/BindableSentryOptions.cs

@@ -22,6 +22,7 @@ internal partial class BindableSentryOptions
     public string? Environment { get; set; }
     public string? Dsn { get; set; }
     public bool? EnableLogs { get; set; }
+    public bool? EnableMetrics { get; set; }
     public int? MaxQueueItems { get; set; }
     public int? MaxCacheItems { get; set; }
     public TimeSpan? ShutdownTimeout { get; set; }
@@ -56,8 +57,6 @@ internal partial class BindableSentryOptions
     public bool? EnableSpotlight { get; set; }
     public string? SpotlightUrl { get; set; }
 
-    public ExperimentalSentryOptions? Experimental { get; set; }
-
     public void ApplyTo(SentryOptions options)
     {
         options.IsGlobalModeEnabled = IsGlobalModeEnabled ?? options.IsGlobalModeEnabled;
@@ -75,6 +74,7 @@ public void ApplyTo(SentryOptions options)
         options.Environment = Environment ?? options.Environment;
         options.Dsn = Dsn ?? options.Dsn;
         options.EnableLogs = EnableLogs ?? options.EnableLogs;
+        options.EnableMetrics = EnableMetrics ?? options.EnableMetrics;
         options.MaxQueueItems = MaxQueueItems ?? options.MaxQueueItems;
         options.MaxCacheItems = MaxCacheItems ?? options.MaxCacheItems;
         options.ShutdownTimeout = ShutdownTimeout ?? options.ShutdownTimeout;
@@ -108,24 +108,11 @@ public void ApplyTo(SentryOptions options)
         options.EnableSpotlight = EnableSpotlight ?? options.EnableSpotlight;
         options.SpotlightUrl = SpotlightUrl ?? options.SpotlightUrl;
 
-        if (Experimental is { } experimental)
-        {
-            options.Experimental.EnableMetrics = experimental.EnableMetrics ?? options.Experimental.EnableMetrics;
-        }
-
 #if ANDROID
         Android.ApplyTo(options.Android);
         Native.ApplyTo(options.Native);
 #elif __IOS__
         Native.ApplyTo(options.Native);
 #endif
     }
-
-    /// <summary>
-    /// Bindable Options for <see cref="SentryOptions.ExperimentalSentryOptions"/>.
-    /// </summary>
-    internal class ExperimentalSentryOptions
-    {
-        public bool? EnableMetrics { get; set; }
-    }
 }

src/Sentry/Extensibility/DisabledHub.cs

@@ -270,6 +270,5 @@ public void Dispose()
     /// <summary>
     /// Disabled Metrics.
     /// </summary>
-    [Experimental("SENTRYTRACECONNECTEDMETRICS", UrlFormat = "https://github.com/getsentry/sentry-dotnet/discussions/4838")]
     public SentryMetricEmitter Metrics => DisabledSentryMetricEmitter.Instance;
 }

src/Sentry/Extensibility/HubAdapter.cs

@@ -39,8 +39,7 @@ private HubAdapter() { }
     /// <summary>
     /// Forwards the call to <see cref="SentrySdk"/>.
     /// </summary>
-    [Experimental("SENTRYTRACECONNECTEDMETRICS", UrlFormat = "https://github.com/getsentry/sentry-dotnet/discussions/4838")]
-    public SentryMetricEmitter Metrics { [DebuggerStepThrough] get => SentrySdk.Experimental.Metrics; }
+    public SentryMetricEmitter Metrics { [DebuggerStepThrough] get => SentrySdk.Metrics; }
 
     /// <summary>
     /// Forwards the call to <see cref="SentrySdk"/>.

src/Sentry/IHub.cs

@@ -35,11 +35,10 @@ public interface IHub : ISentryClient, ISentryScopeManager
     /// <remarks>
     /// Available options:
     /// <list type="bullet">
-    /// <item><see cref="Sentry.SentryOptions.ExperimentalSentryOptions.EnableMetrics"/></item>
-    /// <item><see cref="Sentry.SentryOptions.ExperimentalSentryOptions.SetBeforeSendMetric(System.Func{SentryMetric, SentryMetric})"/></item>
+    /// <item><see cref="Sentry.SentryOptions.EnableMetrics"/></item>
+    /// <item><see cref="Sentry.SentryOptions.SetBeforeSendMetric(System.Func{SentryMetric, SentryMetric})"/></item>
     /// </list>
     /// </remarks>
-    [Experimental("SENTRYTRACECONNECTEDMETRICS", UrlFormat = "https://github.com/getsentry/sentry-dotnet/discussions/4838")]
     public SentryMetricEmitter Metrics { get; }
 
     /// <summary>

src/Sentry/Internal/DefaultSentryMetricEmitter.cs

@@ -14,7 +14,7 @@ internal sealed class DefaultSentryMetricEmitter : SentryMetricEmitter, IDisposa
     internal DefaultSentryMetricEmitter(IHub hub, SentryOptions options, ISystemClock clock, int batchCount, TimeSpan batchInterval)
     {
         Debug.Assert(hub.IsEnabled);
-        Debug.Assert(options.Experimental is { EnableMetrics: true });
+        Debug.Assert(options is { EnableMetrics: true });
 
         _hub = hub;
         _options = options;
@@ -69,7 +69,7 @@ private protected override void CaptureMetric<T>(SentryMetric<T> metric) where T
 
         SentryMetric? configuredMetric = metric;
 
-        if (_options.Experimental.BeforeSendMetricInternal is { } beforeSendMetric)
+        if (_options.BeforeSendMetricInternal is { } beforeSendMetric)
         {
             try
             {

src/Sentry/SentryMetricEmitter.cs

@@ -13,7 +13,7 @@ internal static SentryMetricEmitter Create(IHub hub, SentryOptions options, ISys
 
     internal static SentryMetricEmitter Create(IHub hub, SentryOptions options, ISystemClock clock, int batchCount, TimeSpan batchInterval)
     {
-        return options.Experimental.EnableMetrics
+        return options.EnableMetrics
             ? new DefaultSentryMetricEmitter(hub, options, clock, batchCount, batchInterval)
             : DisabledSentryMetricEmitter.Instance;
     }

src/Sentry/SentryOptions.cs

@@ -569,6 +569,32 @@ public void SetBeforeSendLog(Func<SentryLog, SentryLog?> beforeSendLog)
         _beforeSendLog = beforeSendLog;
     }
 
+    /// <summary>
+    /// When set to <see langword="false"/>, the SDK does not generate and send metrics to Sentry via <see cref="SentrySdk.Metrics"/>.
+    /// Defaults to <see langword="true"/>.
+    /// </summary>
+    /// <seealso href="https://develop.sentry.dev/sdk/telemetry/metrics/"/>
+    public bool EnableMetrics { get; set; } = true;
+
+    private Func<SentryMetric, SentryMetric?>? _beforeSendMetric;
+
+    internal Func<SentryMetric, SentryMetric?>? BeforeSendMetricInternal => _beforeSendMetric;
+
+    /// <summary>
+    /// Sets a callback function to be invoked before sending the metric to Sentry.
+    /// When the delegate throws an <see cref="Exception"/> during invocation, the metric will not be captured.
+    /// </summary>
+    /// <remarks>
+    /// It can be used to modify the metric object before being sent to Sentry.
+    /// To prevent the metric from being sent to Sentry, return <see langword="null"/>.
+    /// Supported numeric value types are <see langword="byte"/>, <see langword="short"/>, <see langword="int"/>, <see langword="long"/>, <see langword="float"/>, and <see langword="double"/>.
+    /// </remarks>
+    /// <seealso href="https://develop.sentry.dev/sdk/telemetry/metrics/"/>
+    public void SetBeforeSendMetric(Func<SentryMetric, SentryMetric?> beforeSendMetric)
+    {
+        _beforeSendMetric = beforeSendMetric;
+    }
+
     private int _maxQueueItems = 30;
 
     /// <summary>
@@ -1907,51 +1933,4 @@ internal static List<StringOrRegex> GetDefaultInAppExclude() =>
         InAppExcludeRegexes.LibMonoSgen,
         InAppExcludeRegexes.LibXamarin
     ];
-
-    /// <summary>
-    /// Sentry features that are currently in an experimental state.
-    /// </summary>
-    /// <remarks>
-    /// Experimental features are subject to binary, source and behavioral breaking changes in future updates.
-    /// </remarks>
-    public ExperimentalSentryOptions Experimental { get; } = new ExperimentalSentryOptions();
-
-    /// <summary>
-    /// Sentry features that are currently in an experimental state.
-    /// </summary>
-    /// <remarks>
-    /// Experimental features are subject to binary, source and behavioral breaking changes in future updates.
-    /// </remarks>
-    public class ExperimentalSentryOptions
-    {
-        private Func<SentryMetric, SentryMetric?>? _beforeSendMetric;
-
-        internal ExperimentalSentryOptions()
-        {
-        }
-
-        internal Func<SentryMetric, SentryMetric?>? BeforeSendMetricInternal => _beforeSendMetric;
-
-        /// <summary>
-        /// When set to <see langword="false"/>, the SDK does not generate and send metrics to Sentry via <see cref="SentrySdk"/>.
-        /// Defaults to <see langword="true"/>.
-        /// </summary>
-        /// <seealso href="https://develop.sentry.dev/sdk/telemetry/metrics/"/>
-        public bool EnableMetrics { get; set; } = true;
-
-        /// <summary>
-        /// Sets a callback function to be invoked before sending the metric to Sentry.
-        /// When the delegate throws an <see cref="Exception"/> during invocation, the metric will not be captured.
-        /// </summary>
-        /// <remarks>
-        /// It can be used to modify the metric object before being sent to Sentry.
-        /// To prevent the metric from being sent to Sentry, return <see langword="null"/>.
-        /// Supported numeric value types are <see langword="byte"/>, <see langword="short"/>, <see langword="int"/>, <see langword="long"/>, <see langword="float"/>, and <see langword="double"/>.
-        /// </remarks>
-        /// <seealso href="https://develop.sentry.dev/sdk/telemetry/metrics/"/>
-        public void SetBeforeSendMetric(Func<SentryMetric, SentryMetric?> beforeSendMetric)
-        {
-            _beforeSendMetric = beforeSendMetric;
-        }
-    }
 }