This is an automated email from the ASF dual-hosted git repository.

hello-stephen pushed a commit to branch branch-4.1
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/branch-4.1 by this push:
     new cd4f9f14e79 branch-4.1: [fix](metrics) update real emails with 
placeholder in MetricsTest #66937 (#66975)
cd4f9f14e79 is described below

commit cd4f9f14e79a7c70c712a20a87d27478d3dbed85
Author: github-actions[bot] 
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Thu Aug 20 12:34:06 2026 +0800

    branch-4.1: [fix](metrics) update real emails with placeholder in 
MetricsTest #66937 (#66975)
    
    Cherry-picked from #66937
    
    Co-authored-by: yujun <[email protected]>
---
 .../java/org/apache/doris/metric/MetricsTest.java    | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/fe/fe-core/src/test/java/org/apache/doris/metric/MetricsTest.java 
b/fe/fe-core/src/test/java/org/apache/doris/metric/MetricsTest.java
index 19b73fcc03f..4be90f6b7ad 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/metric/MetricsTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/metric/MetricsTest.java
@@ -125,7 +125,7 @@ public class MetricsTest {
         MetricRepo.USER_COUNTER_QUERY_ALL.getOrAdd("test_user").increase(1L);
         MetricRepo.USER_COUNTER_QUERY_ERR.getOrAdd("test_user").increase(1L);
         MetricRepo.USER_HISTO_QUERY_LATENCY.getOrAdd("test_user").update(10L);
-        
MetricRepo.USER_HISTO_QUERY_LATENCY.getOrAdd("[email protected]").update(20L);
+        
MetricRepo.USER_HISTO_QUERY_LATENCY.getOrAdd("[email protected]").update(20L);
         MetricVisitor visitor = new PrometheusMetricVisitor();
         MetricRepo.DORIS_METRIC_REGISTER.accept(visitor);
         MetricRepo.visitHistograms(visitor);
@@ -138,38 +138,38 @@ public class MetricsTest {
         
Assert.assertTrue(metricResult.contains("doris_fe_query_latency_ms{quantile=\"0.999\"}
 0.0"));
         
Assert.assertTrue(metricResult.contains("doris_fe_query_latency_ms{quantile=\"0.999\",user=\"test_user\"}
 10.0"));
         Assert.assertTrue(metricResult.contains(
-                
"doris_fe_query_latency_ms{quantile=\"0.999\",user=\"[email protected]\"} 20.0"));
-        
Assert.assertFalse(metricResult.contains("doris_fe_query_latency_ms_lu@lbk_one"));
+                
"doris_fe_query_latency_ms{quantile=\"0.999\",user=\"[email protected]\"} 
20.0"));
+        
Assert.assertFalse(metricResult.contains("doris_fe_query_latency_ms_yyy@example_com"));
 
     }
 
     @Test
     public void 
testPrometheusVisitorKeepsLabeledHistogramValuesOutOfMetricName() {
         HistogramMetric histogramMetric = new 
HistogramMetric("query.latency.ms",
-                Lists.newArrayList(new MetricLabel("user", 
"[email protected]")));
+                Lists.newArrayList(new MetricLabel("user", 
"[email protected]")));
         histogramMetric.update(30L);
         MetricVisitor prometheusVisitor = new PrometheusMetricVisitor();
         prometheusVisitor.visitHistogram(MetricVisitor.FE_PREFIX, 
histogramMetric.getName(),
                 histogramMetric.getHistogram(), histogramMetric.getLabels());
         String prometheusResult = prometheusVisitor.finish();
         Assert.assertTrue(prometheusResult.contains(
-                
"doris_fe_query_latency_ms{quantile=\"0.999\",user=\"[email protected]\"}
 30.0"));
-        
Assert.assertFalse(prometheusResult.contains("doris_fe_query_latency_ms_liu@developertools_com"));
-        Assert.assertFalse(prometheusResult.contains("user=\"thomas\""));
+                
"doris_fe_query_latency_ms{quantile=\"0.999\",user=\"[email protected]\"} 
30.0"));
+        
Assert.assertFalse(prometheusResult.contains("doris_fe_query_latency_ms_yyy@example_com"));
+        Assert.assertFalse(prometheusResult.contains("user=\"xxx\""));
     }
 
     @Test
     public void testJsonVisitorKeepsLabeledHistogramValuesOutOfMetricName() {
         HistogramMetric histogramMetric = new 
HistogramMetric("query.latency.ms",
-                Lists.newArrayList(new MetricLabel("user", 
"[email protected]")));
+                Lists.newArrayList(new MetricLabel("user", 
"[email protected]")));
         histogramMetric.update(20L);
         MetricVisitor jsonVisitor = new JsonMetricVisitor();
         jsonVisitor.visitHistogram(MetricVisitor.FE_PREFIX, 
histogramMetric.getName(),
                 histogramMetric.getHistogram(), histogramMetric.getLabels());
         String jsonResult = jsonVisitor.finish();
         
Assert.assertTrue(jsonResult.contains("\"metric\":\"doris_fe_query_latency_ms\""));
-        Assert.assertTrue(jsonResult.contains("\"user\":\"[email protected]\""));
-        
Assert.assertFalse(jsonResult.contains("\"metric\":\"doris_fe_query_latency_ms_lu@lbk_one\""));
+        
Assert.assertTrue(jsonResult.contains("\"user\":\"[email protected]\""));
+        
Assert.assertFalse(jsonResult.contains("\"metric\":\"doris_fe_query_latency_ms_yyy@example_com\""));
     }
 
     @Test


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to