yujun777 commented on code in PR #66937:
URL: https://github.com/apache/doris/pull/66937#discussion_r3811882868
##########
fe/fe-core/src/test/java/org/apache/doris/metric/MetricsTest.java:
##########
@@ -125,7 +125,7 @@ public void testUserQueryMetrics() {
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("xxx").update(20L);
Review Comment:
Fixed: replaced the sensitive emails with a valid-format placeholder
"[email protected]" which keeps both the "@" and "." characters so the
special-character label coverage is preserved.
##########
fe/fe-core/src/test/java/org/apache/doris/metric/MetricsTest.java:
##########
@@ -138,38 +138,38 @@ public void testUserQueryMetrics() {
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_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_com"));
+ Assert.assertFalse(prometheusResult.contains("user=\"xxx@example\""));
}
@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_com\""));
Review Comment:
Fixed: replaced the sensitive emails with a valid-format placeholder
"[email protected]" which keeps both the "@" and "." characters so the
special-character label coverage is preserved.
##########
fe/fe-core/src/test/java/org/apache/doris/metric/MetricsTest.java:
##########
@@ -138,38 +138,38 @@ public void testUserQueryMetrics() {
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_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_com"));
+ Assert.assertFalse(prometheusResult.contains("user=\"xxx@example\""));
}
@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]")));
Review Comment:
Fixed: replaced the sensitive emails with a valid-format placeholder
"[email protected]" which keeps both the "@" and "." characters so the
special-character label coverage is preserved.
##########
fe/fe-core/src/test/java/org/apache/doris/metric/MetricsTest.java:
##########
@@ -138,38 +138,38 @@ public void testUserQueryMetrics() {
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_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_com"));
Review Comment:
Fixed: replaced the sensitive emails with a valid-format placeholder
"[email protected]" which keeps both the "@" and "." characters so the
special-character label coverage is preserved.
##########
fe/fe-core/src/test/java/org/apache/doris/metric/MetricsTest.java:
##########
@@ -138,38 +138,38 @@ public void testUserQueryMetrics() {
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_com"));
Review Comment:
Fixed: replaced the sensitive emails with a valid-format placeholder
"[email protected]" which keeps both the "@" and "." characters so the
special-character label coverage is preserved.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
