Removed failurecallback option.

Author: SeppPenner

src/Serilog.Sinks.Telegram.Alternative/LoggerConfigurationTelegramExtensions.cs

@@ -37,7 +37,6 @@ public static class LoggerConfigurationTelegramExtensions
     /// <param name="includeStackTrace">Whether stack traces should be included or not.</param>
     /// <param name="dateFormat">The date time format showing how the date and time should be formatted.</param>
     /// <param name="applicationName">The name of the application sending the events in case multiple apps write to the same channel.</param>
-    /// <param name="failureCallback">The failure callback.</param>
     /// <param name="useCustomHtmlFormatting">A value indicating whether custom HTML formatting in the messages could be used. (Use this carefully and only if really needed).</param>
     /// <param name="botApiUrl">The Telegram bot API url, defaults to https://api.telegram.org/bot.</param>
     /// <param name="outputTemplate">A output template that can be used to format the output data.</param>
@@ -59,7 +58,6 @@ public static LoggerConfiguration Telegram(
         bool? includeStackTrace = true,
         string dateFormat = "dd.MM.yyyy HH:mm:sszzz",
         string applicationName = "",
-        Action<Exception>? failureCallback = null,
         bool useCustomHtmlFormatting = false,
         string? botApiUrl = null,
         string? outputTemplate = null,
@@ -77,7 +75,6 @@ public static LoggerConfiguration Telegram(
             restrictedToMinimumLevel,
             sendBatchesAsSingleMessages,
             includeStackTrace,
-            failureCallback,
             useCustomHtmlFormatting,
             botApiUrl,
             outputTemplate,

src/Serilog.Sinks.Telegram.Alternative/Sinks/Telegram/Alternative/TelegramSink.cs

@@ -99,7 +99,7 @@ public async Task EmitBatchAsync(IEnumerable<LogEvent> events)
                 var message = this.options.FormatProvider is not null
                                   ? extendedLogEvent.LogEvent.RenderMessage(this.options.FormatProvider)
                                   : this.outputTemplateRenderer is null ? RenderMessage(extendedLogEvent, this.options) : this.outputTemplateRenderer.Format(extendedLogEvent);
-                await this.SendMessage(this.options.HttpClient, this.options.BotApiUrl, this.options.BotToken, this.options.ChatId, message, this.options.TopicId);
+                await SendMessage(this.options.HttpClient, this.options.BotApiUrl, this.options.BotToken, this.options.ChatId, message, this.options.TopicId);
             }
         }
         else
@@ -127,7 +127,7 @@ public async Task EmitBatchAsync(IEnumerable<LogEvent> events)
             }
 
             var messageToSend = sb.ToString();
-            await this.SendMessage(this.options.HttpClient, this.options.BotApiUrl,this.options.BotToken, this.options.ChatId, messageToSend, this.options.TopicId);
+            await SendMessage(this.options.HttpClient, this.options.BotApiUrl,this.options.BotToken, this.options.ChatId, messageToSend, this.options.TopicId);
         }
     }
 
