Same for producer and admin client

verdie-g · verdie-g · commit f2d3d081ea87 · 2025-06-15T17:25:47.000-04:00
diff --git a/src/Confluent.Kafka/AdminClient.cs b/src/Confluent.Kafka/AdminClient.cs
@@ -1577,6 +1577,9 @@ internal AdminClient(AdminClientBuilder builder)
             var producerBuilder = new ProducerBuilder<Null, Null>(config);
             if (builder.LogHandler != null) { producerBuilder.SetLogHandler((_, logMessage) => builder.LogHandler(this, logMessage)); }
             if (builder.ErrorHandler != null) { producerBuilder.SetErrorHandler((_, error) => builder.ErrorHandler(this, error)); }
+#if NET6_0_OR_GREATER
+            if (builder.StatisticsUtf8Handler != null) { producerBuilder.SetStatisticsUtf8Handler((stats, _) => builder.StatisticsUtf8Handler(stats, this)); }
+#endif
             if (builder.StatisticsHandler != null) { producerBuilder.SetStatisticsHandler((_, stats) => builder.StatisticsHandler(this, stats)); }
             if (builder.OAuthBearerTokenRefreshHandler != null) { producerBuilder.SetOAuthBearerTokenRefreshHandler(builder.OAuthBearerTokenRefreshHandler); }
             this.ownedClient = producerBuilder.Build();
diff --git a/src/Confluent.Kafka/AdminClientBuilder.cs b/src/Confluent.Kafka/AdminClientBuilder.cs
@@ -15,6 +15,7 @@
 // Refer to LICENSE for more information.
 
 using System;
+using System.Buffers;
 using System.Collections.Generic;
 
 
@@ -40,6 +41,15 @@ public class AdminClientBuilder
         /// </summary>
         internal protected Action<IAdminClient, LogMessage> LogHandler { get; set; }
 
+#if NET6_0_OR_GREATER
+        /// <summary>
+        ///     The configured statistics handler. Unlike <see cref="StatisticsHandler"/>, this handler gives access
+        ///     to the raw UTF-8 which is more performance friendly to UTF-8 parsers such as System.Text.Json. Also,
+        ///     if <see cref="StatisticsHandler"/> is not set, the JSON string allocation is completely avoided.
+        /// </summary>
+        internal protected ReadOnlySpanAction<byte, IAdminClient> StatisticsUtf8Handler { get; set; }
+#endif
+
         /// <summary>
         ///     The configured statistics handler.
         /// </summary>
@@ -65,6 +75,24 @@ public AdminClientBuilder(IEnumerable<KeyValuePair<string, string>> config)
             this.Config = config;
         }
 
+#if NET6_0_OR_GREATER
+        /// <summary>
+        ///     Set the handler to call on statistics events. Unlike <see cref="SetStatisticsHandler"/>, this handler
+        ///     gives access to the raw UTF-8 which is more performance friendly to UTF-8 parsers such as
+        ///     System.Text.Json. Also, it doesn't allocate a potentially large string for the JSON.
+        /// </summary>
+        public AdminClientBuilder SetStatisticsUtf8Handler(
+            ReadOnlySpanAction<byte, IAdminClient> statisticsHandler)
+        {
+            if (this.StatisticsUtf8Handler != null)
+            {
+                throw new InvalidOperationException("Statistics handler may not be specified more than once.");
+            }
+            this.StatisticsUtf8Handler = statisticsHandler;
+            return this;
+        }
+#endif
+
         /// <summary>
         ///     Set the handler to call on statistics events. Statistics are provided
         ///     as a JSON formatted string as defined here:
diff --git a/src/Confluent.Kafka/Producer.cs b/src/Confluent.Kafka/Producer.cs
@@ -15,6 +15,7 @@
 // Refer to LICENSE for more information.
 
 using System;
+using System.Buffers;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
@@ -36,6 +37,9 @@ internal class Config
             public IEnumerable<KeyValuePair<string, string>> config;
             public Action<Error> errorHandler;
             public Action<LogMessage> logHandler;
+#if NET6_0_OR_GREATER
+            internal ReadOnlySpanAction<byte, object> statisticsUtf8Handler;
+#endif
             public Action<string> statisticsHandler;
             public Action<string> oAuthBearerTokenRefreshHandler;
             public Dictionary<string, PartitionerDelegate> partitioners;
@@ -139,23 +143,38 @@ private void ErrorCallback(IntPtr rk, ErrorCode err, string reason, IntPtr opaqu
         }
 
 
