ref: remove internal options

src/Sentry/Internal/DefaultSentryStructuredLogger.cs

@@ -11,31 +11,15 @@ internal sealed class DefaultSentryStructuredLogger : SentryStructuredLogger
 
     private readonly StructuredLogBatchProcessor _batchProcessor;
 
-    internal DefaultSentryStructuredLogger(IHub hub, SentryOptions options, ISystemClock clock)
+    internal DefaultSentryStructuredLogger(IHub hub, SentryOptions options, ISystemClock clock, int batchCount, TimeSpan batchInterval)
     {
         Debug.Assert(options is { Experimental.EnableLogs: true });
 
         _hub = hub;
         _options = options;
         _clock = clock;
 
-        _batchProcessor = new StructuredLogBatchProcessor(hub, ClampBatchCount(options.Experimental.InternalBatchSize), ClampBatchInterval(options.Experimental.InternalBatchTimeout), clock, _options.ClientReportRecorder, _options.DiagnosticLogger);
-    }
-
-    private static int ClampBatchCount(int batchCount)
-    {
-        return batchCount <= 0
-            ? 1
-            : batchCount > 1_000_000
-                ? 1_000_000
-                : batchCount;
-    }
-
-    private static TimeSpan ClampBatchInterval(TimeSpan batchInterval)
-    {
-        return batchInterval.TotalMilliseconds is <= 0 or > int.MaxValue
-            ? TimeSpan.FromMilliseconds(int.MaxValue)
-            : batchInterval;
+        _batchProcessor = new StructuredLogBatchProcessor(hub, batchCount, batchInterval, clock, _options.ClientReportRecorder, _options.DiagnosticLogger);
     }
 
     /// <inheritdoc />

src/Sentry/Internal/StructuredLogBatchProcessor.cs

@@ -113,7 +113,7 @@ private void CaptureLogs(StructuredLogBatchBuffer buffer)
             }
         }
 
-        if (logs is not null)
+        if (logs is not null && logs.Length != 0)
         {
             _ = _hub.CaptureEnvelope(Envelope.FromLog(new StructuredLog(logs)));
         }

src/Sentry/SentryOptions.cs

@@ -1897,22 +1897,5 @@ public void SetBeforeSendLog(Func<SentryLog, SentryLog?> beforeSendLog)
         {
             _beforeSendLog = beforeSendLog;
         }
-
-        /// <summary>
-        /// This API will be removed in the future.
-        /// </summary>
-        /// <remarks>
-        /// Threshold of items in the buffer when sending all items, regardless of <see cref="InternalBatchTimeout"/>.
-        /// </remarks>
-        public int InternalBatchSize { get; set; } = 100;
-
-        /// <summary>
-        /// This API will be removed in the future.
-        /// </summary>
-        /// <remarks>
-        /// Time after which all items in the buffer are sent, regardless of <see cref="InternalBatchSize"/>.
-        /// <para>Must not exceed 30 seconds.</para>
-        /// </remarks>
-        public TimeSpan InternalBatchTimeout { get; set; } = TimeSpan.FromSeconds(5);
     }
 }

src/Sentry/SentryStructuredLogger.cs

@@ -11,9 +11,12 @@ namespace Sentry;
 public abstract class SentryStructuredLogger : IDisposable
 {
     internal static SentryStructuredLogger Create(IHub hub, SentryOptions options, ISystemClock clock)
+        => Create(hub, options, clock, 100, TimeSpan.FromSeconds(5));
+
+    internal static SentryStructuredLogger Create(IHub hub, SentryOptions options, ISystemClock clock, int batchCount, TimeSpan batchInterval)
     {
         return options.Experimental.EnableLogs
-            ? new DefaultSentryStructuredLogger(hub, options, clock)
+            ? new DefaultSentryStructuredLogger(hub, options, clock, batchCount, batchInterval)
             : DisabledSentryStructuredLogger.Instance;
     }
 

test/Sentry.Tests/ApiApprovalTests.Run.DotNet8_0.verified.txt

@@ -833,8 +833,6 @@ namespace Sentry
         public sealed class SentryExperimentalOptions
         {
             public bool EnableLogs { get; set; }
-            public int InternalBatchSize { get; set; }
-            public System.TimeSpan InternalBatchTimeout { get; set; }
             public void SetBeforeSendLog(System.Func<Sentry.SentryLog, Sentry.SentryLog?> beforeSendLog) { }
         }
     }