@@ -203,55 +203,29 @@ private static string RenderMessage(ExtendedLogEvent extLogEvent, TelegramSinkOp
     /// <param name="message">The message.</param>
     /// <param name="topicId">The Telegram topic id.</param>
     /// <returns>A <see cref="Task"/> representing any asynchronous operation.</returns>
-    private async Task SendMessage(HttpClient httpClient, string? botApiUrl, string token, string chatId, string message, int? topicId = null)
+    private static async Task SendMessage(
+        HttpClient httpClient,
+        string? botApiUrl,
+        string token,
+        string chatId,
+        string message,
+        int? topicId = null)
     {
-        this.TryWriteToSelflog($"Trying to send message to chatId '{chatId}': '{message}'.");
+        SelfLog.WriteLine($"Trying to send message to chatId '{chatId}': '{message}'.");
 
         var client = new TelegramClient(httpClient, token, botApiUrl);
 
-        try
+        if (message.Length > MaxMessageLength)
         {
-            if (message.Length > MaxMessageLength)
-            {
-                this.TryWriteToSelflog($"Message is too long to be sent, it must not exceed {MaxMessageLength} characters.");
-                return;
-            }
-
-            var response = await client.PostMessage(message, chatId, topicId);
-
-            if (response is not null)
-            {
-                this.TryWriteToSelflog($"Message sent to chatId '{chatId}': '{response.StatusCode}'.");
-            }
-        }
-        catch (Exception ex)
-        {
-#pragma warning disable CS0618 // Typ oder Element ist veraltet
-            // Todo: Remove this in next version!
-            this.options.FailureCallback?.Invoke(ex);
-#pragma warning restore CS0618 // Typ oder Element ist veraltet
-            throw;
+            SelfLog.WriteLine($"Message is too long to be sent, it must not exceed {MaxMessageLength} characters.");
+            return;
         }
-    }
-   
 
-    /// <summary>
-    /// Tries to write to Selflog and throws an exception if a formatting error occurred.
-    /// </summary>
-    /// <param name="messageTemplate">The message template.</param>
-    private void TryWriteToSelflog(string messageTemplate)
-    {
-        try
-        {
-            SelfLog.WriteLine(messageTemplate);
-        }
-        catch (Exception ex)
+        var response = await client.PostMessage(message, chatId, topicId);
+
+        if (response is not null)
         {
-#pragma warning disable CS0618 // Typ oder Element ist veraltet
-            // Todo: Remove this in next version!
-            this.options.FailureCallback?.Invoke(ex);
-#pragma warning restore CS0618 // Typ oder Element ist veraltet
-            throw;
+            SelfLog.WriteLine($"Message sent to chatId '{chatId}': '{response.StatusCode}'.");
         }
     }
 }

src/Serilog.Sinks.Telegram.Alternative/Sinks/Telegram/Alternative/TelegramSinkOptions.cs

@@ -39,7 +39,6 @@ public class TelegramSinkOptions
     /// <param name="minimumLogEventLevel">The minimum log event level to use.</param>
     /// <param name="sendBatchesAsSingleMessages">A value indicating whether the batches are sent as single messages or as one block of messages.</param>
     /// <param name="includeStackTrace">A value indicating whether the stack trace should be shown or not.</param>
-    /// <param name="failureCallback">The failure callback.</param>
     /// <param name="useCustomHtmlFormatting">A value indicating whether custom HTML formatting in the messages could be used. (Use this carefully and only if really needed).</param>
     /// <param name="botApiUrl">The Telegram bot API url, defaults to https://api.telegram.org/bot.</param>
     /// <param name="outputTemplate">The output template.</param>
@@ -59,7 +58,6 @@ public TelegramSinkOptions(
         LogEventLevel minimumLogEventLevel = LogEventLevel.Verbose,
         bool? sendBatchesAsSingleMessages = true,
         bool? includeStackTrace = true,
-        Action<Exception>? failureCallback = null,
         bool useCustomHtmlFormatting = false,
         string? botApiUrl = null,
         string? outputTemplate = null,
@@ -80,10 +78,6 @@ public TelegramSinkOptions(
         this.MinimumLogEventLevel = minimumLogEventLevel;
         this.SendBatchesAsSingleMessages = sendBatchesAsSingleMessages ?? true;
         this.IncludeStackTrace = includeStackTrace ?? true;
-#pragma warning disable CS0618 // Typ oder Element ist veraltet
-        // Todo: Remove this in next version!
-        this.FailureCallback = failureCallback;
-#pragma warning restore CS0618 // Typ oder Element ist veraltet
         this.DateFormat = dateFormat;
         this.ApplicationName = applicationName;
         this.UseCustomHtmlFormatting = useCustomHtmlFormatting;
@@ -152,12 +146,6 @@ public TelegramSinkOptions(
     /// </summary>
     public bool IncludeStackTrace { get; }
 
-    /// <summary>
-    /// Gets the failure callback.
-    /// </summary>
-    [Obsolete("Use fallback logging instead. Check https://nblumhardt.com/2024/10/fallback-logging/.")]
-    public Action<Exception>? FailureCallback { get; }
-
     /// <summary>
     /// Gets a value indicating whether custom HTML formatting in the messages could be used. (Use this carefully and only if really needed).
     /// </summary>