This is an automated email from the ASF dual-hosted git repository.
JNSimba pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris-flink-connector.git
The following commit(s) were added to refs/heads/master by this push:
new 46ce2252 [improve](sink) report standard FLIP-33 sink metrics
numRecordsSend/numBytesSend (#681)
46ce2252 is described below
commit 46ce225220ccc8830f1629bafff99da9261c422c
Author: chengqian <[email protected]>
AuthorDate: Mon Aug 24 10:29:41 2026 +0800
[improve](sink) report standard FLIP-33 sink metrics
numRecordsSend/numBytesSend (#681)
DorisWriter only registered connector-specific counters, so the standard
sink metrics stayed at 0 and tools relying on FLIP-33 metrics could not
observe sink throughput. Wire numRecordsSend and numBytesSend into
DorisWriteMetrics: both counters are fetched from the SinkWriterMetricGroup
and incremented with the loaded rows and bytes of each successful stream
load. The counters are shared across all tables of a writer, so multi-table
sinks aggregate correctly.
---
.../doris/flink/sink/writer/DorisWriteMetrics.java | 32 +++++++
.../doris/flink/sink/writer/DorisWriter.java | 4 +
.../flink/sink/writer/TestDorisWriteMetrics.java | 101 +++++++++++++++++++++
.../doris/flink/sink/writer/TestDorisWriter.java | 2 +
4 files changed, 139 insertions(+)
diff --git
a/flink-doris-connector/flink-doris-connector-base/src/main/java/org/apache/doris/flink/sink/writer/DorisWriteMetrics.java
b/flink-doris-connector/flink-doris-connector-base/src/main/java/org/apache/doris/flink/sink/writer/DorisWriteMetrics.java
index d60d551e..89e8e9a1 100644
---
a/flink-doris-connector/flink-doris-connector-base/src/main/java/org/apache/doris/flink/sink/writer/DorisWriteMetrics.java
+++
b/flink-doris-connector/flink-doris-connector-base/src/main/java/org/apache/doris/flink/sink/writer/DorisWriteMetrics.java
@@ -58,6 +58,9 @@ public class DorisWriteMetrics implements Serializable {
private transient Counter totalFlushFilteredRows;
private transient Counter totalFlushUnselectedRows;
+ // Standard FLIP-33 sink metrics, shared by all tables of the writer
+ private transient Counter numRecordsSend;
+ private transient Counter numBytesSend;
// Histogram
private transient Histogram beginTxnTimeHistogramMs;
private transient Histogram commitAndPublishTimeHistogramMs;
@@ -105,8 +108,19 @@ public class DorisWriteMetrics implements Serializable {
}
}
+ /**
+ * Called for every record sent to Doris, regardless of the final load
result, to keep the
+ * standard FLIP-33 sink metrics in line with the records the writer has
sent.
+ */
+ public void recordSend(long bytes) {
+ numRecordsSend.inc();
+ numBytesSend.inc(bytes);
+ }
+
@VisibleForTesting
public void register(SinkWriterMetricGroup sinkMetricGroup) {
+ numRecordsSend = sinkMetricGroup.getNumRecordsSendCounter();
+ numBytesSend = sinkMetricGroup.getNumBytesSendCounter();
totalFlushNumberTotalRows =
sinkMetricGroup.counter(
String.format(
@@ -224,6 +238,14 @@ public class DorisWriteMetrics implements Serializable {
return totalFlushLoadBytes;
}
+ public Counter getNumRecordsSend() {
+ return numRecordsSend;
+ }
+
+ public Counter getNumBytesSend() {
+ return numBytesSend;
+ }
+
public Counter getTotalFlushNumberTotalRows() {
return totalFlushNumberTotalRows;
}
@@ -281,6 +303,16 @@ public class DorisWriteMetrics implements Serializable {
this.totalFlushLoadBytes = totalFlushLoadBytes;
}
+ @VisibleForTesting
+ public void setNumRecordsSend(Counter numRecordsSend) {
+ this.numRecordsSend = numRecordsSend;
+ }
+
+ @VisibleForTesting
+ public void setNumBytesSend(Counter numBytesSend) {
+ this.numBytesSend = numBytesSend;
+ }
+
@VisibleForTesting
public void setTotalFlushNumberTotalRows(Counter
totalFlushNumberTotalRows) {
this.totalFlushNumberTotalRows = totalFlushNumberTotalRows;
diff --git
a/flink-doris-connector/flink-doris-connector-base/src/main/java/org/apache/doris/flink/sink/writer/DorisWriter.java
b/flink-doris-connector/flink-doris-connector-base/src/main/java/org/apache/doris/flink/sink/writer/DorisWriter.java
index 69a3e04e..3a47c76a 100644
---
a/flink-doris-connector/flink-doris-connector-base/src/main/java/org/apache/doris/flink/sink/writer/DorisWriter.java
+++
b/flink-doris-connector/flink-doris-connector-base/src/main/java/org/apache/doris/flink/sink/writer/DorisWriter.java
@@ -200,6 +200,10 @@ public class DorisWriter<IN> {
registerMetrics(tableKey);
}
streamLoader.writeRecord(record.getRow());
+ DorisWriteMetrics metrics = sinkMetricsMap.get(tableKey);
+ if (metrics != null) {
+ metrics.recordSend(record.getRow().length);
+ }
}
@VisibleForTesting
diff --git
a/flink-doris-connector/flink-doris-connector-base/src/test/java/org/apache/doris/flink/sink/writer/TestDorisWriteMetrics.java
b/flink-doris-connector/flink-doris-connector-base/src/test/java/org/apache/doris/flink/sink/writer/TestDorisWriteMetrics.java
new file mode 100644
index 00000000..392c3ddd
--- /dev/null
+++
b/flink-doris-connector/flink-doris-connector-base/src/test/java/org/apache/doris/flink/sink/writer/TestDorisWriteMetrics.java
@@ -0,0 +1,101 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.doris.flink.sink.writer;
+
+import org.apache.flink.metrics.Counter;
+import org.apache.flink.metrics.SimpleCounter;
+import org.apache.flink.metrics.groups.SinkWriterMetricGroup;
+import org.apache.flink.runtime.metrics.DescriptiveStatisticsHistogram;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.doris.flink.rest.models.RespContent;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.IOException;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+/** Test for DorisWriteMetrics. */
+public class TestDorisWriteMetrics {
+
+ private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+ private SinkWriterMetricGroup metricGroup;
+ private Counter numRecordsSend;
+ private Counter numBytesSend;
+
+ @Before
+ public void setUp() {
+ metricGroup = mock(SinkWriterMetricGroup.class);
+ numRecordsSend = new SimpleCounter();
+ numBytesSend = new SimpleCounter();
+
when(metricGroup.getNumRecordsSendCounter()).thenReturn(numRecordsSend);
+ when(metricGroup.getNumBytesSendCounter()).thenReturn(numBytesSend);
+ when(metricGroup.counter(anyString())).thenAnswer(invocation -> new
SimpleCounter());
+ when(metricGroup.histogram(anyString(), any()))
+ .thenAnswer(invocation -> new
DescriptiveStatisticsHistogram(100));
+ }
+
+ @Test
+ public void testRecordSendUpdatesStandardSinkMetrics() {
+ DorisWriteMetrics metrics = DorisWriteMetrics.of(metricGroup,
"db_table");
+ metrics.recordSend(100);
+ metrics.recordSend(50);
+
+ Assert.assertEquals(2, numRecordsSend.getCount());
+ Assert.assertEquals(150, numBytesSend.getCount());
+ }
+
+ @Test
+ public void testStandardSinkMetricsSharedAcrossTables() {
+ DorisWriteMetrics tableOneMetrics = DorisWriteMetrics.of(metricGroup,
"db_table1");
+ DorisWriteMetrics tableTwoMetrics = DorisWriteMetrics.of(metricGroup,
"db_table2");
+ tableOneMetrics.recordSend(100);
+ tableTwoMetrics.recordSend(200);
+
+ Assert.assertEquals(2, numRecordsSend.getCount());
+ Assert.assertEquals(300, numBytesSend.getCount());
+ }
+
+ @Test
+ public void testFlushDoesNotUpdateStandardSinkMetrics() throws IOException
{
+ DorisWriteMetrics metrics = DorisWriteMetrics.of(metricGroup,
"db_table");
+ metrics.flush(buildRespContent("Success", 5, 100));
+ metrics.flush(buildRespContent("Fail", 0, 0));
+
+ Assert.assertEquals(0, numRecordsSend.getCount());
+ Assert.assertEquals(0, numBytesSend.getCount());
+ Assert.assertEquals(5, metrics.getTotalFlushLoadedRows().getCount());
+ Assert.assertEquals(100, metrics.getTotalFlushLoadBytes().getCount());
+ Assert.assertEquals(1,
metrics.getTotalFlushSucceededTimes().getCount());
+ Assert.assertEquals(1, metrics.getTotalFlushFailedTimes().getCount());
+ }
+
+ private RespContent buildRespContent(String status, long loadedRows, long
loadBytes)
+ throws IOException {
+ String json =
+ String.format(
+ "{\"Status\": \"%s\", \"NumberLoadedRows\": %d,
\"LoadBytes\": %d}",
+ status, loadedRows, loadBytes);
+ return OBJECT_MAPPER.readValue(json, RespContent.class);
+ }
+}
diff --git
a/flink-doris-connector/flink-doris-connector-base/src/test/java/org/apache/doris/flink/sink/writer/TestDorisWriter.java
b/flink-doris-connector/flink-doris-connector-base/src/test/java/org/apache/doris/flink/sink/writer/TestDorisWriter.java
index 9ed4ae84..1908ebf3 100644
---
a/flink-doris-connector/flink-doris-connector-base/src/test/java/org/apache/doris/flink/sink/writer/TestDorisWriter.java
+++
b/flink-doris-connector/flink-doris-connector-base/src/test/java/org/apache/doris/flink/sink/writer/TestDorisWriter.java
@@ -238,6 +238,8 @@ public class TestDorisWriter {
when(mockCounter.getCount()).thenReturn(0L);
when(mockHistogram.getCount()).thenReturn(0L);
dorisWriteMetrics.setTotalFlushLoadBytes(mockCounter);
+ dorisWriteMetrics.setNumRecordsSend(mockCounter);
+ dorisWriteMetrics.setNumBytesSend(mockCounter);
dorisWriteMetrics.setTotalFlushNumberTotalRows(mockCounter);
dorisWriteMetrics.setTotalFlushFilteredRows(mockCounter);
dorisWriteMetrics.setTotalFlushLoadedRows(mockCounter);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