test/Sentry.Tests/ApiApprovalTests.Run.DotNet9_0.verified.txt

@@ -833,8 +833,6 @@ namespace Sentry
         public sealed class SentryExperimentalOptions
         {
             public bool EnableLogs { get; set; }
-            public int InternalBatchSize { get; set; }
-            public System.TimeSpan InternalBatchTimeout { get; set; }
             public void SetBeforeSendLog(System.Func<Sentry.SentryLog, Sentry.SentryLog?> beforeSendLog) { }
         }
     }

test/Sentry.Tests/ApiApprovalTests.Run.Net4_8.verified.txt

@@ -795,8 +795,6 @@ namespace Sentry
         public sealed class SentryExperimentalOptions
         {
             public bool EnableLogs { get; set; }
-            public int InternalBatchSize { get; set; }
-            public System.TimeSpan InternalBatchTimeout { get; set; }
             public void SetBeforeSendLog(System.Func<Sentry.SentryLog, Sentry.SentryLog?> beforeSendLog) { }
         }
     }

test/Sentry.Tests/HubTests.cs

@@ -1429,6 +1429,7 @@ public void Logger_IsDisabled_DoesNotCaptureLog()
 
         // Act
         hub.Logger.LogWarning("Message");
+        hub.Logger.Flush();
 
         // Assert
         _fixture.Client.Received(0).CaptureEnvelope(
@@ -1439,16 +1440,16 @@ public void Logger_IsDisabled_DoesNotCaptureLog()
         hub.Logger.Should().BeOfType<DisabledSentryStructuredLogger>();
     }
 
-    [Fact(Skip = "Remove InternalBatchSize")]
+    [Fact]
     public void Logger_IsEnabled_DoesCaptureLog()
     {
         // Arrange
         _fixture.Options.Experimental.EnableLogs = true;
-        _fixture.Options.Experimental.InternalBatchSize = 1;
         var hub = _fixture.GetSut();
 
         // Act
         hub.Logger.LogWarning("Message");
+        hub.Logger.Flush();
 
         // Assert
         _fixture.Client.Received(1).CaptureEnvelope(
@@ -1487,6 +1488,26 @@ public void Logger_DisableAfterCreate_HasNoEffect()
         hub.Logger.Should().BeOfType<DefaultSentryStructuredLogger>();
     }
 
+    [Fact]
+    public void Logger_Dispose_DoesCaptureLog()
+    {
+        // Arrange
+        _fixture.Options.Experimental.EnableLogs = true;
+        var hub = _fixture.GetSut();
+        hub.Logger.LogWarning("Message");
+
+        // Act
+        hub.Dispose();
+
+        // Assert
+        _fixture.Client.Received(1).CaptureEnvelope(
+            Arg.Is<Envelope>(envelope =>
+                envelope.Items.Single(item => item.Header["type"].Equals("log")).Payload.GetType().IsAssignableFrom(typeof(JsonSerializable))
+            )
+        );
+        hub.Logger.Should().BeOfType<DefaultSentryStructuredLogger>();
+    }
+
     [Fact]
     public void Dispose_IsEnabled_SetToFalse()
     {

test/Sentry.Tests/SentryStructuredLoggerTests.cs

@@ -19,6 +19,8 @@ public Fixture()
                 DiagnosticLogger = DiagnosticLogger,
             };
             Clock = new MockClock(new DateTimeOffset(2025, 04, 22, 14, 51, 00, TimeSpan.Zero));
+            BatchSize = 2;
+            BatchTimeout = Timeout.InfiniteTimeSpan;
             TraceId = SentryId.Create();
             ParentSpanId = SpanId.Create();
 
@@ -30,6 +32,8 @@ public Fixture()
         public IHub Hub { get; }
         public SentryOptions Options { get; }
         public ISystemClock Clock { get; }
+        public int BatchSize { get; set; }
+        public TimeSpan BatchTimeout { get; set; }
         public SentryId TraceId { get; private set; }
         public SpanId? ParentSpanId { get; private set; }
 
@@ -40,7 +44,7 @@ public void WithoutTraceHeader()
             ParentSpanId = SpanId.Empty;
         }
 