+#if NET6_0_OR_GREATER
+        private ReadOnlySpanAction<byte, object> statisticsUtf8Handler;
+#endif
         private Action<string> statisticsHandler;
         private Librdkafka.StatsDelegate statisticsCallbackDelegate;
         private int StatisticsCallback(IntPtr rk, IntPtr json, UIntPtr json_len, IntPtr opaque)
         {
-            // Ensure registered handlers are never called as a side-effect of Dispose/Finalize (prevents deadlocks in common scenarios).
             if (ownedKafkaHandle.IsClosed) { return 0; }
-
             try
             {
-                statisticsHandler?.Invoke(Util.Marshal.PtrToStringUTF8(json));
+                // Ensure registered handlers are never called as a side-effect of Dispose/Finalize (prevents deadlocks in common scenarios).
+#if NET6_0_OR_GREATER
+                if (statisticsUtf8Handler != null)
+                {
+                    unsafe
+                    {
+                        statisticsUtf8Handler.Invoke(new ReadOnlySpan<byte>(json.ToPointer(), (int)json_len), null);
+                    }
+                }
+#endif
+
+                if (statisticsHandler != null)
+                {
+                    statisticsHandler.Invoke(Util.Marshal.PtrToStringUTF8(json, json_len));
+                }
             }
             catch (Exception e)
             {
                 handlerException = e;
             }
 
-            return 0; // instruct librdkafka to immediately free the json ptr.
+            return 0; // instruct librdkafka to immediately free the json ptr
         }
 
         private Action<string> oAuthBearerTokenRefreshHandler;
@@ -399,8 +418,8 @@ public void Flush(CancellationToken cancellationToken)
                     throw new OperationCanceledException();
                 }
             }
-        }
-
+        }
+
         
         /// <inheritdoc/>
         public void Dispose()
@@ -576,6 +595,9 @@ internal Producer(ProducerBuilder<TKey, TValue> builder)
             // TODO: Hijack the "delivery.report.only.error" configuration parameter and add functionality to enforce that Tasks 
             //       that never complete are never created when this is set to true.
 
+#if NET6_0_OR_GREATER
+            this.statisticsUtf8Handler = baseConfig.statisticsUtf8Handler;
+#endif
             this.statisticsHandler = baseConfig.statisticsHandler;
             this.logHandler = baseConfig.logHandler;
             this.errorHandler = baseConfig.errorHandler;
@@ -675,7 +697,11 @@ internal Producer(ProducerBuilder<TKey, TValue> builder)
             {
                 Librdkafka.conf_set_log_cb(configPtr, logCallbackDelegate);
             }
+#if NET6_0_OR_GREATER
+            if (statisticsUtf8Handler != null || statisticsHandler != null)
+#else
             if (statisticsHandler != null)
+#endif
             {
                 Librdkafka.conf_set_stats_cb(configPtr, statisticsCallbackDelegate);
             }
diff --git a/src/Confluent.Kafka/ProducerBuilder.cs b/src/Confluent.Kafka/ProducerBuilder.cs
@@ -15,6 +15,7 @@
 // Refer to LICENSE for more information.
 
 using System;
+using System.Buffers;
 using System.Collections.Generic;
 
 
@@ -74,6 +75,15 @@ public class ProducerBuilder<TKey, TValue>
         /// </summary>
         internal protected Action<IProducer<TKey, TValue>, LogMessage> LogHandler { get; set; }
 
+#if NET6_0_OR_GREATER
+        /// <summary>
+        ///     The configured statistics handler. Unlike <see cref="StatisticsHandler"/>, this handler gives access
+        ///     to the raw UTF-8 which is more performance friendly to UTF-8 parsers such as System.Text.Json. Also,
+        ///     if <see cref="StatisticsHandler"/> is not set, the JSON string allocation is completely avoided.
+        /// </summary>
+        internal protected ReadOnlySpanAction<byte, IProducer<TKey, TValue>> StatisticsUtf8Handler { get; set; }
+#endif
+
         /// <summary>
         ///     The configured statistics handler.
         /// </summary>
@@ -125,6 +135,11 @@ internal Producer<TKey,TValue>.Config ConstructBaseConfig(Producer<TKey, TValue>
                 logHandler = this.LogHandler == null
                     ? default(Action<LogMessage>)
                     : logMessage => this.LogHandler(producer, logMessage),
+#if NET6_0_OR_GREATER
+                statisticsUtf8Handler = this.StatisticsUtf8Handler == null
+                    ? default(ReadOnlySpanAction<byte, object>)
+                    : (stats, _) => this.StatisticsUtf8Handler(stats, producer),
+#endif
                 statisticsHandler = this.StatisticsHandler == null
                     ? default(Action<string>)
                     : stats => this.StatisticsHandler(producer, stats),
@@ -148,6 +163,24 @@ public ProducerBuilder(IEnumerable<KeyValuePair<string, string>> config)
             this.Config = config;
         }
 
+#if NET6_0_OR_GREATER
+        /// <summary>
+        ///     Set the handler to call on statistics events. Unlike <see cref="SetStatisticsHandler"/>, this handler
+        ///     gives access to the raw UTF-8 which is more performance friendly to UTF-8 parsers such as
+        ///     System.Text.Json. Also, it doesn't allocate a potentially large string for the JSON.
+        /// </summary>
+        public ProducerBuilder<TKey, TValue> SetStatisticsUtf8Handler(
+            ReadOnlySpanAction<byte, IProducer<TKey, TValue>> statisticsHandler)
+        {
+            if (this.StatisticsUtf8Handler != null)
+            {
+                throw new InvalidOperationException("Statistics handler may not be specified more than once.");
+            }
+            this.StatisticsUtf8Handler = statisticsHandler;
+            return this;
+        }
+#endif
+
         /// <summary>
         ///     Set the handler to call on statistics events. Statistics are provided as
         ///     a JSON formatted string as defined here:
