This is an automated email from the ASF dual-hosted git repository.
morrySnow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new edc9e34abb9 [fix](metrics) update real emails with placeholder in
MetricsTest (#66937)
edc9e34abb9 is described below
commit edc9e34abb969751f3d6bd9f483c9a4ba5eeb9fb
Author: yujun <[email protected]>
AuthorDate: Thu Aug 20 11:47:20 2026 +0800
[fix](metrics) update real emails with placeholder in MetricsTest (#66937)
### What problem does this PR solve?
Related PR: #63485
Problem Summary:
PR #63485 introduced test cases in `MetricsTest.java` that use a real
email address (and another test email) as histogram user label values.
we should remove the email from the open-source codebase. This PR
replaces all such email values with the generic placeholder `xxx`,
including the derived assertion strings.
---
.../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 f3c2a403d1d..698de8f104b 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]