-        public SentryStructuredLogger GetSut() => SentryStructuredLogger.Create(Hub, Options, Clock);
+        public SentryStructuredLogger GetSut() => SentryStructuredLogger.Create(Hub, Options, Clock, BatchSize, BatchTimeout);
     }
 
     private readonly Fixture _fixture;
@@ -74,7 +78,7 @@ public void Create_Disabled_CachedDisabledInstance()
         instance.Should().BeSameAs(other);
     }
 
-    [Theory(Skip = "Remove InternalBatchSize")]
+    [Theory]
     [InlineData(SentryLogLevel.Trace)]
     [InlineData(SentryLogLevel.Debug)]
     [InlineData(SentryLogLevel.Info)]
@@ -84,13 +88,13 @@ public void Create_Disabled_CachedDisabledInstance()
     public void Log_Enabled_CapturesEnvelope(SentryLogLevel level)
     {
         _fixture.Options.Experimental.EnableLogs = true;
-        _fixture.Options.Experimental.InternalBatchSize = 1;
         var logger = _fixture.GetSut();
 
         Envelope envelope = null!;
         _fixture.Hub.CaptureEnvelope(Arg.Do<Envelope>(arg => envelope = arg));
 
         logger.Log(level, "Template string with arguments: {0}, {1}, {2}, {3}", ["string", true, 1, 2.2], ConfigureLog);
+        logger.Flush();
 
         _fixture.Hub.Received(1).CaptureEnvelope(Arg.Any<Envelope>());
         envelope.AssertEnvelope(_fixture, level);
@@ -113,31 +117,30 @@ public void Log_Disabled_DoesNotCaptureEnvelope(SentryLogLevel level)
         _fixture.Hub.Received(0).CaptureEnvelope(Arg.Any<Envelope>());
     }
 
-    [Fact(Skip = "Remove InternalBatchSize")]
+    [Fact]
     public void Log_WithoutTraceHeader_CapturesEnvelope()
     {
         _fixture.WithoutTraceHeader();
         _fixture.Options.Experimental.EnableLogs = true;
-        _fixture.Options.Experimental.InternalBatchSize = 1;
         var logger = _fixture.GetSut();
 
         Envelope envelope = null!;
         _fixture.Hub.CaptureEnvelope(Arg.Do<Envelope>(arg => envelope = arg));
 
         logger.LogTrace("Template string with arguments: {0}, {1}, {2}, {3}", ["string", true, 1, 2.2], ConfigureLog);
+        logger.Flush();
 
         _fixture.Hub.Received(1).CaptureEnvelope(Arg.Any<Envelope>());
         envelope.AssertEnvelope(_fixture, SentryLogLevel.Trace);
     }
 
-    [Fact(Skip = "Remove InternalBatchSize")]
+    [Fact]
     public void Log_WithBeforeSendLog_InvokesCallback()
     {
         var invocations = 0;
         SentryLog configuredLog = null!;
 
         _fixture.Options.Experimental.EnableLogs = true;
-        _fixture.Options.Experimental.InternalBatchSize = 1;
         _fixture.Options.Experimental.SetBeforeSendLog((SentryLog log) =>
         {
             invocations++;
@@ -147,6 +150,7 @@ public void Log_WithBeforeSendLog_InvokesCallback()
         var logger = _fixture.GetSut();
 
         logger.LogTrace("Template string with arguments: {0}, {1}, {2}, {3}", ["string", true, 1, 2.2], ConfigureLog);
+        logger.Flush();
 
         _fixture.Hub.Received(1).CaptureEnvelope(Arg.Any<Envelope>());
         invocations.Should().Be(1);
@@ -221,7 +225,7 @@ public void Log_InvalidBeforeSendLog_DoesNotCaptureEnvelope()
         entry.Args.Should().BeEmpty();
     }
 
-    [Fact(Skip = "May no longer be required after feedback.")]
+    [Fact]
     public void Dispose_Log_Throws()
     {
         _fixture.Options.Experimental.EnableLogs = true;